Browse Source

Fixed typedef-related warnings from compiler. Also fixed warning on

keximdb, indirectly.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 1 year ago
parent
commit
daef72a0e4
Signed by: MicheleC <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
8 changed files with 21 additions and 23 deletions
  1. +0
    -2
      chalk/plugins/filters/cimg/CImg.h
  2. +1
    -1
      kexi/core/kexistartupdata.h
  3. +1
    -1
      kexi/kexidb/cursor.h
  4. +1
    -1
      kexi/kexiutils/validator.h
  5. +1
    -1
      kexi/main/startup/KexiStartupFileDialog.h
  6. +1
    -1
      kexi/widget/tableview/kexitableview.h
  7. +8
    -8
      lib/kwmf/kwmf.cc
  8. +8
    -8
      lib/kwmf/wmfstruct.h

+ 0
- 2
chalk/plugins/filters/cimg/CImg.h View File

@@ -15156,8 +15156,6 @@ namespace cimg_library {
static CImg get_load_pandore(const char *filename) {
std::FILE *file = cimg::fopen(filename,"rb");
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef unsigned int uint;
typedef unsigned long ulong;
CImg dest;
char tmp[32];


+ 1
- 1
kexi/core/kexistartupdata.h View File

@@ -29,7 +29,7 @@ class KexiProjectData;
class KEXICORE_EXPORT KexiStartupData
{
public:
typedef enum Action {
enum Action {
DoNothing,
CreateBlankProject,
CreateFromTemplate,


+ 1
- 1
kexi/kexidb/cursor.h View File

@@ -254,7 +254,7 @@ class KEXI_DB_EXPORT Cursor: public TQObject, public Object

protected:
//! possible results of row fetching, used for m_result
typedef enum FetchResult { FetchError=0, FetchOK=1, FetchEnd=2 };
enum FetchResult { FetchError=0, FetchOK=1, FetchEnd=2 };

/*! Cursor will operate on \a conn, raw \a statement will be used to execute query. */
Cursor(Connection* conn, const TQString& statement, uint options = NoOptions );


+ 1
- 1
kexi/kexiutils/validator.h View File

@@ -45,7 +45,7 @@ namespace KexiUtils {
class KEXIUTILS_EXPORT Validator : public TQValidator
{
public:
typedef enum Result { Error = 0, Ok = 1, Warning = 2 };
enum Result { Error = 0, Ok = 1, Warning = 2 };

Validator(TQObject * parent = 0, const char * name = 0);
virtual ~Validator();


+ 1
- 1
kexi/main/startup/KexiStartupFileDialog.h View File

@@ -42,7 +42,7 @@ public:
- SavingServerBasedDB saves server-based (shortcut) file
- CustomOpening can be used for opening other files, like CSV
*/
typedef enum Mode {
enum Mode {
Opening = 1,
SavingFileBasedDB = 2,
SavingServerBasedDB = 4,


+ 1
- 1
kexi/widget/tableview/kexitableview.h View File

@@ -236,7 +236,7 @@ public:
//! single shot after 1ms for contents updatinh
void triggerUpdate();

typedef enum ScrollDirection
enum ScrollDirection
{
ScrollUp,
ScrollDown,


+ 8
- 8
lib/kwmf/kwmf.cc View File

@@ -357,33 +357,33 @@ bool KWmf::parse(
for (int i = 0; i < s_maxHandles; i++)
m_objectHandles[i] = NULL;

typedef struct _RECT
struct RECT
{
S16 left;
S16 top;
S16 right;
S16 bottom;
} RECT;
};

typedef struct _RECTL
struct RECTL
{
S32 left;
S32 top;
S32 right;
S32 bottom;
} RECTL;
};

typedef struct _SIZE
struct SIZE
{
S16 width;
S16 height;
} SIZE;
};

typedef struct _SIZEL
struct SIZEL
{
S32 width;
S32 height;
} SIZEL;
};

struct WmfEnhMetaHeader
{


+ 8
- 8
lib/kwmf/wmfstruct.h View File

@@ -9,33 +9,33 @@ typedef int DWORD;
typedef TQ_INT32 LONG;
typedef void* _HANDLE;

typedef struct _RECT
struct RECT
{
WORD left;
WORD top;
WORD right;
WORD bottom;
} RECT;
};

typedef struct _RECTL
struct RECTL
{
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECTL;
};

typedef struct _SIZE
struct SIZE
{
WORD width;
WORD height;
} SIZE;
};

typedef struct _SIZEL
struct SIZEL
{
LONG width;
LONG height;
} SIZEL;
};


struct WmfEnhMetaHeader


Loading…
Cancel
Save