aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/manager
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-01-11 11:14:18 +0000
committerMichael Mann <mmann78@netscape.net>2018-01-11 15:16:38 +0000
commit2aa826095739b5357350895b57dd9980fc06f8a0 (patch)
treeef61665e5eef69ac8b861f5caf78f7c663f22989 /ui/qt/manager
parent4e13791a09a034c043f6296c001566b6ab33b668 (diff)
wireshark_preference (Qt): fix extra ';' outside of a function is a C++11 extension [-Wc++11-extra-semi]
Change-Id: Ided4470e26f67f82fc90244560603e97b1d4d4b5 Reviewed-on: https://code.wireshark.org/review/25265 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/manager')
-rw-r--r--ui/qt/manager/wireshark_preference.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/ui/qt/manager/wireshark_preference.cpp b/ui/qt/manager/wireshark_preference.cpp
index dad6d86e38..0ac20ec51d 100644
--- a/ui/qt/manager/wireshark_preference.cpp
+++ b/ui/qt/manager/wireshark_preference.cpp
@@ -55,7 +55,7 @@ public:
return WiresharkPreference::editor(parent, option, index);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_BOOL, BoolPreference);
+REGISTER_PREFERENCE_TYPE(PREF_BOOL, BoolPreference)
class StringPreference : public WiresharkPreference
{
@@ -78,15 +78,15 @@ public:
model->setData(index, line->text(), Qt::EditRole);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_STRING, StringPreference);
+REGISTER_PREFERENCE_TYPE(PREF_STRING, StringPreference)
class UIntPreference : public StringPreference
{
public:
UIntPreference(QObject * parent = Q_NULLPTR) : StringPreference(parent) {}
};
-REGISTER_PREFERENCE_TYPE(PREF_UINT, UIntPreference);
-REGISTER_PREFERENCE_TYPE(PREF_DECODE_AS_UINT, UIntPreference);
+REGISTER_PREFERENCE_TYPE(PREF_UINT, UIntPreference)
+REGISTER_PREFERENCE_TYPE(PREF_DECODE_AS_UINT, UIntPreference)
class EnumPreference : public WiresharkPreference
{
@@ -115,7 +115,7 @@ public:
model->setData(index, combo->itemData(combo->currentIndex()), Qt::EditRole);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_ENUM, EnumPreference);
+REGISTER_PREFERENCE_TYPE(PREF_ENUM, EnumPreference)
class RangePreference : public WiresharkPreference
{
@@ -138,8 +138,8 @@ public:
model->setData(index, syntax->text(), Qt::EditRole);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_RANGE, RangePreference);
-REGISTER_PREFERENCE_TYPE(PREF_DECODE_AS_RANGE, RangePreference);
+REGISTER_PREFERENCE_TYPE(PREF_RANGE, RangePreference)
+REGISTER_PREFERENCE_TYPE(PREF_DECODE_AS_RANGE, RangePreference)
class ColorPreference : public WiresharkPreference
{
@@ -161,7 +161,7 @@ public:
return WiresharkPreference::editor(parent, option, index);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_COLOR, ColorPreference);
+REGISTER_PREFERENCE_TYPE(PREF_COLOR, ColorPreference)
class SaveFilePreference : public WiresharkPreference
{
@@ -177,7 +177,7 @@ public:
return WiresharkPreference::editor(parent, option, index);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_SAVE_FILENAME, SaveFilePreference);
+REGISTER_PREFERENCE_TYPE(PREF_SAVE_FILENAME, SaveFilePreference)
class OpenFilePreference : public WiresharkPreference
{
@@ -193,7 +193,7 @@ public:
return WiresharkPreference::editor(parent, option, index);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_OPEN_FILENAME, OpenFilePreference);
+REGISTER_PREFERENCE_TYPE(PREF_OPEN_FILENAME, OpenFilePreference)
class DirNamePreference : public WiresharkPreference
{
@@ -209,7 +209,7 @@ public:
return WiresharkPreference::editor(parent, option, index);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_DIRNAME, DirNamePreference);
+REGISTER_PREFERENCE_TYPE(PREF_DIRNAME, DirNamePreference)
class UatPreference : public WiresharkPreference
{
@@ -224,7 +224,7 @@ public:
return WiresharkPreference::editor(parent, option, index);
};
};
-REGISTER_PREFERENCE_TYPE(PREF_UAT, UatPreference);
+REGISTER_PREFERENCE_TYPE(PREF_UAT, UatPreference)
/*