No longer use automoc.

3 files changed, 65 insertions, 24 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbd7ebe97..93a799f4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,6 +51,7 @@ set(keepassx_SOURCES
     gui/GroupView.cpp
     gui/MainWindow.cpp
     keys/CompositeKey.cpp
+    keys/CompositeKey_p.h
     keys/Key.h
     keys/PasswordKey.cpp
     streams/HashedBlockStream.cpp
@@ -59,6 +60,25 @@ set(keepassx_SOURCES
     streams/SymmetricCipherStream.cpp
 )
 
+set(keepassx_MOC
+    core/Database.h
+    core/Entry.h
+    core/Group.h
+    core/Metadata.h
+    gui/DatabaseWidget.h
+    gui/EditEntryWidget.h
+    gui/EntryModel.h
+    gui/EntryView.h
+    gui/GroupModel.h
+    gui/GroupView.h
+    gui/MainWindow.h
+    keys/CompositeKey_p.h
+    streams/HashedBlockStream.h
+    streams/LayeredStream.h
+    streams/qtiocompressor.h
+    streams/SymmetricCipherStream.h
+)
+
 set(keepassx_FORMS
     gui/EditEntryWidget.ui
     gui/EditEntryWidgetMain.ui
@@ -67,8 +87,9 @@ set(keepassx_FORMS
 )
 
 qt4_wrap_ui(keepassx_SOURCES ${keepassx_FORMS})
+qt4_wrap_cpp(keepassx_SOURCES ${keepassx_MOC})
 
-automoc4_add_library( keepassx_core STATIC ${keepassx_SOURCES} )
+add_library( keepassx_core STATIC ${keepassx_SOURCES} )
 
-automoc4_add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp )
+add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp )
 target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} )
diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp
index 1fd5249f8..a039a2da5 100644
--- a/src/keys/CompositeKey.cpp
+++ b/src/keys/CompositeKey.cpp
@@ -16,30 +16,11 @@
 */
 
 #include "CompositeKey.h"
-
-#include <QtCore/QThread>
+#include "CompositeKey_p.h"
 
 #include "crypto/CryptoHash.h"
 #include "crypto/SymmetricCipher.h"
 
-class KeyTransformation : public QThread
-{
-    Q_OBJECT
-
-public:
-    KeyTransformation(const QByteArray& key, const QByteArray& seed, int rounds);
-    QByteArray result();
-
-protected:
-    void run();
-
-private:
-    QByteArray m_key;
-    QByteArray m_seed;
-    int m_rounds;
-    QByteArray m_result;
-};
-
 CompositeKey::~CompositeKey()
 {
     qDeleteAll(m_keys);
@@ -109,5 +90,3 @@ QByteArray KeyTransformation::result()
 {
     return m_result;
 }
-
-#include "KeyTransformation.moc"
diff --git a/src/keys/CompositeKey_p.h b/src/keys/CompositeKey_p.h
new file mode 100644
index 000000000..c259bf526
--- /dev/null
+++ b/src/keys/CompositeKey_p.h
@@ -0,0 +1,41 @@
+/*
+*  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+*
+*  This program 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 2 or (at your option)
+*  version 3 of the License.
+*
+*  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef KEEPASSX_COMPOSITEKEY_P_H
+#define KEEPASSX_COMPOSITEKEY_P_H
+
+#include <QtCore/QThread>
+
+class KeyTransformation : public QThread
+{
+    Q_OBJECT
+
+public:
+    KeyTransformation(const QByteArray& key, const QByteArray& seed, int rounds);
+    QByteArray result();
+
+protected:
+    void run();
+
+private:
+    QByteArray m_key;
+    QByteArray m_seed;
+    int m_rounds;
+    QByteArray m_result;
+};
+
+#endif // KEEPASSX_COMPOSITEKEY_P_H