[PATCH] Remove QT4_AUTOMOC in favor of QT4_WRAP_CPP
Jaak Ristioja
ristioja at gmail.com
Fri Apr 17 21:12:16 MST 2009
---
CMakeLists.txt | 9 +-
cmake/bibletime_source_list.cmake | 89 ++++++++++++++++++++
src/backend/cswordmodulesearch.cpp | 1 -
src/backend/drivers/cswordmoduleinfo.cpp | 1 -
src/backend/managers/cswordbackend.cpp | 1 -
src/bibletime.cpp | 1 -
src/bibletime_dbus_adaptor.cpp | 1 -
src/frontend/bookshelfmanager/btconfigdialog.cpp | 1 -
src/frontend/bookshelfmanager/btinstallmgr.cpp | 1 -
.../bookshelfmanager/btmodulemanagerdialog.cpp | 1 -
.../cswordsetupinstallsourcesdialog.cpp | 1 -
.../bookshelfmanager/indexpage/btindexpage.cpp | 1 -
.../installpage/btinstallmodulechooserdialog.cpp | 1 -
.../bookshelfmanager/installpage/btinstallpage.cpp | 1 -
.../installpage/btinstallpathdialog.cpp | 1 -
.../installpage/btinstallprogressdialog.cpp | 1 -
.../installpage/btinstallthread.cpp | 1 -
.../bookshelfmanager/installpage/btsourcearea.cpp | 1 -
.../installpage/btsourcewidget.cpp | 1 -
.../bookshelfmanager/removepage/btremovepage.cpp | 1 -
src/frontend/btaboutmoduledialog.cpp | 1 -
src/frontend/cdragdrop.cpp | 1 -
src/frontend/cinfodisplay.cpp | 1 -
src/frontend/cinputdialog.cpp | 1 -
src/frontend/cmdiarea.cpp | 1 -
src/frontend/cmodulechooserdialog.cpp | 1 -
src/frontend/cmoduleindexdialog.cpp | 1 -
src/frontend/cprinter.cpp | 1 -
src/frontend/display/btcolorwidget.cpp | 1 -
src/frontend/display/btfontsizewidget.cpp | 1 -
src/frontend/display/bthtmlfindtext.cpp | 1 -
src/frontend/display/bthtmljsobject.cpp | 1 -
src/frontend/display/bthtmlreaddisplay.cpp | 1 -
src/frontend/display/cdisplay.cpp | 1 -
src/frontend/display/chtmlwritedisplay.cpp | 1 -
src/frontend/displaywindow/btactioncollection.cpp | 1 -
.../displaywindow/bttoolbarpopupaction.cpp | 1 -
src/frontend/displaywindow/cbiblereadwindow.cpp | 1 -
src/frontend/displaywindow/cbookreadwindow.cpp | 1 -
src/frontend/displaywindow/cbuttons.cpp | 1 -
.../displaywindow/ccommentaryreadwindow.cpp | 1 -
src/frontend/displaywindow/cdisplaywindow.cpp | 1 -
src/frontend/displaywindow/chtmlwritewindow.cpp | 1 -
src/frontend/displaywindow/clexiconreadwindow.cpp | 1 -
src/frontend/displaywindow/cmodulechooserbar.cpp | 1 -
.../displaywindow/cmodulechooserbutton.cpp | 1 -
src/frontend/displaywindow/cplainwritewindow.cpp | 1 -
src/frontend/displaywindow/creadwindow.cpp | 1 -
src/frontend/displaywindow/cwritewindow.cpp | 1 -
src/frontend/htmldialogs/btaboutdialog.cpp | 1 -
src/frontend/htmldialogs/bttabhtmldialog.cpp | 1 -
src/frontend/keychooser/bthistory.cpp | 1 -
src/frontend/keychooser/cbookkeychooser.cpp | 1 -
src/frontend/keychooser/cbooktreechooser.cpp | 1 -
src/frontend/keychooser/ckeychooser.cpp | 1 -
src/frontend/keychooser/ckeychooserwidget.cpp | 1 -
src/frontend/keychooser/clexiconkeychooser.cpp | 1 -
src/frontend/keychooser/cscrollbutton.cpp | 1 -
src/frontend/keychooser/cscrollerwidgetset.cpp | 1 -
.../versekeychooser/btdropdownchooserbutton.cpp | 1 -
.../keychooser/versekeychooser/btversekeymenu.cpp | 1 -
.../versekeychooser/cbiblekeychooser.cpp | 1 -
.../versekeychooser/ckeyreferencewidget.cpp | 1 -
.../mainindex/bookmarks/cbookmarkindex.cpp | 1 -
.../mainindex/bookshelf/cbookshelfindex.cpp | 1 -
.../bookshelf/chidemodulechooserdialog.cpp | 1 -
src/frontend/mainindex/cmainindex.cpp | 1 -
.../analysis/csearchanalysisdialog.cpp | 1 -
.../searchdialog/analysis/csearchanalysisscene.cpp | 1 -
src/frontend/searchdialog/btsearchoptionsarea.cpp | 1 -
src/frontend/searchdialog/btsearchresultarea.cpp | 1 -
src/frontend/searchdialog/chistorycombobox.cpp | 1 -
src/frontend/searchdialog/cmoduleresultview.cpp | 1 -
src/frontend/searchdialog/crangechooserdialog.cpp | 1 -
src/frontend/searchdialog/csearchdialog.cpp | 1 -
.../searchdialog/csearchmodulechooserdialog.cpp | 1 -
src/frontend/searchdialog/csearchresultview.cpp | 1 -
.../settingsdialogs/cconfigurationdialog.cpp | 1 -
src/frontend/settingsdialogs/cdisplaysettings.cpp | 1 -
src/frontend/settingsdialogs/cfontchooser.cpp | 1 -
src/frontend/settingsdialogs/clanguagesettings.cpp | 1 -
src/frontend/settingsdialogs/clistwidget.cpp | 1 -
src/frontend/settingsdialogs/cswordsettings.cpp | 1 -
src/tests/bibletime_test.cpp | 1 -
84 files changed, 94 insertions(+), 86 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab0aa61..5688400 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,8 +77,8 @@ LINK_DIRECTORIES(
#Link to QtTest only in debug builds
IF (CMAKE_BUILD_TYPE STREQUAL "Release")
# this will run moc on source files
- QT4_AUTOMOC( ${bibletime_SOURCES} )
- ADD_EXECUTABLE(bibletime ${bibletime_SOURCES} ${bibletime_UIS_H})
+ QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
+ ADD_EXECUTABLE(bibletime ${bibletime_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES})
SET_TARGET_PROPERTIES(bibletime
PROPERTIES
COMPILE_FLAGS "${SWORD_CFLAGS}" #Enable exception handling
@@ -91,10 +91,11 @@ IF (CMAKE_BUILD_TYPE STREQUAL "Release")
)
ELSE (CMAKE_BUILD_TYPE STREQUAL "Release")
# this will run moc on source files
- QT4_AUTOMOC( ${bibletime_SOURCES} ${bibletime_test_SOURCES} )
+ QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
+ QT4_WRAP_CPP(bibletime_test_MOC_SOURCES ${bibletime_test_MOCABLE_HEADERS})
SET(CMAKE_BUILD_TYPE "Debug")
ADD_EXECUTABLE(bibletime ${bibletime_SOURCES}
- ${bibletime_test_SOURCES} ${bibletime_UIS_H})
+ ${bibletime_test_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES} ${bibletime_test_MOC_SOURCES})
SET_TARGET_PROPERTIES(bibletime
PROPERTIES
COMPILE_FLAGS "-DBT_ENABLE_TESTING ${SWORD_CFLAGS}" #Enable exception handling and Testing
diff --git a/cmake/bibletime_source_list.cmake b/cmake/bibletime_source_list.cmake
index f5450d3..c3ac1da 100644
--- a/cmake/bibletime_source_list.cmake
+++ b/cmake/bibletime_source_list.cmake
@@ -184,6 +184,92 @@ SET(bibletime_SOURCES
src/main.cpp
)
+# mocable headers
+SET(bibletime_MOCABLE_HEADERS
+ src/backend/drivers/cswordmoduleinfo.h
+ src/backend/managers/cswordbackend.h
+ src/backend/cswordmodulesearch.h
+ src/bibletime.h
+ src/bibletime_dbus_adaptor.h
+ src/frontend/searchdialog/csearchmodulechooserdialog.h
+ src/frontend/searchdialog/crangechooserdialog.h
+ src/frontend/searchdialog/btsearchresultarea.h
+ src/frontend/searchdialog/btsearchoptionsarea.h
+ src/frontend/searchdialog/cmoduleresultview.h
+ src/frontend/searchdialog/csearchdialog.h
+ src/frontend/searchdialog/analysis/csearchanalysisdialog.h
+ src/frontend/searchdialog/analysis/csearchanalysisscene.h
+ src/frontend/searchdialog/csearchresultview.h
+ src/frontend/searchdialog/chistorycombobox.h
+ src/frontend/cdragdrop.h
+ src/frontend/mainindex/bookshelf/chidemodulechooserdialog.h
+ src/frontend/mainindex/bookshelf/cbookshelfindex.h
+ src/frontend/mainindex/cmainindex.h
+ src/frontend/mainindex/bookmarks/cbookmarkindex.h
+ src/frontend/cmdiarea.h
+ src/frontend/cinfodisplay.h
+ src/frontend/cinputdialog.h
+ src/frontend/cmodulechooserdialog.h
+ src/frontend/keychooser/cscrollerwidgetset.h
+ src/frontend/keychooser/cbooktreechooser.h
+ src/frontend/keychooser/versekeychooser/btversekeymenu.h
+ src/frontend/keychooser/versekeychooser/cbiblekeychooser.h
+ src/frontend/keychooser/versekeychooser/ckeyreferencewidget.h
+ src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.h
+ src/frontend/keychooser/cscrollbutton.h
+ src/frontend/keychooser/bthistory.h
+ src/frontend/keychooser/ckeychooserwidget.h
+ src/frontend/keychooser/cbookkeychooser.h
+ src/frontend/keychooser/ckeychooser.h
+ src/frontend/keychooser/clexiconkeychooser.h
+ src/frontend/cprinter.h
+ src/frontend/btaboutmoduledialog.h
+ src/frontend/htmldialogs/bttabhtmldialog.h
+ src/frontend/htmldialogs/btaboutdialog.h
+ src/frontend/display/cdisplay.h
+ src/frontend/display/bthtmlreaddisplay.h
+ src/frontend/display/btfontsizewidget.h
+ src/frontend/display/btcolorwidget.h
+ src/frontend/display/bthtmljsobject.h
+ src/frontend/display/chtmlwritedisplay.h
+ src/frontend/display/bthtmlfindtext.h
+ src/frontend/cmoduleindexdialog.h
+ src/frontend/settingsdialogs/cdisplaysettings.h
+ src/frontend/settingsdialogs/cswordsettings.h
+ src/frontend/settingsdialogs/clistwidget.h
+ src/frontend/settingsdialogs/cconfigurationdialog.h
+ #src/frontend/settingsdialogs/cacceleratorsettings.h.OFF
+ src/frontend/settingsdialogs/cfontchooser.h
+ src/frontend/settingsdialogs/clanguagesettings.h
+ src/frontend/displaywindow/cbookreadwindow.h
+ src/frontend/displaywindow/ccommentaryreadwindow.h
+ src/frontend/displaywindow/cmodulechooserbar.h
+ src/frontend/displaywindow/clexiconreadwindow.h
+ src/frontend/displaywindow/chtmlwritewindow.h
+ src/frontend/displaywindow/bttoolbarpopupaction.h
+ src/frontend/displaywindow/btactioncollection.h
+ src/frontend/displaywindow/creadwindow.h
+ src/frontend/displaywindow/cmodulechooserbutton.h
+ src/frontend/displaywindow/cbuttons.h
+ src/frontend/displaywindow/cbiblereadwindow.h
+ src/frontend/displaywindow/cplainwritewindow.h
+ src/frontend/displaywindow/cdisplaywindow.h
+ src/frontend/displaywindow/cwritewindow.h
+ src/frontend/bookshelfmanager/btconfigdialog.h
+ src/frontend/bookshelfmanager/removepage/btremovepage.h
+ src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
+ src/frontend/bookshelfmanager/installpage/btsourcewidget.h
+ src/frontend/bookshelfmanager/installpage/btinstallpage.h
+ src/frontend/bookshelfmanager/installpage/btsourcearea.h
+ src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h
+ src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h
+ src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h
+ src/frontend/bookshelfmanager/installpage/btinstallthread.h
+ src/frontend/bookshelfmanager/btmodulemanagerdialog.h
+ src/frontend/bookshelfmanager/indexpage/btindexpage.h
+ src/frontend/bookshelfmanager/btinstallmgr.h
+)
+
#unit tests
SET(bibletime_test_SOURCES
#main file
@@ -192,3 +278,6 @@ SET(bibletime_test_SOURCES
src/tests/backend/config/cbtconfig_test.cpp
)
+SET(bibletime_test_MOCABLE_HEADERS
+ src/tests/bibletime_test.h
+)
diff --git a/src/backend/cswordmodulesearch.cpp b/src/backend/cswordmodulesearch.cpp
index 02ce353..f57a87a 100644
--- a/src/backend/cswordmodulesearch.cpp
+++ b/src/backend/cswordmodulesearch.cpp
@@ -10,7 +10,6 @@
//BibleTime includes
#include "cswordmodulesearch.h"
-#include "cswordmodulesearch.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/managers/cswordbackend.h"
#include "backend/config/cbtconfig.h"
diff --git a/src/backend/drivers/cswordmoduleinfo.cpp b/src/backend/drivers/cswordmoduleinfo.cpp
index 3bbbbb4..c76f5ef 100644
--- a/src/backend/drivers/cswordmoduleinfo.cpp
+++ b/src/backend/drivers/cswordmoduleinfo.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "cswordmoduleinfo.h"
-#include "cswordmoduleinfo.moc"
#include "cswordlexiconmoduleinfo.h"
#include "backend/managers/cswordbackend.h"
diff --git a/src/backend/managers/cswordbackend.cpp b/src/backend/managers/cswordbackend.cpp
index 22ca728..45d884b 100644
--- a/src/backend/managers/cswordbackend.cpp
+++ b/src/backend/managers/cswordbackend.cpp
@@ -9,7 +9,6 @@
#include "cswordbackend.h"
-#include "cswordbackend.moc"
#include "backend/rendering/centrydisplay.h"
#include "backend/rendering/cbookdisplay.h"
#include "backend/rendering/cchapterdisplay.h"
diff --git a/src/bibletime.cpp b/src/bibletime.cpp
index f48bfda..9022491 100644
--- a/src/bibletime.cpp
+++ b/src/bibletime.cpp
@@ -7,7 +7,6 @@
*
**********/
#include "bibletime.h"
-#include "bibletime.moc"
#include "frontend/cmdiarea.h"
#include "frontend/mainindex/cmainindex.h"
diff --git a/src/bibletime_dbus_adaptor.cpp b/src/bibletime_dbus_adaptor.cpp
index a8e256e..ac32c47 100644
--- a/src/bibletime_dbus_adaptor.cpp
+++ b/src/bibletime_dbus_adaptor.cpp
@@ -10,7 +10,6 @@
#ifndef NO_DBUS
#include "bibletime_dbus_adaptor.h"
-#include "bibletime_dbus_adaptor.moc"
BibleTimeDBusAdaptor::BibleTimeDBusAdaptor(BibleTime *bibletime_ptr) :
QDBusAbstractAdaptor(bibletime_ptr),
diff --git a/src/frontend/bookshelfmanager/btconfigdialog.cpp b/src/frontend/bookshelfmanager/btconfigdialog.cpp
index f0d13f2..87cb12e 100644
--- a/src/frontend/bookshelfmanager/btconfigdialog.cpp
+++ b/src/frontend/bookshelfmanager/btconfigdialog.cpp
@@ -9,7 +9,6 @@
#include "btconfigdialog.h"
-#include "btconfigdialog.moc"
#include "util/directoryutil.h"
#include "util/ctoolclass.h"
diff --git a/src/frontend/bookshelfmanager/btinstallmgr.cpp b/src/frontend/bookshelfmanager/btinstallmgr.cpp
index 4437c16..817a349 100644
--- a/src/frontend/bookshelfmanager/btinstallmgr.cpp
+++ b/src/frontend/bookshelfmanager/btinstallmgr.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "btinstallmgr.h"
-#include "btinstallmgr.moc"
#include "frontend/bookshelfmanager/instbackend.h"
#include "backend/managers/cswordbackend.h"
diff --git a/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp b/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
index e146a97..5e3dc41 100644
--- a/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
+++ b/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "btmodulemanagerdialog.h"
-#include "btmodulemanagerdialog.moc"
#include "installpage/btinstallpage.h"
#include "removepage/btremovepage.h"
diff --git a/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp b/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
index 67adde9..bca32fa 100644
--- a/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
+++ b/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
@@ -9,7 +9,6 @@
//BT includes
#include "cswordsetupinstallsourcesdialog.h"
-#include "cswordsetupinstallsourcesdialog.moc"
#include "frontend/bookshelfmanager/instbackend.h"
diff --git a/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp b/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
index c7381fb..6c45f9c 100644
--- a/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
+++ b/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
@@ -8,7 +8,6 @@
**********/
#include "btindexpage.h"
-#include "btindexpage.moc"
#include "frontend/cmoduleindexdialog.h"
#include "backend/config/cbtconfig.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
index 9057ca1..739d2ea 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
@@ -108,7 +108,6 @@
**********/
#include "btinstallmodulechooserdialog.h"
-#include "btinstallmodulechooserdialog.moc"
#include "frontend/cmodulechooserdialog.h"
#include "backend/drivers/cswordmoduleinfo.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
index 15170fc..9f8e6b9 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
@@ -9,7 +9,6 @@
#include "btinstallpage.h"
-#include "btinstallpage.moc"
#include "btinstallpathdialog.h"
#include "btinstallprogressdialog.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
index ea911e5..82b8362 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "btinstallpathdialog.h"
-#include "btinstallpathdialog.moc"
#include "frontend/bookshelfmanager/instbackend.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp b/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
index 437bd43..2f60fc9 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "btinstallprogressdialog.h"
-#include "btinstallprogressdialog.moc"
#include "btinstallthread.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp b/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp
index 05e8a79..adab4fa 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp
@@ -8,7 +8,6 @@
**********/
#include "btinstallthread.h"
-#include "btinstallthread.moc"
#include "frontend/bookshelfmanager/btinstallmgr.h"
#include "frontend/bookshelfmanager/instbackend.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btsourcearea.cpp b/src/frontend/bookshelfmanager/installpage/btsourcearea.cpp
index 6d59729..06b4922 100644
--- a/src/frontend/bookshelfmanager/installpage/btsourcearea.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btsourcearea.cpp
@@ -8,7 +8,6 @@
**********/
#include "btsourcearea.h"
-#include "btsourcearea.moc"
#include "frontend/bookshelfmanager/instbackend.h"
diff --git a/src/frontend/bookshelfmanager/installpage/btsourcewidget.cpp b/src/frontend/bookshelfmanager/installpage/btsourcewidget.cpp
index 62ac68b..61183d3 100644
--- a/src/frontend/bookshelfmanager/installpage/btsourcewidget.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btsourcewidget.cpp
@@ -8,7 +8,6 @@
**********/
#include "btsourcewidget.h"
-#include "btsourcewidget.moc"
#include "btinstallpage.h"
#include "btsourcearea.h"
diff --git a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
index 1066ff4..c4324e3 100644
--- a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
+++ b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
@@ -9,7 +9,6 @@
#include "btremovepage.h"
-#include "btremovepage.moc"
#include "backend/btmoduletreeitem.h"
diff --git a/src/frontend/btaboutmoduledialog.cpp b/src/frontend/btaboutmoduledialog.cpp
index dd85868..1cb326e 100644
--- a/src/frontend/btaboutmoduledialog.cpp
+++ b/src/frontend/btaboutmoduledialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "btaboutmoduledialog.h"
-#include "btaboutmoduledialog.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "util/dialogutil.h"
diff --git a/src/frontend/cdragdrop.cpp b/src/frontend/cdragdrop.cpp
index d42a4c8..84d6376 100644
--- a/src/frontend/cdragdrop.cpp
+++ b/src/frontend/cdragdrop.cpp
@@ -9,7 +9,6 @@
#include "cdragdrop.h"
-#include "cdragdrop.moc"
#include <QString>
#include <QByteArray>
diff --git a/src/frontend/cinfodisplay.cpp b/src/frontend/cinfodisplay.cpp
index 9f5d498..f11727e 100644
--- a/src/frontend/cinfodisplay.cpp
+++ b/src/frontend/cinfodisplay.cpp
@@ -9,7 +9,6 @@
// BibleTime includes
#include "cinfodisplay.h"
-#include "cinfodisplay.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/keys/cswordkey.h"
diff --git a/src/frontend/cinputdialog.cpp b/src/frontend/cinputdialog.cpp
index 637bab9..59b178d 100644
--- a/src/frontend/cinputdialog.cpp
+++ b/src/frontend/cinputdialog.cpp
@@ -11,7 +11,6 @@
//own includes
#include "cinputdialog.h"
-#include "cinputdialog.moc"
#include "util/dialogutil.h"
//Qt includes
diff --git a/src/frontend/cmdiarea.cpp b/src/frontend/cmdiarea.cpp
index 3a298b4..69f3e7a 100644
--- a/src/frontend/cmdiarea.cpp
+++ b/src/frontend/cmdiarea.cpp
@@ -8,7 +8,6 @@
**********/
#include "cmdiarea.h"
-#include "cmdiarea.moc"
//QT includes
#include <QTimer>
diff --git a/src/frontend/cmodulechooserdialog.cpp b/src/frontend/cmodulechooserdialog.cpp
index 595a078..e7b96c8 100644
--- a/src/frontend/cmodulechooserdialog.cpp
+++ b/src/frontend/cmodulechooserdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "cmodulechooserdialog.h"
-#include "cmodulechooserdialog.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/managers/cswordbackend.h"
diff --git a/src/frontend/cmoduleindexdialog.cpp b/src/frontend/cmoduleindexdialog.cpp
index 4d7e090..7edcd8c 100644
--- a/src/frontend/cmoduleindexdialog.cpp
+++ b/src/frontend/cmoduleindexdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "cmoduleindexdialog.h"
-#include "cmoduleindexdialog.moc"
#include "util/cpointers.h"
#include "backend/managers/cswordbackend.h"
diff --git a/src/frontend/cprinter.cpp b/src/frontend/cprinter.cpp
index 4aa0eaf..92699af 100644
--- a/src/frontend/cprinter.cpp
+++ b/src/frontend/cprinter.cpp
@@ -8,7 +8,6 @@
**********/
#include "cprinter.h"
-#include "cprinter.moc"
#include "backend/managers/cdisplaytemplatemgr.h"
#include "backend/keys/cswordversekey.h"
diff --git a/src/frontend/display/btcolorwidget.cpp b/src/frontend/display/btcolorwidget.cpp
index 6e7f55b..f807b05 100644
--- a/src/frontend/display/btcolorwidget.cpp
+++ b/src/frontend/display/btcolorwidget.cpp
@@ -8,7 +8,6 @@
**********/
#include "btcolorwidget.h"
-#include "btcolorwidget.moc"
#include <QPalette>
#include <QColor>
#include <QMouseEvent>
diff --git a/src/frontend/display/btfontsizewidget.cpp b/src/frontend/display/btfontsizewidget.cpp
index 7284d46..3f03693 100644
--- a/src/frontend/display/btfontsizewidget.cpp
+++ b/src/frontend/display/btfontsizewidget.cpp
@@ -8,7 +8,6 @@
**********/
#include "btfontsizewidget.h"
-#include "btfontsizewidget.moc"
#include <QFontDatabase>
#include <QCompleter>
diff --git a/src/frontend/display/bthtmlfindtext.cpp b/src/frontend/display/bthtmlfindtext.cpp
index d95883b..9041173 100644
--- a/src/frontend/display/bthtmlfindtext.cpp
+++ b/src/frontend/display/bthtmlfindtext.cpp
@@ -8,7 +8,6 @@
**********/
#include "bthtmlfindtext.h"
-#include "bthtmlfindtext.moc"
#include "bthtmlreaddisplay.h"
#include "creaddisplay.h"
#include "frontend/cmdiarea.h"
diff --git a/src/frontend/display/bthtmljsobject.cpp b/src/frontend/display/bthtmljsobject.cpp
index 2fee289..836a6a3 100644
--- a/src/frontend/display/bthtmljsobject.cpp
+++ b/src/frontend/display/bthtmljsobject.cpp
@@ -7,7 +7,6 @@
*
**********/
#include "bthtmljsobject.h"
-#include "bthtmljsobject.moc"
#include "bthtmlreaddisplay.h"
#include "frontend/cinfodisplay.h"
#include "frontend/cdragdrop.h"
diff --git a/src/frontend/display/bthtmlreaddisplay.cpp b/src/frontend/display/bthtmlreaddisplay.cpp
index 66f5054..98f9582 100644
--- a/src/frontend/display/bthtmlreaddisplay.cpp
+++ b/src/frontend/display/bthtmlreaddisplay.cpp
@@ -8,7 +8,6 @@
**********/
#include "bthtmlreaddisplay.h"
-#include "bthtmlreaddisplay.moc"
#include "bthtmljsobject.h"
#include "frontend/displaywindow/cdisplaywindow.h"
#include "frontend/displaywindow/creadwindow.h"
diff --git a/src/frontend/display/cdisplay.cpp b/src/frontend/display/cdisplay.cpp
index 12f3636..9333bd9 100644
--- a/src/frontend/display/cdisplay.cpp
+++ b/src/frontend/display/cdisplay.cpp
@@ -8,7 +8,6 @@
**********/
#include "cdisplay.h"
-#include "cdisplay.moc"
#include "bthtmlreaddisplay.h"
typedef BtHtmlReadDisplay HTMLREADDISPLAY;
diff --git a/src/frontend/display/chtmlwritedisplay.cpp b/src/frontend/display/chtmlwritedisplay.cpp
index 451ac09..4b9246e 100644
--- a/src/frontend/display/chtmlwritedisplay.cpp
+++ b/src/frontend/display/chtmlwritedisplay.cpp
@@ -10,7 +10,6 @@
#include "chtmlwritedisplay.h"
-#include "chtmlwritedisplay.moc"
#include "btfontsizewidget.h"
#include "btcolorwidget.h"
#include "frontend/displaywindow/cwritewindow.h"
diff --git a/src/frontend/displaywindow/btactioncollection.cpp b/src/frontend/displaywindow/btactioncollection.cpp
index b27e772..f71709a 100644
--- a/src/frontend/displaywindow/btactioncollection.cpp
+++ b/src/frontend/displaywindow/btactioncollection.cpp
@@ -8,7 +8,6 @@
**********/
#include "btactioncollection.h"
-#include "btactioncollection.moc"
BtActionCollection::BtActionCollection(QObject* parent)
: QObject(parent)
diff --git a/src/frontend/displaywindow/bttoolbarpopupaction.cpp b/src/frontend/displaywindow/bttoolbarpopupaction.cpp
index f52efd8..907a779 100644
--- a/src/frontend/displaywindow/bttoolbarpopupaction.cpp
+++ b/src/frontend/displaywindow/bttoolbarpopupaction.cpp
@@ -8,7 +8,6 @@
**********/
#include "bttoolbarpopupaction.h"
-#include "bttoolbarpopupaction.moc"
#include <QMenu>
#include <QToolButton>
#include <QAction>
diff --git a/src/frontend/displaywindow/cbiblereadwindow.cpp b/src/frontend/displaywindow/cbiblereadwindow.cpp
index 78c3e41..15354fa 100644
--- a/src/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/src/frontend/displaywindow/cbiblereadwindow.cpp
@@ -10,7 +10,6 @@
#include "cbiblereadwindow.h"
-#include "cbiblereadwindow.moc"
#include "btactioncollection.h"
#include "ccommentaryreadwindow.h"
diff --git a/src/frontend/displaywindow/cbookreadwindow.cpp b/src/frontend/displaywindow/cbookreadwindow.cpp
index e226f9d..657238f 100644
--- a/src/frontend/displaywindow/cbookreadwindow.cpp
+++ b/src/frontend/displaywindow/cbookreadwindow.cpp
@@ -10,7 +10,6 @@
#include "cbookreadwindow.h"
-#include "cbookreadwindow.moc"
#include "bttoolbarpopupaction.h"
#include "btactioncollection.h"
diff --git a/src/frontend/displaywindow/cbuttons.cpp b/src/frontend/displaywindow/cbuttons.cpp
index 96d20be..582e5de 100644
--- a/src/frontend/displaywindow/cbuttons.cpp
+++ b/src/frontend/displaywindow/cbuttons.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "cbuttons.h"
-#include "cbuttons.moc"
#include "util/cresmgr.h"
#include "util/cpointers.h"
diff --git a/src/frontend/displaywindow/ccommentaryreadwindow.cpp b/src/frontend/displaywindow/ccommentaryreadwindow.cpp
index 830360c..9228c2d 100644
--- a/src/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/src/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "ccommentaryreadwindow.h"
-#include "ccommentaryreadwindow.moc"
#include "btactioncollection.h"
#include "frontend/profile/cprofilewindow.h"
diff --git a/src/frontend/displaywindow/cdisplaywindow.cpp b/src/frontend/displaywindow/cdisplaywindow.cpp
index ee89e92..59fccab 100644
--- a/src/frontend/displaywindow/cdisplaywindow.cpp
+++ b/src/frontend/displaywindow/cdisplaywindow.cpp
@@ -8,7 +8,6 @@
**********/
#include "cdisplaywindow.h"
-#include "cdisplaywindow.moc"
#include "bttoolbarpopupaction.h"
#include "btactioncollection.h"
diff --git a/src/frontend/displaywindow/chtmlwritewindow.cpp b/src/frontend/displaywindow/chtmlwritewindow.cpp
index b97338c..7e97aa6 100644
--- a/src/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/src/frontend/displaywindow/chtmlwritewindow.cpp
@@ -10,7 +10,6 @@
#include "chtmlwritewindow.h"
-#include "chtmlwritewindow.moc"
#include "btactioncollection.h"
//frontend includes
diff --git a/src/frontend/displaywindow/clexiconreadwindow.cpp b/src/frontend/displaywindow/clexiconreadwindow.cpp
index 3b2a096..703e40c 100644
--- a/src/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/src/frontend/displaywindow/clexiconreadwindow.cpp
@@ -11,7 +11,6 @@
//BibleTime includes
#include "clexiconreadwindow.h"
-#include "clexiconreadwindow.moc"
#include "btactioncollection.h"
#include "cmodulechooserbar.h"
diff --git a/src/frontend/displaywindow/cmodulechooserbar.cpp b/src/frontend/displaywindow/cmodulechooserbar.cpp
index aadf749..fc891ad 100644
--- a/src/frontend/displaywindow/cmodulechooserbar.cpp
+++ b/src/frontend/displaywindow/cmodulechooserbar.cpp
@@ -8,7 +8,6 @@
**********/
#include "cmodulechooserbar.h"
-#include "cmodulechooserbar.moc"
#include "cmodulechooserbutton.h"
diff --git a/src/frontend/displaywindow/cmodulechooserbutton.cpp b/src/frontend/displaywindow/cmodulechooserbutton.cpp
index ce9956d..dd5a9ee 100644
--- a/src/frontend/displaywindow/cmodulechooserbutton.cpp
+++ b/src/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -8,7 +8,6 @@
**********/
#include "cmodulechooserbutton.h"
-#include "cmodulechooserbutton.moc"
#include "cmodulechooserbar.h"
diff --git a/src/frontend/displaywindow/cplainwritewindow.cpp b/src/frontend/displaywindow/cplainwritewindow.cpp
index 86ed0b6..9f12020 100644
--- a/src/frontend/displaywindow/cplainwritewindow.cpp
+++ b/src/frontend/displaywindow/cplainwritewindow.cpp
@@ -8,7 +8,6 @@
**********/
#include "cplainwritewindow.h"
-#include "cplainwritewindow.moc"
#include "btactioncollection.h"
#include "frontend/display/cwritedisplay.h"
diff --git a/src/frontend/displaywindow/creadwindow.cpp b/src/frontend/displaywindow/creadwindow.cpp
index 12daf34..d446d30 100644
--- a/src/frontend/displaywindow/creadwindow.cpp
+++ b/src/frontend/displaywindow/creadwindow.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "creadwindow.h"
-#include "creadwindow.moc"
#include "btactioncollection.h"
#include "frontend/display/bthtmlreaddisplay.h"
diff --git a/src/frontend/displaywindow/cwritewindow.cpp b/src/frontend/displaywindow/cwritewindow.cpp
index f2412ae..0c58bf7 100644
--- a/src/frontend/displaywindow/cwritewindow.cpp
+++ b/src/frontend/displaywindow/cwritewindow.cpp
@@ -9,7 +9,6 @@
#include "cwritewindow.h"
-#include "cwritewindow.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/keys/cswordversekey.h"
diff --git a/src/frontend/htmldialogs/btaboutdialog.cpp b/src/frontend/htmldialogs/btaboutdialog.cpp
index b29e508..6b49961 100644
--- a/src/frontend/htmldialogs/btaboutdialog.cpp
+++ b/src/frontend/htmldialogs/btaboutdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "btaboutdialog.h"
-#include "btaboutdialog.moc"
#include "util/directoryutil.h"
diff --git a/src/frontend/htmldialogs/bttabhtmldialog.cpp b/src/frontend/htmldialogs/bttabhtmldialog.cpp
index 5fb00ef..f8a83f7 100644
--- a/src/frontend/htmldialogs/bttabhtmldialog.cpp
+++ b/src/frontend/htmldialogs/bttabhtmldialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "bttabhtmldialog.h" // See this file for more documentation of BtTabHtmlDialog
-#include "bttabhtmldialog.moc"
#include "util/dialogutil.h"
#include "util/directoryutil.h"
diff --git a/src/frontend/keychooser/bthistory.cpp b/src/frontend/keychooser/bthistory.cpp
index 4abf699..7eae47f 100644
--- a/src/frontend/keychooser/bthistory.cpp
+++ b/src/frontend/keychooser/bthistory.cpp
@@ -11,7 +11,6 @@
//
#include "bthistory.h"
-#include "bthistory.moc"
#include "backend/keys/cswordkey.h"
diff --git a/src/frontend/keychooser/cbookkeychooser.cpp b/src/frontend/keychooser/cbookkeychooser.cpp
index 0f14eb7..411bf26 100644
--- a/src/frontend/keychooser/cbookkeychooser.cpp
+++ b/src/frontend/keychooser/cbookkeychooser.cpp
@@ -7,7 +7,6 @@
*
**********/
#include "cbookkeychooser.h"
-#include "cbookkeychooser.moc"
#include "bthistory.h"
diff --git a/src/frontend/keychooser/cbooktreechooser.cpp b/src/frontend/keychooser/cbooktreechooser.cpp
index e101135..7297d76 100644
--- a/src/frontend/keychooser/cbooktreechooser.cpp
+++ b/src/frontend/keychooser/cbooktreechooser.cpp
@@ -7,7 +7,6 @@
*
**********/
#include "cbooktreechooser.h"
-#include "cbooktreechooser.moc"
#include "bthistory.h"
diff --git a/src/frontend/keychooser/ckeychooser.cpp b/src/frontend/keychooser/ckeychooser.cpp
index fce295c..f0650d6 100644
--- a/src/frontend/keychooser/ckeychooser.cpp
+++ b/src/frontend/keychooser/ckeychooser.cpp
@@ -10,7 +10,6 @@
#include "ckeychooser.h"
-#include "ckeychooser.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/drivers/cswordbiblemoduleinfo.h"
diff --git a/src/frontend/keychooser/ckeychooserwidget.cpp b/src/frontend/keychooser/ckeychooserwidget.cpp
index 3abe8c6..dd8f7a5 100644
--- a/src/frontend/keychooser/ckeychooserwidget.cpp
+++ b/src/frontend/keychooser/ckeychooserwidget.cpp
@@ -10,7 +10,6 @@
//BibleTime includes
#include "ckeychooserwidget.h"
-#include "ckeychooserwidget.moc"
#include "cscrollerwidgetset.h"
diff --git a/src/frontend/keychooser/clexiconkeychooser.cpp b/src/frontend/keychooser/clexiconkeychooser.cpp
index f89a4d7..00c02ba 100644
--- a/src/frontend/keychooser/clexiconkeychooser.cpp
+++ b/src/frontend/keychooser/clexiconkeychooser.cpp
@@ -10,7 +10,6 @@
#include "clexiconkeychooser.h"
-#include "clexiconkeychooser.moc"
#include "bthistory.h"
#include "ckeychooserwidget.h"
diff --git a/src/frontend/keychooser/cscrollbutton.cpp b/src/frontend/keychooser/cscrollbutton.cpp
index 7fc7b14..742bc53 100644
--- a/src/frontend/keychooser/cscrollbutton.cpp
+++ b/src/frontend/keychooser/cscrollbutton.cpp
@@ -10,7 +10,6 @@
#include "cscrollbutton.h"
-#include "cscrollbutton.moc"
#include <stdlib.h>
diff --git a/src/frontend/keychooser/cscrollerwidgetset.cpp b/src/frontend/keychooser/cscrollerwidgetset.cpp
index 50f6b8f..3577803 100644
--- a/src/frontend/keychooser/cscrollerwidgetset.cpp
+++ b/src/frontend/keychooser/cscrollerwidgetset.cpp
@@ -11,7 +11,6 @@
//BibleTime includes
#include "cscrollbutton.h"
#include "cscrollerwidgetset.h"
-#include "cscrollerwidgetset.moc"
//Qt includes
#include <QString>
diff --git a/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp b/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
index 9f22ce8..e4b05c3 100644
--- a/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
+++ b/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
@@ -8,7 +8,6 @@
**********/
#include "btdropdownchooserbutton.h"
-#include "btdropdownchooserbutton.moc"
#include "ckeyreferencewidget.h"
#include "btversekeymenu.h"
diff --git a/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp b/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp
index f1332b6..f8607e4 100644
--- a/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp
+++ b/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp
@@ -8,7 +8,6 @@
**********/
#include "btversekeymenu.h"
-#include "btversekeymenu.moc"
#include <QMenu>
#include <QTimerEvent>
diff --git a/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp b/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp
index 2cee221..2bc9e77 100644
--- a/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp
+++ b/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp
@@ -8,7 +8,6 @@
**********/
#include "cbiblekeychooser.h"
-#include "cbiblekeychooser.moc"
#include "../bthistory.h"
#include "ckeyreferencewidget.h"
diff --git a/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp b/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp
index c0bddf4..0815a89 100644
--- a/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp
+++ b/src/frontend/keychooser/versekeychooser/ckeyreferencewidget.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "ckeyreferencewidget.h"
-#include "ckeyreferencewidget.moc"
#include "../cscrollerwidgetset.h"
#include "btdropdownchooserbutton.h"
diff --git a/src/frontend/mainindex/bookmarks/cbookmarkindex.cpp b/src/frontend/mainindex/bookmarks/cbookmarkindex.cpp
index 879afbd..7405fd3 100644
--- a/src/frontend/mainindex/bookmarks/cbookmarkindex.cpp
+++ b/src/frontend/mainindex/bookmarks/cbookmarkindex.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "cbookmarkindex.h"
-#include "cbookmarkindex.moc"
#include "btbookmarkitembase.h"
#include "btbookmarkitem.h"
diff --git a/src/frontend/mainindex/bookshelf/cbookshelfindex.cpp b/src/frontend/mainindex/bookshelf/cbookshelfindex.cpp
index 983f6e0..1c6db2a 100644
--- a/src/frontend/mainindex/bookshelf/cbookshelfindex.cpp
+++ b/src/frontend/mainindex/bookshelf/cbookshelfindex.cpp
@@ -8,7 +8,6 @@
**********/
#include "cbookshelfindex.h"
-#include "cbookshelfindex.moc"
#include "btindexitem.h"
#include "btindexmodule.h"
diff --git a/src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp b/src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp
index d1df929..0a923c4 100644
--- a/src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp
+++ b/src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "chidemodulechooserdialog.h"
-#include "chidemodulechooserdialog.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/managers/cswordbackend.h"
diff --git a/src/frontend/mainindex/cmainindex.cpp b/src/frontend/mainindex/cmainindex.cpp
index 9433c22..04341b0 100644
--- a/src/frontend/mainindex/cmainindex.cpp
+++ b/src/frontend/mainindex/cmainindex.cpp
@@ -9,7 +9,6 @@
//BibleTime includes
#include "cmainindex.h"
-#include "cmainindex.moc"
#include "backend/drivers/cswordmoduleinfo.h"
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp b/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp
index e3f6b4f..d37cb1d 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "csearchanalysisdialog.h"
-#include "csearchanalysisdialog.moc"
#include "csearchanalysisscene.h"
#include "csearchanalysisview.h"
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp b/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp
index 8199ede..7bc3ab2 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp
@@ -8,7 +8,6 @@
**********/
#include "csearchanalysisscene.h"
-#include "csearchanalysisscene.moc"
#include "csearchanalysisitem.h"
#include "csearchanalysislegenditem.h"
diff --git a/src/frontend/searchdialog/btsearchoptionsarea.cpp b/src/frontend/searchdialog/btsearchoptionsarea.cpp
index e72bc01..a4dbfd4 100644
--- a/src/frontend/searchdialog/btsearchoptionsarea.cpp
+++ b/src/frontend/searchdialog/btsearchoptionsarea.cpp
@@ -8,7 +8,6 @@
**********/
#include "btsearchoptionsarea.h"
-#include "btsearchoptionsarea.moc"
#include "csearchmodulechooserdialog.h"
#include "crangechooserdialog.h"
diff --git a/src/frontend/searchdialog/btsearchresultarea.cpp b/src/frontend/searchdialog/btsearchresultarea.cpp
index bed3d55..585d5d3 100644
--- a/src/frontend/searchdialog/btsearchresultarea.cpp
+++ b/src/frontend/searchdialog/btsearchresultarea.cpp
@@ -8,7 +8,6 @@
**********/
#include "btsearchresultarea.h"
-#include "btsearchresultarea.moc"
#include "cmoduleresultview.h"
#include "csearchresultview.h"
#include "csearchdialog.h"
diff --git a/src/frontend/searchdialog/chistorycombobox.cpp b/src/frontend/searchdialog/chistorycombobox.cpp
index 4f0b9e7..953d9f3 100644
--- a/src/frontend/searchdialog/chistorycombobox.cpp
+++ b/src/frontend/searchdialog/chistorycombobox.cpp
@@ -8,7 +8,6 @@
**********/
#include "chistorycombobox.h"
-#include "chistorycombobox.moc"
#include <QString>
#include <QCompleter>
diff --git a/src/frontend/searchdialog/cmoduleresultview.cpp b/src/frontend/searchdialog/cmoduleresultview.cpp
index 7dea720..6c3053f 100644
--- a/src/frontend/searchdialog/cmoduleresultview.cpp
+++ b/src/frontend/searchdialog/cmoduleresultview.cpp
@@ -10,7 +10,6 @@
#include "cmoduleresultview.h"
-#include "cmoduleresultview.moc"
#include "backend/drivers/cswordmoduleinfo.h"
diff --git a/src/frontend/searchdialog/crangechooserdialog.cpp b/src/frontend/searchdialog/crangechooserdialog.cpp
index b931d8e..92a8dc0 100644
--- a/src/frontend/searchdialog/crangechooserdialog.cpp
+++ b/src/frontend/searchdialog/crangechooserdialog.cpp
@@ -10,7 +10,6 @@
#include "crangechooserdialog.h"
-#include "crangechooserdialog.moc"
#include "backend/config/cbtconfig.h"
#include "util/dialogutil.h"
diff --git a/src/frontend/searchdialog/csearchdialog.cpp b/src/frontend/searchdialog/csearchdialog.cpp
index 4e544d0..947e669 100644
--- a/src/frontend/searchdialog/csearchdialog.cpp
+++ b/src/frontend/searchdialog/csearchdialog.cpp
@@ -7,7 +7,6 @@
*
**********/
#include "csearchdialog.h"
-#include "csearchdialog.moc"
#include "btsearchoptionsarea.h"
#include "btsearchresultarea.h"
diff --git a/src/frontend/searchdialog/csearchmodulechooserdialog.cpp b/src/frontend/searchdialog/csearchmodulechooserdialog.cpp
index 88fb33d..cf68f6e 100644
--- a/src/frontend/searchdialog/csearchmodulechooserdialog.cpp
+++ b/src/frontend/searchdialog/csearchmodulechooserdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "csearchmodulechooserdialog.h"
-#include "csearchmodulechooserdialog.moc"
#include "backend/drivers/cswordmoduleinfo.h"
#include "backend/managers/cswordbackend.h"
diff --git a/src/frontend/searchdialog/csearchresultview.cpp b/src/frontend/searchdialog/csearchresultview.cpp
index e66ebef..74561d6 100644
--- a/src/frontend/searchdialog/csearchresultview.cpp
+++ b/src/frontend/searchdialog/csearchresultview.cpp
@@ -8,7 +8,6 @@
**********/
#include "csearchresultview.h"
-#include "csearchresultview.moc"
#include "backend/keys/cswordversekey.h"
diff --git a/src/frontend/settingsdialogs/cconfigurationdialog.cpp b/src/frontend/settingsdialogs/cconfigurationdialog.cpp
index 56790a2..f3bf536 100644
--- a/src/frontend/settingsdialogs/cconfigurationdialog.cpp
+++ b/src/frontend/settingsdialogs/cconfigurationdialog.cpp
@@ -8,7 +8,6 @@
**********/
#include "cconfigurationdialog.h"
-#include "cconfigurationdialog.moc"
#include "cdisplaysettings.h"
#include "cswordsettings.h"
diff --git a/src/frontend/settingsdialogs/cdisplaysettings.cpp b/src/frontend/settingsdialogs/cdisplaysettings.cpp
index 826f60c..f04006e 100644
--- a/src/frontend/settingsdialogs/cdisplaysettings.cpp
+++ b/src/frontend/settingsdialogs/cdisplaysettings.cpp
@@ -8,7 +8,6 @@
**********/
#include "cdisplaysettings.h"
-#include "cdisplaysettings.moc"
#include "backend/config/cbtconfig.h"
#include "backend/rendering/cdisplayrendering.h"
diff --git a/src/frontend/settingsdialogs/cfontchooser.cpp b/src/frontend/settingsdialogs/cfontchooser.cpp
index 6b3fc0e..f755e57 100644
--- a/src/frontend/settingsdialogs/cfontchooser.cpp
+++ b/src/frontend/settingsdialogs/cfontchooser.cpp
@@ -8,7 +8,6 @@
**********/
#include "cfontchooser.h"
-#include "cfontchooser.moc"
#include "clistwidget.h"
#include <QVBoxLayout>
#include <QLabel>
diff --git a/src/frontend/settingsdialogs/clanguagesettings.cpp b/src/frontend/settingsdialogs/clanguagesettings.cpp
index 3cb2e4f..30d6e6b 100644
--- a/src/frontend/settingsdialogs/clanguagesettings.cpp
+++ b/src/frontend/settingsdialogs/clanguagesettings.cpp
@@ -11,7 +11,6 @@
//
#include "clanguagesettings.h"
-#include "clanguagesettings.moc"
#include "util/cpointers.h"
#include "util/ctoolclass.h"
diff --git a/src/frontend/settingsdialogs/clistwidget.cpp b/src/frontend/settingsdialogs/clistwidget.cpp
index 8ba4ba3..8fdc130 100644
--- a/src/frontend/settingsdialogs/clistwidget.cpp
+++ b/src/frontend/settingsdialogs/clistwidget.cpp
@@ -9,7 +9,6 @@
#include "util/ctoolclass.h"
#include "clistwidget.h"
-#include "clistwidget.moc"
CListWidget::CListWidget(QWidget* parent)
: QListWidget(parent)
diff --git a/src/frontend/settingsdialogs/cswordsettings.cpp b/src/frontend/settingsdialogs/cswordsettings.cpp
index 77f6bf8..29afd17 100644
--- a/src/frontend/settingsdialogs/cswordsettings.cpp
+++ b/src/frontend/settingsdialogs/cswordsettings.cpp
@@ -11,7 +11,6 @@
//
#include "cswordsettings.h"
-#include "cswordsettings.moc"
#include "backend/config/cbtconfig.h"
diff --git a/src/tests/bibletime_test.cpp b/src/tests/bibletime_test.cpp
index d0f2424..e27a817 100644
--- a/src/tests/bibletime_test.cpp
+++ b/src/tests/bibletime_test.cpp
@@ -8,7 +8,6 @@
**********/
#include "bibletime_test.h"
-#include "bibletime_test.moc"
#include <QtTest/QtTest>
--
1.6.0.6
--------------060004020608070000040807
Content-Type: text/plain;
name="0013-Added-preliminary-Qt4-project-files.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="0013-Added-preliminary-Qt4-project-files.patch"
More information about the bt-devel
mailing list