Include moc files directly from the related source files (modules)feat/moc-files-modules

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

129 files changed, 326 insertions, 307 deletions

diff --git a/src/modules/actioneditor/Makefile.am b/src/modules/actioneditor/Makefile.am
index 57291a7d..937892e1 100644
--- a/src/modules/actioneditor/Makefile.am
+++ b/src/modules/actioneditor/Makefile.am
@@ -10,12 +10,12 @@ pluglib_LTLIBRARIES      = libkviactioneditor.la
 libkviactioneditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkviactioneditor_la_SOURCES = libkviactioneditor.cpp actioneditor.cpp
-nodist_libkviactioneditor_la_SOURCES = moc_actioneditor.cpp
 
-noinst_HEADERS = actioneditor.h
 libkviactioneditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-# noinst_HEADERS=
+noinst_HEADERS = actioneditor.h
 
-moc_actioneditor.cpp: actioneditor.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+actioneditor.cpp: actioneditor.moc
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 02729582..3e736fc1 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -993,3 +993,5 @@ void KviActionEditorWindow::loadProperties(KviConfig *cfg)
 	def.append((w * 75) / 100);
 	m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def));
 }
+
+#include "actioneditor.moc"
diff --git a/src/modules/addon/Makefile.am b/src/modules/addon/Makefile.am
index c822520f..61e2a1cc 100644
--- a/src/modules/addon/Makefile.am
+++ b/src/modules/addon/Makefile.am
@@ -12,11 +12,12 @@ pluglib_LTLIBRARIES      = libkviaddon.la
 libkviaddon_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkviaddon_la_SOURCES = libkviaddon.cpp managementdialog.cpp
-nodist_libkviaddon_la_SOURCES = moc_managementdialog.cpp
 
 libkviaddon_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= managementdialog.h
 
-moc_managementdialog.cpp: managementdialog.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+managementdialog.cpp: managementdialog.moc
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index a19022a2..a990c47a 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -370,3 +370,4 @@ void KviScriptManagementDialog::closeEvent(TQCloseEvent * e)
 	delete this;
 }
 
+#include "managementdialog.moc"
diff --git a/src/modules/aliaseditor/Makefile.am b/src/modules/aliaseditor/Makefile.am
index 223b8d5d..be25e9e2 100644
--- a/src/modules/aliaseditor/Makefile.am
+++ b/src/modules/aliaseditor/Makefile.am
@@ -10,12 +10,13 @@ pluglib_LTLIBRARIES      = libkvialiaseditor.la
 libkvialiaseditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvialiaseditor_la_SOURCES = libkvialiaseditor.cpp aliaseditor.cpp
-nodist_libkvialiaseditor_la_SOURCES = moc_aliaseditor.cpp
 
-noinst_HEADERS = aliaseditor.h
 libkvialiaseditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-# noinst_HEADERS=
+noinst_HEADERS = aliaseditor.h
+
+%.moc: %.h
+	$(SS_QT_MOC) $< -o $@
 
-moc_aliaseditor.cpp: aliaseditor.h
+aliaseditor.cpp: aliaseditor.moc
 	$(SS_QT_MOC) $< -o $@
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 30353a50..4a0e60cd 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -1401,3 +1401,5 @@ void KviAliasEditorWindow::loadProperties(KviConfig *cfg)
 {
 	m_pEditor->loadProperties(cfg);
 }
+
+#include "aliaseditor.moc"
diff --git a/src/modules/avatar/Makefile.am b/src/modules/avatar/Makefile.am
index bb5050e3..7567295c 100644
--- a/src/modules/avatar/Makefile.am
+++ b/src/modules/avatar/Makefile.am
@@ -10,11 +10,12 @@ pluglib_LTLIBRARIES      = libkviavatar.la
 libkviavatar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkviavatar_la_SOURCES = libkviavatar.cpp
-nodist_libkviavatar_la_SOURCES = moc_libkviavatar.cpp
 
 libkviavatar_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS = libkviavatar.h
 
-moc_%.cpp: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+libkviavatar.cpp: libkviavatar.moc
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 57b51f01..c77f7870 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -583,3 +583,5 @@ KVIRC_MODULE(
 	0,
 	avatar_module_cleanup
 )
+
+#include "libkviavatar.moc"
diff --git a/src/modules/channelsjoin/Makefile.am b/src/modules/channelsjoin/Makefile.am
index 48466890..1cfb636e 100644
--- a/src/modules/channelsjoin/Makefile.am
+++ b/src/modules/channelsjoin/Makefile.am
@@ -10,11 +10,13 @@ pluglib_LTLIBRARIES      = libkvichannelsjoin.la
 libkvichannelsjoin_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvichannelsjoin_la_SOURCES = libkvichannelsjoin.cpp channelsjoinwindow.cpp
+
 libkvichannelsjoin_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= channelsjoinwindow.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-channelsjoinwindow.cpp: m_channelsjoinwindow.moc
+channelsjoinwindow.cpp: channelsjoinwindow.moc
+	$(SS_QT_MOC) $< -o $@
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 33664177..32149579 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -290,4 +290,4 @@ void KviChannelsJoinWindow::closeEvent(TQCloseEvent *e)
 	delete this;
 }
 
-#include "m_channelsjoinwindow.moc"
+#include "channelsjoinwindow.moc"
diff --git a/src/modules/codetester/Makefile.am b/src/modules/codetester/Makefile.am
index 45afbd4f..b7b15455 100644
--- a/src/modules/codetester/Makefile.am
+++ b/src/modules/codetester/Makefile.am
@@ -6,12 +6,12 @@ pluglib_LTLIBRARIES      = libkvicodetester.la
 libkvicodetester_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvicodetester_la_SOURCES = libkvicodetester.cpp codetester.cpp
-nodist_libkvicodetester_la_SOURCES = moc_codetester.cpp
 
-noinst_HEADERS = codetester.h
 libkvicodetester_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-# noinst_HEADERS=
+noinst_HEADERS = codetester.h
 
-moc_codetester.cpp: codetester.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+codetester.cpp: codetester.moc
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index eb58a9a7..abd7d453 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -155,3 +155,5 @@ void KviCodeTesterWindow::loadProperties(KviConfig *cfg)
 #endif // COMPILE_SCRIPTTOOLBAR
 */
 }
+
+#include "codetester.moc"
diff --git a/src/modules/dcc/Makefile.am b/src/modules/dcc/Makefile.am
index ef262f8a..f168506a 100644
--- a/src/modules/dcc/Makefile.am
+++ b/src/modules/dcc/Makefile.am
@@ -8,7 +8,6 @@ tmp_DATA=kvi_dccfiletransfericons.png
 
 EXTRA_DIST=kvi_dccfiletransfericons.png
 
-
 AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
 $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
 
@@ -52,15 +51,15 @@ noinst_HEADERS= adpcmcodec.h \
 								voice.h \
 								window.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-broker.cpp: m_broker.moc
-canvas.cpp: m_canvas.moc
-canvaswidget.cpp: m_canvaswidget.moc
-chat.cpp: m_chat.moc
-dialogs.cpp: m_dialogs.moc
-marshal.cpp: m_marshal.moc
-send.cpp: m_send.moc
-voice.cpp: m_voice.moc
-window.cpp: m_window.moc
+broker.cpp: broker.moc
+canvas.cpp: canvas.moc
+canvaswidget.cpp: canvaswidget.moc
+chat.cpp: chat.moc
+dialogs.cpp: dialogs.moc
+marshal.cpp: marshal.moc
+send.cpp: send.moc
+voice.cpp: voice.moc
+window.cpp: window.moc
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 7131e233..a2d44b76 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -895,4 +895,4 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
 }
 
 
-#include "m_broker.moc"
+#include "broker.moc"
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index d9ccd025..03a925be 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -296,6 +296,6 @@ void KviDccCanvas::connected()
 }
 
 
-#include "m_canvas.moc"
+#include "canvas.moc"
 
 #endif
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index d012a05a..990ccd43 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1548,6 +1548,6 @@ void KviCanvasWidget::resizeEvent(TQResizeEvent *)
 }
 
 
-#include "m_canvaswidget.moc"
+#include "canvaswidget.moc"
 
 #endif
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 9ad8ded4..640e2764 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -839,4 +839,4 @@ out_of_the_loop:
 	return bRet;
 }
 
-#include "m_chat.moc"
+#include "chat.moc"
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index 9f4e3967..ac2f20c4 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -197,4 +197,4 @@ void KviDccRenameBox::cancelClicked()
 
 
 
-#include "m_dialogs.moc"
+#include "dialogs.moc"
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index ba920ec7..92b12080 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -644,4 +644,4 @@ void KviDccMarshal::connectionTimedOut()
 }
 
 
-#include "m_marshal.moc"
+#include "marshal.moc"
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 05236d95..ee7e96c6 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1895,4 +1895,4 @@ void KviDccFileTransferBandwidthDialog::closeEvent(TQCloseEvent * e)
 
 
 
-#include "m_send.moc"
+#include "send.moc"
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index be674ab8..ed0a9026 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -1033,4 +1033,4 @@ void KviDccVoice::focusInEvent(TQFocusEvent *e)
 	KviWindow::focusInEvent(e);
 }
 
-#include "m_voice.moc"
+#include "voice.moc"
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index 4abd7f99..7c15c1c4 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -50,4 +50,4 @@ const char * KviDccWindow::dccMarshalOutputContextString()
 	return static_context;
 }
 
-#include "m_window.moc"
+#include "window.moc"
diff --git a/src/modules/dockwidget/Makefile.am b/src/modules/dockwidget/Makefile.am
index c1c4da56..72dbe1fc 100644
--- a/src/modules/dockwidget/Makefile.am
+++ b/src/modules/dockwidget/Makefile.am
@@ -11,8 +11,6 @@ libkvidockwidget_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvidockwidget_la_SOURCES = libkvidockwidget_qt3.cpp
 
-#nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp
-
 libkvidockwidget_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= libkvidockwidget.h libkvidockwidget_qt3.h
@@ -26,7 +24,4 @@ EXTRA_DIST = $(tmp_DATA)
 %.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 	
-moc_%.cpp: %.h
-	$(SS_QT_MOC) $< -o $@
-
 libkvidockwidget_qt3.cpp: libkvidockwidget_qt3.moc
diff --git a/src/modules/editor/Makefile.am b/src/modules/editor/Makefile.am
index 11a48111..55d96437 100644
--- a/src/modules/editor/Makefile.am
+++ b/src/modules/editor/Makefile.am
@@ -9,12 +9,13 @@ pluglib_LTLIBRARIES      = libkvieditor.la
 
 libkvieditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
-nodist_libkvieditor_la_SOURCES = moc_scripteditor.cpp
 libkvieditor_la_SOURCES = libkvieditor.cpp scripteditor.cpp
+
 libkvieditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= scripteditor.h
 
-moc_%.cpp: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
+scripteditor.cpp: scripteditor.moc
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 62a49307..185c2115 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -1178,3 +1178,5 @@ void KviScriptEditorReplaceDialog::slotNextFind()
 {
 	emit nextFind(m_pFindlineedit->text());
 }
+
+#include "scripteditor.moc"
diff --git a/src/modules/eventeditor/Makefile.am b/src/modules/eventeditor/Makefile.am
index afb12e43..b6f56d92 100644
--- a/src/modules/eventeditor/Makefile.am
+++ b/src/modules/eventeditor/Makefile.am
@@ -10,12 +10,12 @@ pluglib_LTLIBRARIES      = libkvieventeditor.la
 libkvieventeditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvieventeditor_la_SOURCES = libkvieventeditor.cpp eventeditor.cpp
-nodist_libkvieventeditor_la_SOURCES = moc_eventeditor.cpp
 
-noinst_HEADERS = eventeditor.h
 libkvieventeditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-# noinst_HEADERS=
+noinst_HEADERS = eventeditor.h
 
-moc_eventeditor.cpp: eventeditor.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+eventeditor.cpp: eventeditor.moc
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 6b58280c..4cc08509 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -534,3 +534,5 @@ void KviEventEditorWindow::loadProperties(KviConfig *cfg)
 #endif // COMPILE_SCRIPTTOOLBAR
 */
 }
+
+#include "eventeditor.moc"
diff --git a/src/modules/filetransferwindow/Makefile.am b/src/modules/filetransferwindow/Makefile.am
index 372c0f1b..61ba2db1 100644
--- a/src/modules/filetransferwindow/Makefile.am
+++ b/src/modules/filetransferwindow/Makefile.am
@@ -12,11 +12,12 @@ pluglib_LTLIBRARIES      = libkvifiletransferwindow.la
 libkvifiletransferwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvifiletransferwindow_la_SOURCES = libkvifiletransferwindow.cpp filetransferwindow.cpp
+
 libkvifiletransferwindow_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= filetransferwindow.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-filetransferwindow.cpp: m_filetransferwindow.moc
+filetransferwindow.cpp: filetransferwindow.moc
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 45613218..25b5d0e4 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -757,4 +757,4 @@ void KviFileTransferWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
-#include "m_filetransferwindow.moc"
+#include "filetransferwindow.moc"
diff --git a/src/modules/http/Makefile.am b/src/modules/http/Makefile.am
index 728e3235..ff710130 100644
--- a/src/modules/http/Makefile.am
+++ b/src/modules/http/Makefile.am
@@ -16,11 +16,12 @@ pluglib_LTLIBRARIES      = libkvihttp.la
 libkvihttp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvihttp_la_SOURCES = libkvihttp.cpp httpfiletransfer.cpp
+
 libkvihttp_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= httpfiletransfer.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-httpfiletransfer.cpp: m_httpfiletransfer.moc
+httpfiletransfer.cpp: httpfiletransfer.moc
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index c9ee4ff1..c7f04b81 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -486,4 +486,4 @@ bool KviHttpFileTransfer::startDownload()
 	return m_pHttpRequest->start();
 }
 
-#include "m_httpfiletransfer.moc"
+#include "httpfiletransfer.moc"
diff --git a/src/modules/links/Makefile.am b/src/modules/links/Makefile.am
index 9ca4c085..d20dae11 100644
--- a/src/modules/links/Makefile.am
+++ b/src/modules/links/Makefile.am
@@ -10,11 +10,12 @@ pluglib_LTLIBRARIES      = libkvilinks.la
 libkvilinks_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvilinks_la_SOURCES = libkvilinks.cpp linkswindow.cpp
+
 libkvilinks_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= linkswindow.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-linkswindow.cpp: m_linkswindow.moc
+linkswindow.cpp: linkswindow.moc
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 3bc5d0f7..68e09019 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -469,4 +469,4 @@ void KviLinksWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
-#include "m_linkswindow.moc"
+#include "linkswindow.moc"
diff --git a/src/modules/notifier/Makefile.am b/src/modules/notifier/Makefile.am
index 8fb5cbca..30a5c731 100644
--- a/src/modules/notifier/Makefile.am
+++ b/src/modules/notifier/Makefile.am
@@ -36,9 +36,9 @@ conf_DATA = libkvinotifier.kvc
 
 EXTRA_DIST = $(conf_DATA)
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-notifierwindow.cpp: m_notifierwindow.moc
-notifierwindowtabs.cpp: m_notifierwindowtabs.moc
+notifierwindow.cpp: notifierwindow.moc
+notifierwindowtabs.cpp: notifierwindowtabs.moc
 
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 3e2f7d15..081edd45 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -1318,5 +1318,5 @@ void KviNotifierWindow::progressUpdate()
 	TQPainter p(this);
 	m_pProgressBar->draw(&p);
 }
-#include "m_notifierwindow.moc"
 
+#include "notifierwindow.moc"
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index dd178cc3..edf9cedc 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -702,4 +702,4 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT
 	}
 }
 
-#include "m_notifierwindowtabs.moc"
+#include "notifierwindowtabs.moc"
diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am
index a5a81aa6..5c59b485 100644
--- a/src/modules/objects/Makefile.am
+++ b/src/modules/objects/Makefile.am
@@ -10,53 +10,52 @@ pluglib_LTLIBRARIES      = libkviobjects.la
 libkviobjects_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkviobjects_la_SOURCES =  libkviobjects.cpp \
-			    class_button.cpp \
-                      class_buttongroup.cpp \
-			    class_checkbox.cpp \
-			    class_combobox.cpp \
-			    class_dialog.cpp \
-			    class_dockwindow.cpp \
-			    class_file.cpp \
-			    class_groupbox.cpp \
-			   class_label.cpp \
-			    class_layout.cpp \
-			    class_lcd.cpp \
-			    class_lineedit.cpp \
-			    class_list.cpp \
-			    class_listbox.cpp \
-			    class_listview.cpp \
-			    class_listviewitem.cpp \
-			    class_mainwindow.cpp \
-			    class_menubar.cpp \
-			    class_multilineedit.cpp \
-			    class_popupmenu.cpp \
-			    class_process.cpp \
-			    class_progressbar.cpp \
-			    class_radiobutton.cpp \
-			    class_slider.cpp \
-			    class_socket.cpp \
-			    class_spinbox.cpp \
-			    class_tabwidget.cpp \
-			    class_toolbar.cpp \
-			    class_toolbutton.cpp \
-			    class_painter.cpp \
-			    class_pixmap.cpp \
-			    class_tbrowser.cpp \
-			    class_widget.cpp \
-			    class_window.cpp \
-			    class_wizard.cpp \
-			    class_workspace.cpp \
-			    class_wrapper.cpp \
-			    class_urllabel.cpp \
-			    class_xmlreader.cpp \
-			    class_vbox.cpp \
-                      class_hbox.cpp
-
+		class_button.cpp \
+		class_buttongroup.cpp \
+		class_checkbox.cpp \
+		class_combobox.cpp \
+		class_dialog.cpp \
+		class_dockwindow.cpp \
+		class_file.cpp \
+		class_groupbox.cpp \
+		class_label.cpp \
+		class_layout.cpp \
+		class_lcd.cpp \
+		class_lineedit.cpp \
+		class_list.cpp \
+		class_listbox.cpp \
+		class_listview.cpp \
+		class_listviewitem.cpp \
+		class_mainwindow.cpp \
+		class_menubar.cpp \
+		class_multilineedit.cpp \
+		class_popupmenu.cpp \
+		class_process.cpp \
+		class_progressbar.cpp \
+		class_radiobutton.cpp \
+		class_slider.cpp \
+		class_socket.cpp \
+		class_spinbox.cpp \
+		class_tabwidget.cpp \
+		class_toolbar.cpp \
+		class_toolbutton.cpp \
+		class_painter.cpp \
+		class_pixmap.cpp \
+		class_tbrowser.cpp \
+		class_widget.cpp \
+		class_window.cpp \
+		class_wizard.cpp \
+		class_workspace.cpp \
+		class_wrapper.cpp \
+		class_urllabel.cpp \
+		class_xmlreader.cpp \
+		class_vbox.cpp \
+		class_hbox.cpp
 
 libkviobjects_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS=	class_button.h \
-            class_buttongroup.h \
+		class_buttongroup.h \
 		class_checkbox.h \
 		class_combobox.h \
 		class_dialog.h \
@@ -94,50 +93,50 @@ noinst_HEADERS=	class_button.h \
 		class_workspace.h \
 		class_wrapper.h \
 		class_xmlreader.h \
-       	class_vbox.h \
-         	class_hbox.h \
+		class_vbox.h \
+		class_hbox.h \
 		object_macros.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-class_checkbox.cpp: m_class_checkbox.moc
-class_combobox.cpp: m_class_combobox.moc
-class_button.cpp: m_class_button.moc
-class_dialog.cpp: m_class_dialog.moc
-class_dockwindow.cpp: m_class_dockwindow.moc
-class_file.cpp: m_class_file.moc
-class_groupbox.cpp: m_class_groupbox.moc
-class_label.cpp: m_class_label.moc
-class_layout.cpp: m_class_layout.moc
-class_lcd.cpp: m_class_lcd.moc
-class_lineedit.cpp: m_class_lineedit.moc
-class_list.cpp: m_class_list.moc
-class_listbox.cpp: m_class_listbox.moc
-class_listview.cpp: m_class_listview.moc
-class_listviewitem.cpp: m_class_listviewitem.moc
-class_listbox.cpp: m_class_listbox.moc
-class_mainwindow.cpp: m_class_mainwindow.moc
-class_menubar.cpp: m_class_menubar.moc
-class_multilineedit.cpp: m_class_multilineedit.moc
-class_painter.cpp: m_class_painter.moc
-class_pixmap.cpp: m_class_pixmap.moc
-class_popupmenu.cpp: m_class_popupmenu.moc
-class_process.cpp: m_class_process.moc
-class_progressbar.cpp: m_class_progressbar.moc
-class_radiobutton.cpp: m_class_radiobutton.moc
-class_slider.cpp: m_class_slider.moc
-class_socket.cpp: m_class_socket.moc
-class_spinbox.cpp: m_class_spinbox.moc
-class_tabwidget.cpp: m_class_tabwidget.moc
-class_tbrowser.cpp: m_class_tbrowser.moc
-class_toolbar.cpp: m_class_toolbar.moc
-class_toolbutton.cpp: m_class_toolbutton.moc
-class_urllabel.cpp: m_class_urllabel.moc
-class_widget.cpp: m_class_widget.moc
-class_window.cpp: m_class_window.moc
-class_wizard.cpp: m_class_wizard.moc
-class_workspace.cpp: m_class_workspace.moc
-class_wrapper.cpp: m_class_wrapper.moc
-class_xmlreader.cpp: m_class_xmlreader.moc
+class_checkbox.cpp: class_checkbox.moc
+class_combobox.cpp: class_combobox.moc
+class_button.cpp: class_button.moc
+class_dialog.cpp: class_dialog.moc
+class_dockwindow.cpp: class_dockwindow.moc
+class_file.cpp: class_file.moc
+class_groupbox.cpp: class_groupbox.moc
+class_label.cpp: class_label.moc
+class_layout.cpp: class_layout.moc
+class_lcd.cpp: class_lcd.moc
+class_lineedit.cpp: class_lineedit.moc
+class_list.cpp: class_list.moc
+class_listbox.cpp: class_listbox.moc
+class_listview.cpp: class_listview.moc
+class_listviewitem.cpp: class_listviewitem.moc
+class_listbox.cpp: class_listbox.moc
+class_mainwindow.cpp: class_mainwindow.moc
+class_menubar.cpp: class_menubar.moc
+class_multilineedit.cpp: class_multilineedit.moc
+class_painter.cpp: class_painter.moc
+class_pixmap.cpp: class_pixmap.moc
+class_popupmenu.cpp: class_popupmenu.moc
+class_process.cpp: class_process.moc
+class_progressbar.cpp: class_progressbar.moc
+class_radiobutton.cpp: class_radiobutton.moc
+class_slider.cpp: class_slider.moc
+class_socket.cpp: class_socket.moc
+class_spinbox.cpp: class_spinbox.moc
+class_tabwidget.cpp: class_tabwidget.moc
+class_tbrowser.cpp: class_tbrowser.moc
+class_toolbar.cpp: class_toolbar.moc
+class_toolbutton.cpp: class_toolbutton.moc
+class_urllabel.cpp: class_urllabel.moc
+class_widget.cpp: class_widget.moc
+class_window.cpp: class_window.moc
+class_wizard.cpp: class_wizard.moc
+class_workspace.cpp: class_workspace.moc
+class_wrapper.cpp: class_wrapper.moc
+class_xmlreader.cpp: class_xmlreader.moc
 
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index db4ee3e5..4ec12a47 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -167,4 +167,4 @@ void KviKvsObject_button::slotClicked()
 }
 
 
-#include "m_class_button.moc"
+#include "class_button.moc"
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 2be2e3fe..c0ab6a09 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -124,4 +124,4 @@ void KviKvsObject_checkbox::toggled(bool b)
 }
 
 
-#include "m_class_checkbox.moc"
+#include "class_checkbox.moc"
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index baf15336..b00ae015 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -364,4 +364,4 @@ void KviKvsObject_combobox::slotActivated(int i)
 }
 
 
-#include "m_class_combobox.moc"
+#include "class_combobox.moc"
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 6ecdf51a..f42f72df 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -217,4 +217,4 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-#include "m_class_dockwindow.moc"
+#include "class_dockwindow.moc"
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 9e4b2790..9195f117 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -446,4 +446,4 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p,
 }
 
 */
-#include "m_class_file.moc"
+#include "class_file.moc"
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index e6f4037a..650af411 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -457,4 +457,4 @@ void KviKvsObject_lineedit::slottextChanged(const TQString &text)
 }
 
 
-#include "m_class_lineedit.moc"
+#include "class_lineedit.moc"
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index 5b2301b5..1acac67f 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -386,4 +386,4 @@ kvs_uint_t uIndex;
 }
 
 
-#include "m_class_listbox.moc"
+#include "class_listbox.moc"
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 34a66b5c..0f5989ae 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -549,4 +549,4 @@ void KviKvsMdmListView::contentsDropEvent(TQDropEvent *e)
 	}
 
 }
-#include "m_class_listview.moc"
+#include "class_listview.moc"
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index a4dba4c8..b9397ac2 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -418,4 +418,4 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-#include "m_class_listviewitem.moc"
+#include "class_listviewitem.moc"
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 7348fa62..3205800a 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -1192,4 +1192,4 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c)
 
 
 
-#include "m_class_multilineedit.moc"
+#include "class_multilineedit.moc"
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index b2f76a68..9c510044 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -924,4 +924,4 @@ bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c)
 
 
 
-#include "m_class_painter.moc"
+#include "class_painter.moc"
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index f9891f0b..2aa8d7a1 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -304,4 +304,4 @@ TQImage * KviKvsObject_pixmap::getImage()
 	return m_pImage;
 }
 
-#include "m_class_pixmap.moc"
+#include "class_pixmap.moc"
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 32163004..ff390038 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -358,4 +358,4 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c)
 }
 
 
-#include "m_class_popupmenu.moc"
+#include "class_popupmenu.moc"
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 2ffdadb0..1e92e756 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -306,4 +306,4 @@ void KviKvsObject_process::slotReadStderr()
 	callFunction(this,"readyReadStderrEvent",params);
 }
 
-#include "m_class_process.moc"
+#include "class_process.moc"
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index b068b388..ba596eca 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -135,4 +135,4 @@ void KviKvsObject_radiobutton::toggled(bool b)
 }
 
 
-#include "m_class_radiobutton.moc"
+#include "class_radiobutton.moc"
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index a55a2593..017ec196 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -284,4 +284,4 @@ void KviKvsObject_slider::valueChanged(int value)
 }
 
 
-#include "m_class_slider.moc"
+#include "class_slider.moc"
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 5f30bbd0..edf086b3 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -1328,4 +1328,4 @@ KviTQCString szData8 = szData.utf8();
 
 //--------------
 
-#include "m_class_socket.moc"
+#include "class_socket.moc"
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 5f06c78e..8d3e8bf4 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -258,4 +258,4 @@ void KviKvsObject_spinbox::valueChanged(int value)
 	callFunction(this,"valueChangedEvent",&params);
 }
 
-#include "m_class_spinbox.moc"
+#include "class_spinbox.moc"
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 5196573f..758d7fee 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -526,4 +526,4 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value)
 	callFunction(this,"currentChangedEvent",&params);
 }
 
-#include "m_class_tabwidget.moc"
+#include "class_tabwidget.moc"
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index 9e21a32d..d9a7bee7 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -140,4 +140,4 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal
 	return true;
 }
 
-#include "m_class_tbrowser.moc"
+#include "class_tbrowser.moc"
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index d40edf6c..50475fbc 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -149,5 +149,5 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-#include "m_class_toolbar.moc"
+#include "class_toolbar.moc"
 
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 8ff37ea1..35a16c20 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -328,5 +328,5 @@ void KviKvsObject_toolbutton::slotClicked()
 	callFunction(this,"clickEvent",params);
 }
 
-#include "m_class_toolbutton.moc"
+#include "class_toolbutton.moc"
 
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index f3b11d20..e04ce2b1 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -1644,4 +1644,4 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-#include "m_class_widget.moc"
+#include "class_widget.moc"
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index a03cd147..09666e63 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -151,4 +151,4 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c)
 	((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget());
 	return true;
 }
-#include "m_class_window.moc"
+#include "class_window.moc"
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 496a24d7..217ad8a9 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -368,4 +368,4 @@ void KviKvsMdmWizard::slotBackClicked()
 KviKvsMdmWizard::~KviKvsMdmWizard()
 {
 }
-#include "m_class_wizard.moc"
+#include "class_wizard.moc"
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 53bcb264..f18858ee 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -227,4 +227,4 @@ TQWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char
 	return 0;
 }
 
-#include "m_class_wrapper.moc"
+#include "class_wrapper.moc"
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index a897f9f2..8f2ce38e 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -340,4 +340,4 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-#include "m_class_xmlreader.moc"
+#include "class_xmlreader.moc"
diff --git a/src/modules/options/Makefile.am b/src/modules/options/Makefile.am
index 9fe8b0c4..37d9b6af 100644
--- a/src/modules/options/Makefile.am
+++ b/src/modules/options/Makefile.am
@@ -107,51 +107,51 @@ noinst_HEADERS= container.h \
 instances.h: optw_*.h mkcreateinstanceproc.sh
 	./mkcreateinstanceproc.sh
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-container.cpp: m_container.moc
-dialog.cpp: m_dialog.moc
-instances.cpp: m_instances.moc
-optw_antispam.cpp: m_optw_antispam.moc
-optw_avatar.cpp: m_optw_avatar.moc
-optw_away.cpp: m_optw_away.moc
-optw_connection.cpp: m_optw_connection.moc
-optw_ctcp.cpp: m_optw_ctcp.moc
-optw_ctcpfloodprotection.cpp: m_optw_ctcpfloodprotection.moc
-optw_dcc.cpp: m_optw_dcc.moc
-optw_generalopt.cpp: m_optw_generalopt.moc
-optw_highlighting.cpp: m_optw_highlighting.moc
-optw_ident.cpp: m_optw_ident.moc
-optw_identity.cpp: m_optw_identity.moc
-optw_ignore.cpp: m_optw_ignore.moc
-optw_input.cpp: m_optw_input.moc
-optw_interfacefeatures.cpp: m_optw_interfacefeatures.moc
-optw_interfacelookglobal.cpp: m_optw_interfacelookglobal.moc
-optw_irc.cpp: m_optw_irc.moc
-optw_ircoutput.cpp: m_optw_ircoutput.moc
-optw_ircview.cpp: m_optw_ircview.moc
-optw_lag.cpp: m_optw_lag.moc
-optw_logging.cpp: m_optw_logging.moc
-optw_look.cpp: m_optw_look.moc
-optw_mediatypes.cpp: m_optw_mediatypes.moc
-optw_messages.cpp: m_optw_messages.moc
-optw_nickserv.cpp: m_optw_nickserv.moc
-optw_notify.cpp: m_optw_notify.moc
-optw_protection.cpp: m_optw_protection.moc
-optw_proxy.cpp: m_optw_proxy.moc
-optw_query.cpp: m_optw_query.moc
-optw_servers.cpp: m_optw_servers.moc
-optw_sound.cpp: m_optw_sound.moc
-optw_ssl.cpp: m_optw_ssl.moc
-optw_taskbar.cpp: m_optw_taskbar.moc
-optw_textencoding.cpp: m_optw_textencoding.moc
-optw_texticons.cpp: m_optw_texticons.moc
-optw_transport.cpp: m_optw_transport.moc
-optw_theme.cpp: m_optw_theme.moc
-optw_topiclabel.cpp: m_optw_topiclabel.moc
-optw_tools.cpp: m_optw_tools.moc
-optw_uparser.cpp: m_optw_uparser.moc
-optw_urlhandlers.cpp: m_optw_urlhandlers.moc
-optw_userlist.cpp: m_optw_userlist.moc
-optw_tray.cpp : m_optw_tray.moc
+container.cpp: container.moc
+dialog.cpp: dialog.moc
+instances.cpp: instances.moc
+optw_antispam.cpp: optw_antispam.moc
+optw_avatar.cpp: optw_avatar.moc
+optw_away.cpp: optw_away.moc
+optw_connection.cpp: optw_connection.moc
+optw_ctcp.cpp: optw_ctcp.moc
+optw_ctcpfloodprotection.cpp: optw_ctcpfloodprotection.moc
+optw_dcc.cpp: optw_dcc.moc
+optw_generalopt.cpp: optw_generalopt.moc
+optw_highlighting.cpp: optw_highlighting.moc
+optw_ident.cpp: optw_ident.moc
+optw_identity.cpp: optw_identity.moc
+optw_ignore.cpp: optw_ignore.moc
+optw_input.cpp: optw_input.moc
+optw_interfacefeatures.cpp: optw_interfacefeatures.moc
+optw_interfacelookglobal.cpp: optw_interfacelookglobal.moc
+optw_irc.cpp: optw_irc.moc
+optw_ircoutput.cpp: optw_ircoutput.moc
+optw_ircview.cpp: optw_ircview.moc
+optw_lag.cpp: optw_lag.moc
+optw_logging.cpp: optw_logging.moc
+optw_look.cpp: optw_look.moc
+optw_mediatypes.cpp: optw_mediatypes.moc
+optw_messages.cpp: optw_messages.moc
+optw_nickserv.cpp: optw_nickserv.moc
+optw_notify.cpp: optw_notify.moc
+optw_protection.cpp: optw_protection.moc
+optw_proxy.cpp: optw_proxy.moc
+optw_query.cpp: optw_query.moc
+optw_servers.cpp: optw_servers.moc
+optw_sound.cpp: optw_sound.moc
+optw_ssl.cpp: optw_ssl.moc
+optw_taskbar.cpp: optw_taskbar.moc
+optw_textencoding.cpp: optw_textencoding.moc
+optw_texticons.cpp: optw_texticons.moc
+optw_transport.cpp: optw_transport.moc
+optw_theme.cpp: optw_theme.moc
+optw_topiclabel.cpp: optw_topiclabel.moc
+optw_tools.cpp: optw_tools.moc
+optw_uparser.cpp: optw_uparser.moc
+optw_urlhandlers.cpp: optw_urlhandlers.moc
+optw_userlist.cpp: optw_userlist.moc
+optw_tray.cpp : optw_tray.moc
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index fd5dbd1c..1fe8921a 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -117,4 +117,4 @@ void KviOptionsWidgetContainer::cancelClicked()
 	deleteLater();
 }
 
-#include "m_container.moc"
+#include "container.moc"
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index f19138ea..80df61d0 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -644,4 +644,4 @@ void  KviOptionsDialog::keyPressEvent( TQKeyEvent * e )
 		e->ignore();
 }
 
-#include "m_dialog.moc"
+#include "dialog.moc"
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 0e326d9f..d1e7ac93 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -3586,5 +3586,5 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 }
 
 
-#include "m_instances.moc"
+#include "instances.moc"
 
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index 5c0cbb78..ed1d8cb7 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -434,7 +434,7 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 }
 
 
-#include "m_instances.moc"
+#include "instances.moc"
 
 EOF
 ######################################################################################################
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 972cdc68..c2936fe7 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -61,4 +61,4 @@ void KviAntispamOptionsWidget::reenableStuff(bool)
 }
 
 
-#include "m_optw_antispam.moc"
+#include "optw_antispam.moc"
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index aaa8d319..1f1cb528 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -128,4 +128,4 @@ KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget()
 }
 
 
-#include "m_optw_avatar.moc"
+#include "optw_avatar.moc"
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index f8d7cb37..57fa279e 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -68,4 +68,4 @@ void KviAwayOptionsWidget::enableCustomAwayText(bool)
 }
 
 
-#include "m_optw_away.moc"
+#include "optw_away.moc"
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index f65a52dd..5daf314a 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -318,4 +318,4 @@ KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget()
 
 }
 
-#include "m_optw_connection.moc"
+#include "optw_connection.moc"
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 9ae7e8e4..546ec2a5 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -87,4 +87,4 @@ KviCtcpOptionsWidget::~KviCtcpOptionsWidget()
 }
 
 
-#include "m_optw_ctcp.moc"
+#include "optw_ctcp.moc"
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 56cdf0c1..28c600a1 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -113,4 +113,4 @@ KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget()
 }
 
 
-#include "m_optw_ctcpfloodprotection.moc"
+#include "optw_ctcpfloodprotection.moc"
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 263c4f11..505b1183 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -390,4 +390,4 @@ KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget()
 {
 }
 
-#include "m_optw_dcc.moc"
+#include "optw_dcc.moc"
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index 76ecdf49..769d8926 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -48,4 +48,4 @@ KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget()
 }
 
 
-#include "m_optw_generalopt.moc"
+#include "optw_generalopt.moc"
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 2016fa80..7d1417e5 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -123,6 +123,6 @@ KviAlertOptionsWidget::~KviAlertOptionsWidget()
 }
 
 
-#include "m_optw_highlighting.moc"
+#include "optw_highlighting.moc"
 
 #endif //_OPTW_HIGHLIGHTING_CPP_
diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp
index 7dafdd52..dabdeb61 100644
--- a/src/modules/options/optw_ident.cpp
+++ b/src/modules/options/optw_ident.cpp
@@ -34,4 +34,4 @@
 
 
 
-#include "m_optw_ident.moc"
+#include "optw_ident.moc"
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 0c3db84f..65f7b26e 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -726,4 +726,4 @@ void KviIdentityAdvancedOptionsWidget::commit()
 
 
 
-#include "m_optw_identity.moc"
+#include "optw_identity.moc"
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 06a70035..22f3f2ec 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -59,4 +59,4 @@ void KviIgnoreOptionsWidget::enableVerbose(bool)
 
 
 
-#include "m_optw_ignore.moc"
+#include "optw_ignore.moc"
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index 20284eae..05676d08 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -153,4 +153,4 @@ KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget()
 {
 }
 
-#include "m_optw_input.moc"
+#include "optw_input.moc"
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index d3377267..e65c7f25 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -85,4 +85,4 @@ void KviInterfaceFeaturesOptionsWidget::commit()
 	
 }
 
-#include "m_optw_interfacefeatures.moc"
+#include "optw_interfacefeatures.moc"
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 424786b6..1899287e 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -212,4 +212,4 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
 }
 
 
-#include "m_optw_interfacelookglobal.moc"
+#include "optw_interfacelookglobal.moc"
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 22620045..907cafae 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -217,4 +217,4 @@ void KviChannelAdvancedOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-#include "m_optw_irc.moc"
+#include "optw_irc.moc"
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 47bc7610..c586220b 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -91,4 +91,4 @@ void KviIrcOutputOptionsWidget::commit()
 	KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i;
 }
 
-#include "m_optw_ircoutput.moc"
+#include "optw_ircoutput.moc"
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 52f7cecb..85496a27 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -165,4 +165,4 @@ KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget()
 
 
 
-#include "m_optw_ircview.moc"
+#include "optw_ircview.moc"
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index addfa7a4..fbbc84e0 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -82,4 +82,4 @@ KviLagOptionsWidget::~KviLagOptionsWidget()
 }
 
 
-#include "m_optw_lag.moc"
+#include "optw_lag.moc"
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index b1f25976..dedefbce 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -61,4 +61,4 @@ KviLoggingOptionsWidget::~KviLoggingOptionsWidget()
 
 
 
-#include "m_optw_logging.moc"
+#include "optw_logging.moc"
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 5b1ec8a2..ac2fac50 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -259,4 +259,4 @@ void KviMediaTypesOptionsWidget::commit()
 	g_pMediaManager->unlock();
 }
 
-#include "m_optw_mediatypes.moc"
+#include "optw_mediatypes.moc"
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index ea9dfafb..a9af812d 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -665,4 +665,4 @@ void KviMessageColorsOptionsWidget::load()
 	}
 }
 
-#include "m_optw_messages.moc"
+#include "optw_messages.moc"
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 83f0a4a6..7e882420 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -365,4 +365,4 @@ void KviNickServOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-#include "m_optw_nickserv.moc"
+#include "optw_nickserv.moc"
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index e1b4711a..949517a0 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -131,4 +131,4 @@ KviNotifierOptionsWidget::~KviNotifierOptionsWidget()
 }
 
 
-#include "m_optw_notify.moc"
+#include "optw_notify.moc"
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index 5f125101..392296c5 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -47,4 +47,4 @@ KviProtectionOptionsWidget::~KviProtectionOptionsWidget()
 {
 }
 
-#include "m_optw_protection.moc"
+#include "optw_protection.moc"
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index b36a0fb3..2cdaacf6 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -364,4 +364,4 @@ void KviProxyOptionsWidget::removeCurrent()
 	}
 }
 
-#include "m_optw_proxy.moc"
+#include "optw_proxy.moc"
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index 1efc3417..97f762d8 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -112,4 +112,4 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget()
 }
 
 
-#include "m_optw_query.moc"
+#include "optw_query.moc"
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 336d899b..5295ea43 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1709,4 +1709,4 @@ void KviServerOptionsWidget::detailsClicked()
 	}
 }
 
-#include "m_optw_servers.moc"
+#include "optw_servers.moc"
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index b77262ce..a9d8db6e 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -307,4 +307,4 @@ KviSoundsOptionsWidget::~KviSoundsOptionsWidget()
 {
 }
 
-#include "m_optw_sound.moc"
+#include "optw_sound.moc"
diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp
index 54135f69..c4474673 100644
--- a/src/modules/options/optw_ssl.cpp
+++ b/src/modules/options/optw_ssl.cpp
@@ -32,4 +32,4 @@
 
 
 
-#include "m_optw_ssl.moc"
+#include "optw_ssl.moc"
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 394c8a10..79194d52 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -252,4 +252,4 @@ KviClassicTaskBarOptionsWidget::~KviClassicTaskBarOptionsWidget()
 {
 }
 
-#include "m_optw_taskbar.moc"
+#include "optw_taskbar.moc"
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index b44a498b..844d4e82 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -154,4 +154,4 @@ void KviTextEncodingOptionsWidget::commit()
 		TQMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),TQMessageBox::Ok);*/
 }
 
-#include "m_optw_textencoding.moc"
+#include "optw_textencoding.moc"
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 3973fab9..a999153d 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -241,4 +241,4 @@ void KviTextIconsOptionsWidget::commit()
 	
 }
 
-#include "m_optw_texticons.moc"
+#include "optw_texticons.moc"
diff --git a/src/modules/options/optw_theme.cpp b/src/modules/options/optw_theme.cpp
index e3afeba4..78b23577 100644
--- a/src/modules/options/optw_theme.cpp
+++ b/src/modules/options/optw_theme.cpp
@@ -23,4 +23,4 @@
 //=============================================================================
 
 
-#include "m_optw_theme.moc"
+#include "optw_theme.moc"
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index a1f3cf00..b1452f11 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -47,4 +47,4 @@ KviToolsOptionsWidget::~KviToolsOptionsWidget()
 {
 }
 
-#include "m_optw_tools.moc"
+#include "optw_tools.moc"
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index 904eeaee..788a68e4 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -40,4 +40,4 @@ KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
 {
 }
 
-#include "m_optw_topiclabel.moc"
+#include "optw_topiclabel.moc"
diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp
index d7cf3971..aa412e92 100644
--- a/src/modules/options/optw_transport.cpp
+++ b/src/modules/options/optw_transport.cpp
@@ -30,4 +30,4 @@
 
 
 
-#include "m_optw_transport.moc"
+#include "optw_transport.moc"
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 32a5f4cf..95fa4de7 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -88,4 +88,4 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled)
 }
 
 
-#include "m_optw_tray.moc"
+#include "optw_tray.moc"
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index 15fe465c..8fe6537c 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -59,4 +59,4 @@ KviUParserOptionsWidget::~KviUParserOptionsWidget()
 }
 
 
-#include "m_optw_uparser.moc"
+#include "optw_uparser.moc"
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index f7b366e9..735697b4 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -122,6 +122,6 @@ void KviUrlHandlersOptionsWidget::commit()
 #endif
 }
 
-#include "m_optw_urlhandlers.moc"
+#include "optw_urlhandlers.moc"
 
 #endif //_OPTW_URLHANDLERS_CPP_
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index a75c1efa..32396bee 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -242,4 +242,4 @@ KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget()
 {
 }
 
-#include "m_optw_userlist.moc"
+#include "optw_userlist.moc"
diff --git a/src/modules/popupeditor/Makefile.am b/src/modules/popupeditor/Makefile.am
index 4770ecd8..91da5914 100644
--- a/src/modules/popupeditor/Makefile.am
+++ b/src/modules/popupeditor/Makefile.am
@@ -6,12 +6,12 @@ pluglib_LTLIBRARIES      = libkvipopupeditor.la
 libkvipopupeditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvipopupeditor_la_SOURCES = libkvipopupeditor.cpp popupeditor.cpp
-nodist_libkvipopupeditor_la_SOURCES = moc_popupeditor.cpp
 
-noinst_HEADERS = popupeditor.h
 libkvipopupeditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-# noinst_HEADERS=
+noinst_HEADERS = popupeditor.h
 
-moc_popupeditor.cpp: popupeditor.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+popupeditor.cpp: popupeditor.moc
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 1a5265c2..040456e5 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -1421,3 +1421,5 @@ void KviPopupEditorWindow::loadProperties(KviConfig *cfg)
 #endif // COMPILE_SCRIPTTOOLBAR
 */
 }
+
+#include "popupeditor.moc"
diff --git a/src/modules/raweditor/Makefile.am b/src/modules/raweditor/Makefile.am
index 07ba37b3..34612156 100644
--- a/src/modules/raweditor/Makefile.am
+++ b/src/modules/raweditor/Makefile.am
@@ -6,12 +6,12 @@ pluglib_LTLIBRARIES      = libkviraweditor.la
 libkviraweditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkviraweditor_la_SOURCES = libkviraweditor.cpp raweditor.cpp
-nodist_libkviraweditor_la_SOURCES = moc_raweditor.cpp
 
-noinst_HEADERS = raweditor.h
 libkviraweditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-# noinst_HEADERS=
+noinst_HEADERS = raweditor.h
 
-moc_raweditor.cpp: raweditor.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+raweditor.cpp: raweditor.moc
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 9b3662c6..14f00342 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -556,3 +556,5 @@ void KviRawEditorWindow::loadProperties(KviConfig *cfg)
 #endif // COMPILE_SCRIPTTOOLBAR
 */
 }
+
+#include "raweditor.moc"
diff --git a/src/modules/reguser/Makefile.am b/src/modules/reguser/Makefile.am
index 1fd16912..0dbeb866 100644
--- a/src/modules/reguser/Makefile.am
+++ b/src/modules/reguser/Makefile.am
@@ -10,16 +10,14 @@ pluglib_LTLIBRARIES      = libkvireguser.la
 libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp
+
 libkvireguser_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= edituser.h wizard.h dialog.h
-nodist_libkvireguser_la_SOURCES = moc_dialog.cpp 
 
 %.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 	
-moc_dialog.cpp: dialog.h
-	$(SS_QT_MOC) $< -o $@
-
+dialog.cpp: dialog.moc
 edituser.cpp: edituser.moc
 wizard.cpp: wizard.moc
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 876740d6..2cc18b1f 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -874,3 +874,5 @@ succesfull_import:
 	f.close();
 	fillList();
 }
+
+#include "dialog.moc"
diff --git a/src/modules/sharedfile/Makefile.am b/src/modules/sharedfile/Makefile.am
index 013c24bf..effd6099 100644
--- a/src/modules/sharedfile/Makefile.am
+++ b/src/modules/sharedfile/Makefile.am
@@ -10,9 +10,5 @@ pluglib_LTLIBRARIES      = libkvisharedfile.la
 libkvisharedfile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvisharedfile_la_SOURCES = libkvisharedfile.cpp
-libkvisharedfile_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
-
-#noinst_HEADERS= sharedfilewindow.h
 
-m_%.moc: %.h
-	$(SS_QT_MOC) $< -o $@
+libkvisharedfile_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
diff --git a/src/modules/sharedfileswindow/Makefile.am b/src/modules/sharedfileswindow/Makefile.am
index ce0a79df..6707b018 100644
--- a/src/modules/sharedfileswindow/Makefile.am
+++ b/src/modules/sharedfileswindow/Makefile.am
@@ -12,11 +12,12 @@ pluglib_LTLIBRARIES      = libkvisharedfileswindow.la
 libkvisharedfileswindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvisharedfileswindow_la_SOURCES = libkvisharedfileswindow.cpp sharedfileswindow.cpp
+
 libkvisharedfileswindow_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= sharedfileswindow.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-sharedfileswindow.cpp: m_sharedfileswindow.moc
+sharedfileswindow.cpp: sharedfileswindow.moc
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index dcc8079c..649165d5 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -734,5 +734,4 @@ void KviSharedFilesWindow::die()
 //	m_pIrcView->setShowImages(p->imagesVisible);
 //}
 
-
-#include "m_sharedfileswindow.moc"
+#include "sharedfileswindow.moc"
diff --git a/src/modules/socketspy/Makefile.am b/src/modules/socketspy/Makefile.am
index 66bf2266..b65e3ff7 100644
--- a/src/modules/socketspy/Makefile.am
+++ b/src/modules/socketspy/Makefile.am
@@ -10,11 +10,12 @@ pluglib_LTLIBRARIES      = libkvisocketspy.la
 libkvisocketspy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvisocketspy_la_SOURCES = libkvisocketspy.cpp socketspywindow.cpp
+
 libkvisocketspy_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= socketspywindow.h
 
-m_%.moc: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-socketspywindow.cpp: m_socketspywindow.moc
+socketspywindow.cpp: socketspywindow.moc
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 9f0d2ac9..a6b6fe81 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -118,4 +118,5 @@ void KviSocketSpyWindow::applyOptions()
 	m_pIrcView->applyOptions();
 	KviWindow::applyOptions();
 }
-#include "m_socketspywindow.moc"
+
+#include "socketspywindow.moc"
diff --git a/src/modules/theme/Makefile.am b/src/modules/theme/Makefile.am
index 079c436b..1ba74a09 100644
--- a/src/modules/theme/Makefile.am
+++ b/src/modules/theme/Makefile.am
@@ -15,10 +15,6 @@ libkvitheme_la_SOURCES = libkvitheme.cpp \
 		savethemedialog.cpp \
 		themefunctions.cpp
 
-nodist_libkvitheme_la_SOURCES = moc_managementdialog.cpp \
-		moc_packthemedialog.cpp \
-		moc_savethemedialog.cpp
-
 libkvitheme_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= managementdialog.h \
@@ -26,11 +22,9 @@ noinst_HEADERS= managementdialog.h \
 		savethemedialog.h \
 		themefunctions.h
 
-moc_managementdialog.cpp: managementdialog.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
-moc_packthemedialog.cpp: packthemedialog.h
-	$(SS_QT_MOC) $< -o $@
-	
-moc_savethemedialog.cpp: savethemedialog.h
-	$(SS_QT_MOC) $< -o $@
+managementdialog.cpp: managementdialog.moc
+packthemedialog.cpp: packthemedialog.moc
+savethemedialog.cpp: savethemedialog.moc
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 7afabc9b..5e4006ca 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -454,3 +454,5 @@ void KviThemeManagementDialog::tipRequest(KviDynamicToolTip *pTip,const TQPoint
 
 	pTip->tip(m_pListBox->itemRect(it),szThemeDescription);
 }
+
+#include "managementdialog.moc"
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index d4c5f5b8..25b578d6 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -466,3 +466,4 @@ bool KviPackThemeDialog::packTheme()
 	return true;
 }
 
+#include "packthemedialog.moc"
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index fd8ac85f..0902acd4 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -290,3 +290,4 @@ bool KviSaveThemeDialog::saveTheme()
 	return true;
 }
 
+#include "savethemedialog.moc"
diff --git a/src/modules/toolbareditor/Makefile.am b/src/modules/toolbareditor/Makefile.am
index 9b05887a..4ac10229 100644
--- a/src/modules/toolbareditor/Makefile.am
+++ b/src/modules/toolbareditor/Makefile.am
@@ -11,10 +11,12 @@ pluglib_LTLIBRARIES      = libkvitoolbareditor.la
 libkvitoolbareditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvitoolbareditor_la_SOURCES = libkvitoolbareditor.cpp toolbareditor.cpp
-nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp
 
-noinst_HEADERS = toolbareditor.h
 libkvitoolbareditor_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
-moc_toolbareditor.cpp: toolbareditor.h
+noinst_HEADERS = toolbareditor.h
+
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+toolbareditor.cpp: toolbareditor.moc
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index c33ba952..76801120 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -535,3 +535,4 @@ void KviCustomizeToolBarsDialog::closeEvent(TQCloseEvent * e)
 	delete this;
 }
 
+#include "toolbareditor.moc"
diff --git a/src/modules/window/Makefile.am b/src/modules/window/Makefile.am
index 2ee70e4d..623952cc 100644
--- a/src/modules/window/Makefile.am
+++ b/src/modules/window/Makefile.am
@@ -9,13 +9,13 @@ pluglib_LTLIBRARIES      = libkviwindow.la
 
 libkviwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
-nodist_libkviwindow_la_SOURCES = moc_userwindow.cpp
-
 libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp
 
 libkviwindow_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= userwindow.h
 
-moc_%.cpp: %.h
+%.moc: %.h
 	$(SS_QT_MOC) $< -o $@
+
+userwindow.cpp: userwindow.moc
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index adf52cd3..b45123c2 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -105,3 +105,4 @@ void KviUserWindow::setCaptionStrings(const TQString &szPlainText,const TQString
 	updateCaption();
 }
 
+#include "userwindow.moc"