* Moved TomahawkSqlQuery's implementation into a separate file.

src/libtomahawk/CMakeLists.txt

@@ -197,7 +197,6 @@ set( libSources
 
     audio/AudioEngine.cpp
 
-
     database/Database.cpp
     database/FuzzyIndex.cpp
     database/DatabaseCollection.cpp
@@ -250,6 +249,7 @@ set( libSources
     database/DatabaseCommand_TrackAttributes.cpp
     database/DatabaseCommand_SetTrackAttributes.cpp
     database/Database.cpp
+    database/TomahawkSqlQuery.cpp
 
     infosystem/InfoSystem.cpp
     infosystem/InfoSystemCache.cpp

src/libtomahawk/database/TomahawkSqlQuery.cpp

@@ -0,0 +1,76 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "database/TomahawkSqlQuery.h"
+
+#include "utils/Logger.h"
+
+#include <QSqlError>
+#include <QTime>
+
+#define QUERY_THRESHOLD 60
+
+
+TomahawkSqlQuery::TomahawkSqlQuery()
+    : QSqlQuery()
+{
+}
+
+
+TomahawkSqlQuery::TomahawkSqlQuery( const QSqlDatabase& db )
+    : QSqlQuery( db )
+{
+}
+
+
+bool
+TomahawkSqlQuery::exec( const QString& query )
+{
+    prepare( query );
+    return exec();
+}
+
+
+bool
+TomahawkSqlQuery::exec()
+{
+    QTime t;
+    t.start();
+
+    bool ret = QSqlQuery::exec();
+    if ( !ret )
+        showError();
+
+    int e = t.elapsed();
+    if ( e >= QUERY_THRESHOLD )
+        tLog() << "TomahawkSqlQuery (" << lastQuery() << ") finished in" << t.elapsed() << "ms";
+
+    return ret;
+}
+
+
+void
+TomahawkSqlQuery::showError()
+{
+    tLog() << "\n" << "*** DATABASE ERROR ***" << "\n"
+           << this->lastQuery() << "\n"
+           << "boundValues:" << this->boundValues() << "\n"
+           << this->lastError().text() << "\n"
+                ;
+    Q_ASSERT( false );
+}

src/libtomahawk/database/TomahawkSqlQuery.h

@@ -18,62 +18,23 @@
 
 #ifndef TOMAHAWKSQLQUERY_H
 #define TOMAHAWKSQLQUERY_H
+
 // subclass QSqlQuery so that it prints the error msg if a query fails
 
 #include <QSqlQuery>
-#include <QSqlError>
-#include <QTime>
-
-#include "utils/Logger.h"
-
-#define TOMAHAWK_QUERY_THRESHOLD 60
 
 class TomahawkSqlQuery : public QSqlQuery
 {
 
 public:
+    TomahawkSqlQuery();
+    TomahawkSqlQuery( const QSqlDatabase& db );
 
-    TomahawkSqlQuery()
+    bool exec( const QString& query );
-        : QSqlQuery()
+    bool exec();
-    {}
-
-    TomahawkSqlQuery( const QSqlDatabase& db )
-        : QSqlQuery( db )
-    {}
-
-    bool exec( const QString& query )
-    {
-        prepare( query );
-
-        return exec();
-    }
-
-    bool exec()
-    {
-        QTime t;
-        t.start();
-
-        bool ret = QSqlQuery::exec();
-        if( !ret )
-            showError();
-
-        int e = t.elapsed();
-        if ( e >= TOMAHAWK_QUERY_THRESHOLD )
-            tLog( LOGVERBOSE ) << "TomahawkSqlQuery (" << lastQuery() << ") finished in" << t.elapsed() << "ms";
-
-        return ret;
-    }
 
 private:
-    void showError()
+    void showError();
-    {
-        tLog() << "\n" << "*** DATABASE ERROR ***" << "\n"
-                << this->lastQuery() << "\n"
-                << "boundValues:" << this->boundValues() << "\n"
-                << this->lastError().text() << "\n"
-                ;
-        Q_ASSERT( false );
-    }
 };
 
 #endif // TOMAHAWKSQLQUERY_H