Fix gcc warnings/errors

diff --git a/abstractcommand.h b/abstractcommand.h
index 1a7ce59a4e927dece07a8c60ef329987868b2266..0484608d5d3fd9a352e4b6c5102d8d49f1c87c3b 100644 (file)
--- a/abstractcommand.h
+++ b/abstractcommand.h
@@ -40,7 +40,7 @@ typedef name##Command CommandType; \
 private: \
 CommandType m_command; \
 Client *m_client; \
-name##Reply(const CommandType command, const QByteArray &id, Client *client, QObject *parent) : m_command(command), m_client(client), AbstractReply(id, client, parent) {constructor} \
+name##Reply(const CommandType command, const QByteArray &id, Client *client, QObject *parent) : AbstractReply(id, client, parent), m_command(command), m_client(client) {constructor} \
 inline const CommandType &command() const { return m_command; }
 
 #define REPLY_DEFINITION_HELPER(name) \

diff --git a/clientqueuedcommandsmodel.cpp b/clientqueuedcommandsmodel.cpp
index 58bd1e0b57f913ce19a85e6a880b754879242e13..11aad985556c2955e63a8684f7f69949a74a6944 100644 (file)
--- a/clientqueuedcommandsmodel.cpp
+++ b/clientqueuedcommandsmodel.cpp
@@ -5,7 +5,7 @@
 namespace AniDBUdpClient {
 
 ClientQueuedCommandsModel::ClientQueuedCommandsModel(Client *client, QObject *parent) :
-       m_client(0), QAbstractTableModel(parent)
+               QAbstractTableModel(parent), m_client(0)
 {
        setClient(client);
 }

diff --git a/clientsentcommandsmodel.cpp b/clientsentcommandsmodel.cpp
index 1da571529a6ae9324e16dbff7575fe1c6e3dd4e4..4df0150e6b06e5ac027ffb4e1adbc40289fabc96 100644 (file)
--- a/clientsentcommandsmodel.cpp
+++ b/clientsentcommandsmodel.cpp
@@ -5,7 +5,7 @@
 namespace AniDBUdpClient {
 
 ClientSentCommandsModel::ClientSentCommandsModel(Client *client, QObject *parent) :
-       m_client(0), QAbstractTableModel(parent)
+               QAbstractTableModel(parent), m_client(0)
 {
        setClient(client);
 }

diff --git a/file.cpp b/file.cpp
index 19dbc4e814e2420d22c2c9af36eb75202e84acec..c58ab991b214cd4ac629b4cacdc2ec11e2b44fa7 100644 (file)
--- a/file.cpp
+++ b/file.cpp
@@ -437,6 +437,8 @@ void File::updateStatus(Action action, ActionState actionState)
                break;
                case MarkingWatched:
                        m_markingState = actionState;
+               default:
+                       return;
        }
        emit statusUpdate(action, actionState);
 }

diff --git a/renameparser/ECMAScript/parser.cpp b/renameparser/ECMAScript/parser.cpp
index 46feaa45727fe381c3b12ae57fff9898798e4d07..117772e17cfe3ad3391d967aecf3ac9526e1d00d 100644 (file)
--- a/renameparser/ECMAScript/parser.cpp
+++ b/renameparser/ECMAScript/parser.cpp
@@ -55,7 +55,7 @@ QString Parser::evaluate(Environment &env) const
        {
                fct->activationObject().setProperty(funcName,
                        engine.newFunction(
-                                       &RenameEngine2QtScriptHelper, RenameEngine::function(funcName)));
+                                        &RenameEngine2QtScriptHelper, (void *) RenameEngine::function(funcName)));
        }
 
        QScriptContext *ct = engine.pushContext();