removing unneeded semicolons after Qt macros - making Quassel compile on Solaris...

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 201966b..fcaa0f2 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -275,7 +275,7 @@ public:
     UserCategoryItemType = 0x04,
     IrcUserItemType = 0x08
   };
-  Q_DECLARE_FLAGS(itemTypes, itemType);
+  Q_DECLARE_FLAGS(itemTypes, itemType)
 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
@@ -329,6 +329,6 @@ private:
 
   QHash<BufferId, BufferItem *> _bufferItemCache;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes)
 
 #endif // NETWORKMODEL_H

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index e4b5ca3..6b1d33c 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -39,7 +39,7 @@ public:
     NoTreeItemFlag = 0x00,
     DeleteOnLastChildRemoved = 0x01
   };
-  Q_DECLARE_FLAGS(TreeItemFlags, TreeItemFlag);
+  Q_DECLARE_FLAGS(TreeItemFlags, TreeItemFlag)
 
   AbstractTreeItem(AbstractTreeItem *parent = 0);
 

diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h
index cf38562..fd37329 100644 (file)
--- a/src/common/bufferinfo.h
+++ b/src/common/bufferinfo.h
@@ -76,7 +76,7 @@ QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo);
 QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo);
 QDebug operator<<(QDebug dbg, const BufferInfo &b);
 
-Q_DECLARE_METATYPE(BufferInfo);
+Q_DECLARE_METATYPE(BufferInfo)
 Q_DECLARE_OPERATORS_FOR_FLAGS(BufferInfo::ActivityLevel)
 
 uint qHash(const BufferInfo &);

diff --git a/src/common/identity.h b/src/common/identity.h
index e20def6..8ffc7da 100644 (file)
--- a/src/common/identity.h
+++ b/src/common/identity.h
@@ -32,25 +32,25 @@
 class Identity : public SyncableObject {
   Q_OBJECT
 
-  Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false);
-  Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName STORED false);
-  Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false);
-  Q_PROPERTY(QStringList nicks READ nicks WRITE setNicks STORED false);
-  Q_PROPERTY(QString awayNick READ awayNick WRITE setAwayNick STORED false);
-  Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled STORED false);
-  Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason STORED false);
-  Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled STORED false);
-  Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled STORED false);
-  Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime STORED false);
-  Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason STORED false);
-  Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled STORED false);
-  Q_PROPERTY(bool detachAwayEnabled READ detachAwayEnabled WRITE setDetachAwayEnabled STORED false);
-  Q_PROPERTY(QString detachAwayReason READ detachAwayReason WRITE setDetachAwayReason STORED false);
-  Q_PROPERTY(bool detachAwayReasonEnabled READ detachAwayReasonEnabled WRITE setDetachAwayReasonEnabled STORED false);
-  Q_PROPERTY(QString ident READ ident WRITE setIdent STORED false);
-  Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason STORED false);
-  Q_PROPERTY(QString partReason READ partReason WRITE setPartReason STORED false);
-  Q_PROPERTY(QString quitReason READ quitReason WRITE setQuitReason STORED false);
+  Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false)
+  Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName STORED false)
+  Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false)
+  Q_PROPERTY(QStringList nicks READ nicks WRITE setNicks STORED false)
+  Q_PROPERTY(QString awayNick READ awayNick WRITE setAwayNick STORED false)
+  Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled STORED false)
+  Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason STORED false)
+  Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled STORED false)
+  Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled STORED false)
+  Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime STORED false)
+  Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason STORED false)
+  Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled STORED false)
+  Q_PROPERTY(bool detachAwayEnabled READ detachAwayEnabled WRITE setDetachAwayEnabled STORED false)
+  Q_PROPERTY(QString detachAwayReason READ detachAwayReason WRITE setDetachAwayReason STORED false)
+  Q_PROPERTY(bool detachAwayReasonEnabled READ detachAwayReasonEnabled WRITE setDetachAwayReasonEnabled STORED false)
+  Q_PROPERTY(QString ident READ ident WRITE setIdent STORED false)
+  Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason STORED false)
+  Q_PROPERTY(QString partReason READ partReason WRITE setPartReason STORED false)
+  Q_PROPERTY(QString quitReason READ quitReason WRITE setQuitReason STORED false)
 
   public:
     Identity(IdentityId id = 0, QObject *parent = 0);
@@ -151,6 +151,6 @@ class Identity : public SyncableObject {
 QDataStream &operator<<(QDataStream &out, Identity identity);
 QDataStream &operator>>(QDataStream &in, Identity &identity);
 
-Q_DECLARE_METATYPE(Identity);
+Q_DECLARE_METATYPE(Identity)
 
 #endif

diff --git a/src/common/message.h b/src/common/message.h
index 9bb1c9c..5641794 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -28,7 +28,7 @@
 #include "types.h"
 
 class Message {
-  Q_DECLARE_TR_FUNCTIONS(Message);
+  Q_DECLARE_TR_FUNCTIONS(Message)
 
 public:
   /** The different types a message can have for display */
@@ -93,7 +93,7 @@ private:
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 QDataStream &operator>>(QDataStream &in, Message &msg);
 
-Q_DECLARE_METATYPE(Message);
+Q_DECLARE_METATYPE(Message)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
 
 #endif

diff --git a/src/common/network.h b/src/common/network.h
index 5d272c5..dbc5f35 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -375,6 +375,6 @@ QDataStream &operator<<(QDataStream &out, const NetworkInfo &info);
 QDataStream &operator>>(QDataStream &in, NetworkInfo &info);
 QDebug operator<<(QDebug dbg, const NetworkInfo &i);
 
-Q_DECLARE_METATYPE(NetworkInfo);
+Q_DECLARE_METATYPE(NetworkInfo)
 
 #endif

diff --git a/src/common/types.h b/src/common/types.h
index c6a4bb1..0708818 100644 (file)
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -88,12 +88,12 @@ struct AccountId : public SignedId {
   inline AccountId(int _id = 0) : SignedId(_id) {};
 };
 
-Q_DECLARE_METATYPE(UserId);
-Q_DECLARE_METATYPE(MsgId);
-Q_DECLARE_METATYPE(BufferId);
-Q_DECLARE_METATYPE(NetworkId);
-Q_DECLARE_METATYPE(IdentityId);
-Q_DECLARE_METATYPE(AccountId);
+Q_DECLARE_METATYPE(UserId)
+Q_DECLARE_METATYPE(MsgId)
+Q_DECLARE_METATYPE(BufferId)
+Q_DECLARE_METATYPE(NetworkId)
+Q_DECLARE_METATYPE(IdentityId)
+Q_DECLARE_METATYPE(AccountId)
 
 //! Base class for exceptions.
 struct Exception {

diff --git a/src/qtui/chatlinemodel.h b/src/qtui/chatlinemodel.h
index 0fb9226..4604a9b 100644 (file)
--- a/src/qtui/chatlinemodel.h
+++ b/src/qtui/chatlinemodel.h
@@ -49,7 +49,7 @@ protected:
 QDataStream &operator<<(QDataStream &out, const ChatLineModel::WrapList);
 QDataStream &operator>>(QDataStream &in, ChatLineModel::WrapList &);
 
-Q_DECLARE_METATYPE(ChatLineModel::WrapList);
+Q_DECLARE_METATYPE(ChatLineModel::WrapList)
 
 #endif
 

diff --git a/src/uisupport/action.h b/src/uisupport/action.h
index a26d55c..8748ae9 100644 (file)
--- a/src/uisupport/action.h
+++ b/src/uisupport/action.h
@@ -26,16 +26,16 @@
 class Action : public QWidgetAction {
   Q_OBJECT
 
-  Q_PROPERTY(QShortcut shortcut READ shortcut WRITE setShortcut);
-  Q_PROPERTY(bool shortcutConfigurable READ isShortcutConfigurable WRITE setShortcutConfigurable);
-  Q_FLAGS(ShortcutType);
+  Q_PROPERTY(QShortcut shortcut READ shortcut WRITE setShortcut)
+  Q_PROPERTY(bool shortcutConfigurable READ isShortcutConfigurable WRITE setShortcutConfigurable)
+  Q_FLAGS(ShortcutType)
 
   public:
     enum ShortcutType {
       ActiveShortcut = 0x01,
       DefaultShortcut = 0x02
     };
-    Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType);
+    Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType)
 
     explicit Action(QObject *parent);
     Action(const QString &text, QObject *parent);
@@ -47,4 +47,4 @@ class Action : public QWidgetAction {
 
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(ShortcutTypes);
\ No newline at end of file
+Q_DECLARE_OPERATORS_FOR_FLAGS(ShortcutTypes)

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 8ced577..1005942 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -82,7 +82,7 @@ private:
   };
 
 public:
-  Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState);
+  Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState)
   QAction showChannelList;
 
 private:
@@ -120,7 +120,7 @@ private:
                          ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState) | QFlags<ItemActiveState>(InactiveState));
   QMenu *createHideEventsSubMenu(QMenu &menu);
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates);
+Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates)
 
 
 // ==============================

diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 18c32ad..e9c3fc8 100644 (file)
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -48,7 +48,7 @@ public:
     NoServers = 0x40,
     FullCustom = 0x80
   };
-  Q_DECLARE_FLAGS(Modes, Mode);
+  Q_DECLARE_FLAGS(Modes, Mode)
 
   BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config = 0);
   

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 70144c8..2aae59b 100644 (file)
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -31,7 +31,7 @@
 #include "settings.h"
 
 class UiStyle {
-  Q_DECLARE_TR_FUNCTIONS (UiStyle);
+  Q_DECLARE_TR_FUNCTIONS (UiStyle)
 
   public:
     UiStyle(const QString &settingsKey);
@@ -163,6 +163,6 @@ class UiStyle {
 QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList);
 QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList);
 
-Q_DECLARE_METATYPE(UiStyle::FormatList);
+Q_DECLARE_METATYPE(UiStyle::FormatList)
 
 #endif