summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-08-23 21:22:54 +0900
committerMichele Calgaro <[email protected]>2018-08-23 21:23:16 +0900
commit188fc19d9d21f753b092164f6c52dcd6c3661d84 (patch)
tree1b77b84b058f87045469a720d5b2db7402ca82ef
parenta58e5248446baf7bee97922f4772851c79f3ec43 (diff)
downloadkrecipes-188fc19d9d21f753b092164f6c52dcd6c3661d84.tar.gz
krecipes-188fc19d9d21f753b092164f6c52dcd6c3661d84.zip
Fixed typedef-related warnings from compiler.
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 60c49adba5c14933e9512cf3555333b09e536d78)
-rw-r--r--krecipes/src/backends/recipedb.h2
-rw-r--r--krecipes/src/datablocks/mixednumber.h2
-rw-r--r--krecipes/src/dialogs/dependanciesdialog.h2
-rw-r--r--krecipes/src/dialogs/recipeinputdialog.cpp2
-rw-r--r--krecipes/src/dialogs/selectpropertydialog.h2
-rw-r--r--krecipes/src/dialogs/selectunitdialog.h2
-rw-r--r--krecipes/src/krecipesview.h2
-rw-r--r--krecipes/src/recipeactionshandler.h4
-rw-r--r--krecipes/src/widgets/dblistviewbase.h2
9 files changed, 10 insertions, 10 deletions
diff --git a/krecipes/src/backends/recipedb.h b/krecipes/src/backends/recipedb.h
index 689c9ad..f987c32 100644
--- a/krecipes/src/backends/recipedb.h
+++ b/krecipes/src/backends/recipedb.h
@@ -89,7 +89,7 @@ public:
All = 0xFFFF ^ NamesOnly ^ Noatime
};
- typedef enum ConversionStatus {
+ enum ConversionStatus {
Success,
MissingUnitConversion,
MissingIngredientWeight,
diff --git a/krecipes/src/datablocks/mixednumber.h b/krecipes/src/datablocks/mixednumber.h
index 7dd318e..15d9054 100644
--- a/krecipes/src/datablocks/mixednumber.h
+++ b/krecipes/src/datablocks/mixednumber.h
@@ -46,7 +46,7 @@ public:
return ( toDouble() > d );
}
- typedef enum Format { DecimalFormat, MixedNumberFormat };
+ enum Format { DecimalFormat, MixedNumberFormat };
/** The input as a decimal. */
double toDouble() const;
diff --git a/krecipes/src/dialogs/dependanciesdialog.h b/krecipes/src/dialogs/dependanciesdialog.h
index c03705d..84721ea 100644
--- a/krecipes/src/dialogs/dependanciesdialog.h
+++ b/krecipes/src/dialogs/dependanciesdialog.h
@@ -23,7 +23,7 @@
#include "datablocks/elementlist.h"
-typedef struct ListInfo {
+struct ListInfo {
ElementList list;
TQString name;
};
diff --git a/krecipes/src/dialogs/recipeinputdialog.cpp b/krecipes/src/dialogs/recipeinputdialog.cpp
index a5bd1af..b29443c 100644
--- a/krecipes/src/dialogs/recipeinputdialog.cpp
+++ b/krecipes/src/dialogs/recipeinputdialog.cpp
@@ -60,7 +60,7 @@
#include "profiling.h"
-typedef enum ColorStatus { GreenStatus, RedStatus, YellowStatus };
+enum ColorStatus { GreenStatus, RedStatus, YellowStatus };
ClickableLed::ClickableLed( TQWidget *parent ) : KLed(parent)
{
diff --git a/krecipes/src/dialogs/selectpropertydialog.h b/krecipes/src/dialogs/selectpropertydialog.h
index 9aec6ff..ff8aa4f 100644
--- a/krecipes/src/dialogs/selectpropertydialog.h
+++ b/krecipes/src/dialogs/selectpropertydialog.h
@@ -34,7 +34,7 @@ class IngredientPropertyList;
class SelectPropertyDialog: public KDialogBase
{
public:
- typedef enum OptionFlag { ShowEmptyUnit, HideEmptyUnit } ;
+ enum OptionFlag { ShowEmptyUnit, HideEmptyUnit } ;
// Methods
SelectPropertyDialog( TQWidget* parent, IngredientPropertyList *propertyList, UnitList *unitList, OptionFlag showEmpty = ShowEmptyUnit );
diff --git a/krecipes/src/dialogs/selectunitdialog.h b/krecipes/src/dialogs/selectunitdialog.h
index 8e7e7ca..22d07be 100644
--- a/krecipes/src/dialogs/selectunitdialog.h
+++ b/krecipes/src/dialogs/selectunitdialog.h
@@ -30,7 +30,7 @@
class SelectUnitDialog : public KDialogBase
{
public:
- typedef enum OptionFlag { ShowEmptyUnit, HideEmptyUnit } ;
+ enum OptionFlag { ShowEmptyUnit, HideEmptyUnit } ;
SelectUnitDialog( TQWidget* parent, const UnitList &unitList, OptionFlag = ShowEmptyUnit );
diff --git a/krecipes/src/krecipesview.h b/krecipes/src/krecipesview.h
index 130cbd7..2216594 100644
--- a/krecipes/src/krecipesview.h
+++ b/krecipes/src/krecipesview.h
@@ -75,7 +75,7 @@ typedef TQValueList <Menu>::Iterator MenuId;
// Some constants
-typedef enum KrePanel {SelectP = 0, ShoppingP, DietP, MatcherP, IngredientsP, PropertiesP, UnitsP, PrepMethodsP, CategoriesP, AuthorsP, RecipeEdit, RecipeView };
+enum KrePanel {SelectP = 0, ShoppingP, DietP, MatcherP, IngredientsP, PropertiesP, UnitsP, PrepMethodsP, CategoriesP, AuthorsP, RecipeEdit, RecipeView };
// Class KrecipesView
diff --git a/krecipes/src/recipeactionshandler.h b/krecipes/src/recipeactionshandler.h
index 9d4a9d9..67d3d7a 100644
--- a/krecipes/src/recipeactionshandler.h
+++ b/krecipes/src/recipeactionshandler.h
@@ -35,8 +35,8 @@ class RecipeActionsHandler : public TQObject
Q_OBJECT
public:
- typedef enum ItemType { Category, Recipe };
- typedef enum RecipeActions {
+ enum ItemType { Category, Recipe };
+ enum RecipeActions {
AllActions = 0xffff,
Open = 0x0001,
Edit = 0x0002,
diff --git a/krecipes/src/widgets/dblistviewbase.h b/krecipes/src/widgets/dblistviewbase.h
index 44e8555..e31c42a 100644
--- a/krecipes/src/widgets/dblistviewbase.h
+++ b/krecipes/src/widgets/dblistviewbase.h
@@ -23,7 +23,7 @@ class KProgressDialog;
class RecipeDB;
-typedef enum ReloadFlags {
+enum ReloadFlags {
Load, /** Only performs the reload if the list hasn't already been loaded */
ReloadIfPopulated, /** Only performs the reload if the list has been loaded */
ForceReload /** Load/reload the list regardless of whether or not it's been loaded */