aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <cullmann@kde.org>2014-01-20 16:14:30 (GMT)
committerChristoph Cullmann <cullmann@kde.org>2014-01-20 16:14:30 (GMT)
commit138943e28069d8e8086543a8ac3878c2e1ab588a (patch)
tree4825255c749f15d5bee3ddbb130f9844a28fa3ce
parent9a8c405462a1dd5ac01e3ebdcde74ebd1028aacd (diff)
let automoc do the job
-rw-r--r--kate/app/CMakeLists.txt3
-rw-r--r--kate/app/kateapp.cpp1
-rw-r--r--kate/app/kateappadaptor.cpp1
-rw-r--r--kate/app/kateconfigdialog.cpp1
-rw-r--r--kate/app/kateconfigplugindialogpage.cpp1
-rw-r--r--kate/app/katedocmanager.cpp2
-rw-r--r--kate/app/katemainwindow.cpp1
-rw-r--r--kate/app/katemdi.cpp1
-rw-r--r--kate/app/katemwmodonhddialog.cpp1
-rw-r--r--kate/app/katepluginmanager.cpp1
-rw-r--r--kate/app/katequickopen.cpp2
-rw-r--r--kate/app/katesavemodifieddialog.cpp2
-rw-r--r--kate/app/kateviewmanager.cpp1
-rw-r--r--kate/app/kateviewspace.cpp1
-rw-r--r--kate/app/main.cpp (renamed from kate/app/katemain.cpp)6
-rw-r--r--kate/app/session/katesession.cpp2
-rw-r--r--kate/app/session/katesessionchooser.cpp1
-rw-r--r--kate/app/session/katesessionmanagedialog.cpp1
-rw-r--r--kate/filetree/katefiletree.cpp2
19 files changed, 7 insertions, 24 deletions
diff --git a/kate/app/CMakeLists.txt b/kate/app/CMakeLists.txt
index 439ccad..790b979 100644
--- a/kate/app/CMakeLists.txt
+++ b/kate/app/CMakeLists.txt
@@ -33,7 +33,7 @@ set (KATE_APPLICATION_SRCS
katerunninginstanceinfo.cpp
kateappcommands.cpp
katequickopen.cpp
- katemain.cpp)
+ main.cpp)
# create kde init executable
kf5_add_kdeinit_executable(kate ${KATE_APPLICATION_SRCS})
@@ -50,6 +50,7 @@ generate_export_header(kdeinit_kate
EXPORT_FILE_NAME kateprivate_export.h
EXPORT_MACRO_NAME KATE_TESTS_EXPORT
)
+
# install executable + kdeinit lib
install(TARGETS kate ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kdeinit_kate ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index c524da2..84df8b2 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -18,7 +18,6 @@
*/
#include "kateapp.h"
-#include "kateapp.moc"
#include "katedocmanager.h"
#include "katepluginmanager.h"
diff --git a/kate/app/kateappadaptor.cpp b/kate/app/kateappadaptor.cpp
index 7231694..b27c83d 100644
--- a/kate/app/kateappadaptor.cpp
+++ b/kate/app/kateappadaptor.cpp
@@ -22,7 +22,6 @@
#include "katesessionmanager.h"
#include "katedocmanager.h"
#include "katemainwindow.h"
-#include "kateappadaptor.moc"
#include "katedebug.h"
#include <KWindowSystem>
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 5c10660..bc70494 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -19,7 +19,6 @@
*/
#include "kateconfigdialog.h"
-#include "kateconfigdialog.moc"
#include "katemainwindow.h"
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index f7e4c03..7743977 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -19,7 +19,6 @@
*/
#include "kateconfigplugindialogpage.h"
-#include "kateconfigplugindialogpage.moc"
#include "katepluginmanager.h"
#include "kateconfigdialog.h"
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 24564a9..ff1321d 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -19,7 +19,7 @@
*/
#include "katedocmanager.h"
-#include "katedocmanager.moc"
+
#include "kateapp.h"
#include "katemainwindow.h"
#include "kateviewmanager.h"
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 59ef547..a0e872a 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -21,7 +21,6 @@
//BEGIN Includes
#include "katemainwindow.h"
-#include "katemainwindow.moc"
#include "kateconfigdialog.h"
#include "katedocmanager.h"
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 485072d..9568859 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -21,7 +21,6 @@
*/
#include "katemdi.h"
-#include "katemdi.moc"
#include <ktexteditor/configpageinterface.h>
#include "katedebug.h"
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index ef21797..7de5ec5 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -18,7 +18,6 @@
*/
#include "katemwmodonhddialog.h"
-#include "katemwmodonhddialog.moc"
#include "katedocmanager.h"
#include "katemainwindow.h"
diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp
index 84badcf..5214330 100644
--- a/kate/app/katepluginmanager.cpp
+++ b/kate/app/katepluginmanager.cpp
@@ -21,7 +21,6 @@
#include "config.h"
#include "katepluginmanager.h"
-#include "katepluginmanager.moc"
#include "kateapp.h"
#include "katemainwindow.h"
diff --git a/kate/app/katequickopen.cpp b/kate/app/katequickopen.cpp
index d2b9255..3729c6c 100644
--- a/kate/app/katequickopen.cpp
+++ b/kate/app/katequickopen.cpp
@@ -18,7 +18,7 @@
*/
#include "katequickopen.h"
-#include "katequickopen.moc"
+
#include "katemainwindow.h"
#include "kateviewmanager.h"
#include "kateapp.h"
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 3da5981..4d87c05 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -17,11 +17,9 @@
*/
#include "katesavemodifieddialog.h"
-#include "katesavemodifieddialog.moc"
#include "katedebug.h"
-
#include <KGuiItem>
#include <KStandardGuiItem>
#include <KIconLoader>
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 2ff7908..cc44ce1 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -20,7 +20,6 @@
//BEGIN Includes
#include "kateviewmanager.h"
-#include "kateviewmanager.moc"
#include "katemainwindow.h"
#include "katedocmanager.h"
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index f9f7f2b..7830b71 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -20,7 +20,6 @@
#include "kateviewspace.h"
#include <ktexteditor/sessionconfiginterface.h>
-#include "kateviewspace.moc"
#include "katemainwindow.h"
#include "kateviewmanager.h"
diff --git a/kate/app/katemain.cpp b/kate/app/main.cpp
index 0f43a3a..73d3c69 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/main.cpp
@@ -1,5 +1,3 @@
-
-
/* This file is part of the KDE project
Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2002 Joseph Wenninger <jowenn@kde.org>
@@ -449,6 +447,4 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char **argv )
return app.exec();
}
-#include "katemain.moc"
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
+#include "main.moc"
diff --git a/kate/app/session/katesession.cpp b/kate/app/session/katesession.cpp
index 0cca1c3..1f47f95 100644
--- a/kate/app/session/katesession.cpp
+++ b/kate/app/session/katesession.cpp
@@ -19,7 +19,7 @@
*/
#include "katesession.h"
-#include "katesession.moc"
+
#include "katesessionmanager.h"
#include "katedebug.h"
diff --git a/kate/app/session/katesessionchooser.cpp b/kate/app/session/katesessionchooser.cpp
index bb55008..a1794cb 100644
--- a/kate/app/session/katesessionchooser.cpp
+++ b/kate/app/session/katesessionchooser.cpp
@@ -19,7 +19,6 @@
*/
#include "katesessionchooser.h"
-#include "katesessionchooser.moc"
#include "katesessionmanager.h"
#include "katesessionchooseritem.h"
diff --git a/kate/app/session/katesessionmanagedialog.cpp b/kate/app/session/katesessionmanagedialog.cpp
index 09bf27e..4c1768c 100644
--- a/kate/app/session/katesessionmanagedialog.cpp
+++ b/kate/app/session/katesessionmanagedialog.cpp
@@ -19,7 +19,6 @@
*/
#include "katesessionmanagedialog.h"
-#include "katesessionmanagedialog.moc"
#include "katesessionmanager.h"
#include "katesessionchooseritem.h"
diff --git a/kate/filetree/katefiletree.cpp b/kate/filetree/katefiletree.cpp
index d2d3929..11a29be 100644
--- a/kate/filetree/katefiletree.cpp
+++ b/kate/filetree/katefiletree.cpp
@@ -18,7 +18,7 @@
//BEGIN Includes
#include "katefiletree.h"
-#include "katefiletree.moc"
+
#include "katefiletreemodel.h"
#include "katefiletreeproxymodel.h"
#include "katefiletreedebug.h"