Include moc files directly from the related source files

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

48 files changed, 134 insertions, 98 deletions

diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index e96d151..ffc99f4 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -22,18 +22,6 @@ libkvilib_la_LIBADD  = $(SS_LIBLINK)
 # echo $SRC
 #
 
-nodist_libkvilib_la_SOURCES = \
-	../ext/moc_kvi_crypt.cpp \
-	../ext/moc_kvi_garbage.cpp \
-	../ext/moc_kvi_regusersdb.cpp \
-	../ext/moc_kvi_sharedfiles.cpp \
-	../irc/moc_kvi_ircuserdb.cpp \
-	../net/moc_kvi_dns.cpp \
-	../net/moc_kvi_http.cpp \
-	../system/moc_kvi_locale.cpp \
-	../system/moc_kvi_thread.cpp \
-	../tal/moc_kvi_tal_wizard.cpp
-
 libkvilib_la_SOURCES = \
 	../core/kvi_error.cpp \
 	../core/kvi_heapobject.cpp \
@@ -227,41 +215,43 @@ headers_HEADERS = \
 	../tal/kvi_tal_windowstate.h
 
 
-../ext/moc_%.cpp: ../ext/%.h
+../ext/%.moc: ../ext/%.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-../file/moc_%.cpp: ../file/%.h
+../file/%.moc: ../file/%.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-../irc/moc_%.cpp: ../irc/%.h
+../irc/%.moc: ../irc/%.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-../net/moc_%.cpp: ../net/%.h
+../net/%.moc: ../net/%.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-../system/moc_%.cpp: ../system/%.h
+../system/%.moc: ../system/%.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-../tal/moc_%.cpp: ../tal/%.h
+../tal/%.moc: ../tal/%.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-
 %.moc: %.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
-#%.h.gch: %.h
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c $< -o $@
-
-#PRECOMPILED_HDRS = \
-#	../config/kvi_confignames.h.gch \
-#   ...
-
 #
 # Command useful to find the moc dependancies
 # grep "\.moc" ../*/*.cpp | sort | sed -e 's/[[:space:]]*#include//' | sed -e 's/\"//g'
 # needs to be modified by hand then to add the moc file path... :)
 #
 
+../ext/kvi_crypt.cpp: ../ext/kvi_crypt.moc
+../ext/kvi_garbage.cpp: ../ext/kvi_garbage.moc
+../ext/kvi_regusersdb.cpp: ../ext/kvi_regusersdb.moc
+../ext/kvi_sharedfiles.cpp: ../ext/kvi_sharedfiles.moc
+../irc/kvi_ircuserdb.cpp: ../irc/kvi_ircuserdb.moc
+../net/kvi_dns.cpp: ../net/kvi_dns.moc
+../net/kvi_http.cpp: ../net/kvi_http.moc
+../system/kvi_locale.cpp: ../system/kvi_locale.moc
+../system/kvi_thread.cpp: ../system/kvi_thread.moc
+../tal/kvi_tal_wizard.cpp: ../tal/kvi_tal_wizard.moc
 ../tal/kvi_tal_application.cpp: ../tal/kvi_tal_application_kde.moc
 ../tal/kvi_tal_application.cpp: ../tal/kvi_tal_application_qt.moc
 ../tal/kvi_tal_mainwindow.cpp: ../tal/kvi_tal_mainwindow_kde.moc
@@ -302,13 +292,4 @@ symlinks: ../config/*.h ../core/*.h ../ext/*.h ../file/*.h ../irc/*.h ../net/*.h
 	cd ../include; for i in kvi_*.h; do if [ ! -f $$i ]; then rm -f $$i; fi; done; for i in $(SS_TOPSRCDIR)/src/kvilib/*/kvi_*.h; do $(LN_S) $$i . >/dev/null 2>&1; echo "Created link to $$i"; done;
 	touch symlinks
 
-# gchsymlinks: ../config/*.h ../core/*.h ../ext/*.h ../file/*.h ../irc/*.h ../net/*.h ../system/*.h ../tal/*.h
-#	cd ../include; for i in kvi_*.gch; do if [ ! -f $$i ]; then rm -f $$i; fi; done; for i in $(SS_TOPSRCDIR)/src/kvilib/*/kvi_*.h.gch; do $(LN_S) $$i . >/dev/null 2>&1; echo "Created link to $$i"; done;
-#	touch gchsymlinks
-
-#
-# When cleaning...remove also the symlinks, gchsymlinks and gch headers
-#
-
-#CLEANFILES = ../include/*.h ../include/*.gch symlinks gchsymlinks ../*/*.moc ../*/moc_kvi_*.cpp ../*/*.gch
-CLEANFILES = ../include/*.h symlinks ../*/*.moc ../*/moc_kvi_*.cpp
+CLEANFILES = ../include/*.h symlinks ../*/*.moc
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp
index bbeffa2..4ed8fc7 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/kvi_crypt.cpp
@@ -238,3 +238,5 @@
 	}
 
 #endif //COMPILE_CRYPT_SUPPORT
+
+#include "kvi_crypt.moc"
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index 4d79b48..56f6557 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -146,3 +146,4 @@ void KviGarbageCollector::cleanup()
 	}
 }
 
+#include "kvi_garbage.moc"
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 87ce9b6..8ab9aa2 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -737,3 +737,5 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
 	}
 	
 }
+
+#include "kvi_regusersdb.moc"
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 69a2525..2e6da61 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -384,3 +384,4 @@ void KviSharedFilesManager::save(const TQString &filename)
 	cfg.writeEntry("NEntries",idx);
 }
 
+#include "kvi_sharedfiles.moc"
diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp
index beb4ed3..a5e66d9 100644
--- a/src/kvilib/irc/kvi_ircuserdb.cpp
+++ b/src/kvilib/irc/kvi_ircuserdb.cpp
@@ -283,3 +283,5 @@ void KviIrcUserDataBase::registeredDatabaseCleared()
 		it.current()->m_bNotFoundRegUserLoockup=false;
 	}
 }
+
+#include "kvi_ircuserdb.moc"
diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp
index d537e3f..c6f2612 100644
--- a/src/kvilib/net/kvi_dns.cpp
+++ b/src/kvilib/net/kvi_dns.cpp
@@ -448,3 +448,4 @@ bool KviDns::event(TQEvent *e)
 	return TQObject::event(e);
 }
 
+#include "kvi_dns.moc"
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 81587fa..67adc38 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -1435,3 +1435,4 @@ void KviHttpRequestThread::runInternal()
 	}
 }
 
+#include "kvi_http.moc"
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index e8a0e5b..0f456f4 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -1151,3 +1151,5 @@ static TQString fake_translations_table[]=
 }
 
 #endif
+
+#include "kvi_locale.moc"
diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp
index f8404bb..017e789 100644
--- a/src/kvilib/system/kvi_thread.cpp
+++ b/src/kvilib/system/kvi_thread.cpp
@@ -642,3 +642,4 @@ void KviSensitiveThread::terminate()
 //	tqDebug("Exiting KviSensitiveThread::terminate (this=%d)",this);
 }
 
+#include "kvi_thread.moc"
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index 4ea3f0e..210e98d 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -534,3 +534,4 @@ TQPushButton * KviTalWizard::backButton()
 	return m_p->pBackButton;
 }
 
+#include "kvi_tal_wizard.moc"
diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am
index 588e250..75ff8bc 100644
--- a/src/kvirc/build/Makefile.am
+++ b/src/kvirc/build/Makefile.am
@@ -22,42 +22,6 @@ bin_PROGRAMS = kvirc
 # echo $SRC
 #
 
-nodist_kvirc_SOURCES = ../kernel/moc_kvi_action.cpp \
-../kernel/moc_kvi_actionmanager.cpp \
-../kernel/moc_kvi_coreactions.cpp \
-../kernel/moc_kvi_filetransfer.cpp \
-../kernel/moc_kvi_ircconnection.cpp \
-../kernel/moc_kvi_irccontext.cpp \
-../kernel/moc_kvi_irclink.cpp \
-../kernel/moc_kvi_ircsocket.cpp \
-../kernel/moc_kvi_ircconnectiontargetresolver.cpp \
-../kvs/moc_kvi_kvs_action.cpp \
-../kvs/moc_kvi_kvs_asyncdnsoperation.cpp \
-../kvs/moc_kvi_kvs_asyncoperation.cpp \
-../kvs/moc_kvi_kvs_dnsmanager.cpp \
-../kvs/moc_kvi_kvs_timermanager.cpp \
-../kvs/moc_kvi_kvs_object.cpp \
-../kvs/moc_kvi_kvs_popupmenu.cpp \
-../kvs/moc_kvi_kvs_processmanager.cpp \
-../kvs/moc_kvi_kvs_useraction.cpp \
-../module/moc_kvi_mexlinkfilter.cpp \
-../module/moc_kvi_mexserverimport.cpp \
-../module/moc_kvi_mextoolbar.cpp \
-../module/moc_kvi_modulemanager.cpp \
-../ui/moc_kvi_actiondrawer.cpp \
-../ui/moc_kvi_customtoolbar.cpp \
-../ui/moc_kvi_debugwindow.cpp \
-../ui/moc_kvi_htmldialog.cpp \
-../ui/moc_kvi_imagedialog.cpp \
-../ui/moc_kvi_ircviewtools.cpp \
-../ui/moc_kvi_mdicaption.cpp \
-../ui/moc_kvi_mdichild.cpp \
-../ui/moc_kvi_mdimanager.cpp \
-../ui/moc_kvi_statusbar.cpp \
-../ui/moc_kvi_statusbarapplet.cpp \
-../ui/moc_kvi_toolwindows_container.cpp \
-../ui/moc_kvi_listview.cpp
-
 kvirc_SOURCES = ../kernel/kvi_action.cpp \
 ../kernel/kvi_actionmanager.cpp \
 ../kernel/kvi_app.cpp \
@@ -458,6 +422,19 @@ headers_HEADERS = ../kernel/kvi_action.h \
 ../ui/kvi_styled_controls.h \
 ../ui/kvi_toolwindows_container.h
 
+
+../kvs/%.moc: ../kvs/%.h
+	$(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@
+
+../kernel/%.moc: ../kernel/%.h
+	$(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@
+
+../module/%.moc: ../module/%.h
+	$(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@
+
+../ui/%.moc: ../ui/%.h
+	$(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@
+
 %.moc: %.h
 	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
 
@@ -465,58 +442,82 @@ headers_HEADERS = ../kernel/kvi_action.h \
 # DIRS="kernel sparser ui uparser"
 # for dire in $DIRS; do grep "\.moc" ../$dire/*.cpp | sort | sed -e 's/[[:space:]]*#include//' | sed -e s/\\\"/..\\\/$dire\\\// | sed -e 's/\"//'; done
 
+../kernel/kvi_action.cpp: ../kernel/kvi_action.moc
+../kernel/kvi_actionmanager.cpp: ../kernel/kvi_actionmanager.moc
 ../kernel/kvi_app.cpp: ../kernel/kvi_app.moc
+../kernel/kvi_coreactions.cpp: ../kernel/kvi_coreactions.moc
+../kernel/kvi_filetransfer.cpp: ../kernel/kvi_filetransfer.moc
 ../kernel/kvi_iconmanager.cpp: ../kernel/kvi_iconmanager.moc
 ../kernel/kvi_ipc.cpp: ../kernel/kvi_ipc.moc
+../kernel/kvi_ircconnection.cpp: ../kernel/kvi_ircconnection.moc
+../kernel/kvi_ircconnectiontargetresolver.cpp: ../kernel/kvi_ircconnectiontargetresolver.moc
+../kernel/kvi_irccontext.cpp: ../kernel/kvi_irccontext.moc
+../kernel/kvi_irclink.cpp: ../kernel/kvi_irclink.moc
+../kernel/kvi_ircsocket.cpp: ../kernel/kvi_ircsocket.moc
 ../kernel/kvi_lagmeter.cpp: ../kernel/kvi_lagmeter.moc
 ../kernel/kvi_notifylist.cpp: ../kernel/kvi_notifylist.moc
 ../kernel/kvi_texticonmanager.cpp: ../kernel/kvi_texticonmanager.moc
+../kvs/kvi_kvs_action.cpp: ../kvs/kvi_kvs_action.moc
+../kvs/kvi_kvs_asyncdnsoperation.cpp: ../kvs/kvi_kvs_asyncdnsoperation.moc
+../kvs/kvi_kvs_asyncoperation.cpp: ../kvs/kvi_kvs_asyncoperation.moc
+../kvs/kvi_kvs_dnsmanager.cpp: ../kvs/kvi_kvs_dnsmanager.moc
+../kvs/kvi_kvs_object.cpp: ../kvs/kvi_kvs_object.moc
+../kvs/kvi_kvs_popupmenu.cpp: ../kvs/kvi_kvs_popupmenu.moc
+../kvs/kvi_kvs_processmanager.cpp: ../kvs/kvi_kvs_processmanager.moc
+../kvs/kvi_kvs_timermanager.cpp: ../kvs/kvi_kvs_timermanager.moc
+../kvs/kvi_kvs_useraction.cpp: ../kvs/kvi_kvs_useraction.moc
+../module/kvi_mexlinkfilter.cpp: ../module/kvi_mexlinkfilter.moc
+../module/kvi_mexserverimport.cpp: ../module/kvi_mexserverimport.moc
+../module/kvi_mextoolbar.cpp: ../module/kvi_mextoolbar.moc
+../module/kvi_modulemanager.cpp: ../module/kvi_modulemanager.moc
 ../sparser/kvi_sparser.cpp: ../sparser/kvi_sparser.moc
+../ui/kvi_actiondrawer.cpp: ../ui/kvi_actiondrawer.moc
 ../ui/kvi_channel.cpp: ../ui/kvi_channel.moc
 ../ui/kvi_colorwin.cpp: ../ui/kvi_colorwin.moc
 ../ui/kvi_console.cpp: ../ui/kvi_console.moc
 ../ui/kvi_cryptcontroller.cpp: ../ui/kvi_cryptcontroller.moc
 ../ui/kvi_ctcppagedialog.cpp: ../ui/kvi_ctcppagedialog.moc
+../ui/kvi_customtoolbar.cpp: ../ui/kvi_customtoolbar.moc
+../ui/kvi_debugwindow.cpp: ../ui/kvi_debugwindow.moc
 ../ui/kvi_dynamictooltip.cpp: ../ui/kvi_dynamictooltip.moc
 ../ui/kvi_filedialog.cpp: ../ui/kvi_filedialog.moc
 ../ui/kvi_frame.cpp: ../ui/kvi_frame.moc
 ../ui/kvi_historywin.cpp: ../ui/kvi_historywin.moc
+../ui/kvi_htmldialog.cpp: ../ui/kvi_htmldialog.moc
+../ui/kvi_imagedialog.cpp: ../ui/kvi_imagedialog.moc
 ../ui/kvi_input.cpp: ../ui/kvi_input.moc
 ../ui/kvi_ipeditor.cpp: ../ui/kvi_ipeditor.moc
 ../ui/kvi_irctoolbar.cpp: ../ui/kvi_irctoolbar.moc
 ../ui/kvi_ircview.cpp: ../ui/kvi_ircview.moc
+../ui/kvi_ircviewtools.cpp: ../ui/kvi_ircviewtools.moc
+../ui/kvi_listview.cpp: ../ui/kvi_listview.moc
 ../ui/kvi_maskeditor.cpp: ../ui/kvi_maskeditor.moc
+../ui/kvi_mdicaption.cpp: ../ui/kvi_mdicaption.moc
+../ui/kvi_mdichild.cpp: ../ui/kvi_mdichild.moc
+../ui/kvi_mdimanager.cpp: ../ui/kvi_mdimanager.moc
 ../ui/kvi_menubar.cpp: ../ui/kvi_menubar.moc
 ../ui/kvi_modeeditor.cpp: ../ui/kvi_modeeditor.moc
+../ui/kvi_modew.cpp: ../ui/kvi_modew.moc
 ../ui/kvi_optionswidget.cpp: ../ui/kvi_optionswidget.moc
 ../ui/kvi_query.cpp: ../ui/kvi_query.moc
 ../ui/kvi_scriptbutton.cpp: ../ui/kvi_scriptbutton.moc
 ../ui/kvi_scripteditor.cpp: ../ui/kvi_scripteditor.moc
 ../ui/kvi_selectors.cpp: ../ui/kvi_selectors.moc
 ../ui/kvi_splash.cpp: ../ui/kvi_splash.moc
+../ui/kvi_statusbarapplet.cpp: ../ui/kvi_statusbarapplet.moc
+../ui/kvi_statusbar.cpp: ../ui/kvi_statusbar.moc
+../ui/kvi_styled_controls.cpp: ../ui/kvi_styled_controls.moc
 ../ui/kvi_taskbar.cpp: ../ui/kvi_taskbar.moc
 ../ui/kvi_texticonwin.cpp: ../ui/kvi_texticonwin.moc
+../ui/kvi_texticonwin.cpp: ../ui/kvi_texticonwin.moc
 ../ui/kvi_themedlabel.cpp: ../ui/kvi_themedlabel.moc
 ../ui/kvi_toolbar.cpp: ../ui/kvi_toolbar.moc
+../ui/kvi_toolwindows_container.cpp: ../ui/kvi_toolwindows_container.moc
 ../ui/kvi_topicw.cpp: ../ui/kvi_topicw.moc
-../ui/kvi_modew.cpp: ../ui/kvi_modew.moc
-../ui/kvi_styled_controls.cpp: ../ui/kvi_styled_controls.moc
 ../ui/kvi_userlistview.cpp: ../ui/kvi_userlistview.moc
 ../ui/kvi_window.cpp: ../ui/kvi_window.moc
 
 
-../kvs/moc_%.cpp: ../kvs/%.h
-	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
-
-../kernel/moc_%.cpp: ../kernel/%.h
-	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
-
-../module/moc_%.cpp: ../module/%.h
-	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
-
-../ui/moc_%.cpp: ../ui/%.h
-	$(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@
-
 
 #
 # All the cpp files depend on symlinks beging up-to-date
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 57684a2..910a00f 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -429,3 +429,4 @@ void KviAction::activate()
 		emit activated();
 }
 
+#include "kvi_action.moc"
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index c4af1e7..52d9f85 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -319,3 +319,4 @@ void KviActionManager::listActionsByCategory(const TQString &szCatName,KviPointe
 	}
 }
 
+#include "kvi_actionmanager.moc"
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 240c1da..7042b36 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -1183,4 +1183,4 @@ void KviIrcOperationsAction::popupActivated(int id)
 {
 }
 
-
+#include "kvi_coreactions.moc"
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 35d8428..200649f 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -188,3 +188,5 @@ void KviFileTransfer::displayUpdate()
 {
 	if(m_pDisplayItem)m_pDisplayItem->repaint();
 }
+
+#include "kvi_filetransfer.moc"
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 22b3b2d..886198c 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -1352,3 +1352,5 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow)
 		}
 	}
 }
+
+#include <kvi_ircconnection.moc>
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 35da870..456e997 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -555,3 +555,5 @@ void KviIrcConnectionTargetResolver::terminate(Status s,int iLastError)
 	m_iLastError = iLastError;
 	emit terminated();
 }
+
+#include "kvi_ircconnectiontargetresolver.moc"
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 2195a10..1379121 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -904,3 +904,4 @@ void KviIrcContext::timerEvent(TQTimerEvent *e)
 		m_pConnection->heartbeat(tNow);
 }
 
+#include "kvi_irccontext.moc"
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index 3d9e045..909671a 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -404,3 +404,4 @@ void KviIrcLink::socketStateChange()
 	}
 }
 
+#include "kvi_irclink.moc"
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index 3c87453..84a892b 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -1908,3 +1908,5 @@ bool KviIrcSocket::sendPacket(KviDataBuffer * pData)
 	if(!m_bInProcessData)flushSendQueue();
 	return (m_state != Idle);
 }
+
+#include "kvi_ircsocket.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/kvi_kvs_action.cpp
index 82972d3..c83a89a 100644
--- a/src/kvirc/kvs/kvi_kvs_action.cpp
+++ b/src/kvirc/kvs/kvi_kvs_action.cpp
@@ -64,3 +64,5 @@ void KviKvsAction::activate()
 	if(!isEnabled())return; // no way
 	m_pScript->run(g_pActiveWindow); // FIXME: complain more in case of error ?
 }
+
+#include "kvi_kvs_action.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
index 06c0c4e..5c56ee6 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
@@ -120,3 +120,5 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *)
 
 	delete this;
 }
+
+#include "kvi_kvs_asyncdnsoperation.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
index 19e4656..e3b479f 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
@@ -64,3 +64,4 @@ void KviKvsAsyncOperationManager::unregisterOperation(KviKvsAsyncOperation * o)
 	m_pOperationList->removeRef(o);
 }
 
+#include "kvi_kvs_asyncoperation.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index 2f5c28b..32575ce 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -178,3 +178,5 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
 
 	m_pDnsObjects->remove(pDns);
 }
+
+#include "kvi_kvs_dnsmanager.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 9b98621..4677f84 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -1675,4 +1675,4 @@ KviKvsObject * KviKvsObject::findChild(const TQString &szClass,const TQString &s
 	return 0;
 }
 
-
+#include "kvi_kvs_object.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 6c95b2a..0e90026 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -1224,8 +1224,4 @@ void KviKvsPopupMenu::generateDefPopup(TQString &buffer)
 	buffer.append(core);
 }
 
-
-
-
-
-
+#include "kvi_kvs_popupmenu.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
index 4657110..80b43f0 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
@@ -370,3 +370,5 @@ bool KviKvsProcessManager::execute(KviKvsProcessAsyncOperationData * d)
 	return true;
 }
 */
+
+#include "kvi_kvs_processmanager.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
index 9d9a2a4..ba0b3f7 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
@@ -254,3 +254,5 @@ void KviKvsTimerManager::timerEvent(TQTimerEvent *e)
 		deleteTimer(t->id());
 	}
 }
+
+#include "kvi_kvs_timermanager.moc"
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp
index 9a77d51..52bb09c 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp
@@ -275,3 +275,4 @@ void KviKvsUserAction::save(KviConfig * cfg)
 	cfg->writeEntry("Code",m_pScript->code());
 }
 
+#include "kvi_kvs_useraction.moc"
diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/kvi_mexlinkfilter.cpp
index b479d3c..32cf209 100644
--- a/src/kvirc/module/kvi_mexlinkfilter.cpp
+++ b/src/kvirc/module/kvi_mexlinkfilter.cpp
@@ -33,3 +33,5 @@ KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d)
 KviMexLinkFilter::~KviMexLinkFilter()
 {
 }
+
+#include "kvi_mexlinkfilter.moc"
diff --git a/src/kvirc/module/kvi_mexserverimport.cpp b/src/kvirc/module/kvi_mexserverimport.cpp
index 59ac15e..eebb80b 100644
--- a/src/kvirc/module/kvi_mexserverimport.cpp
+++ b/src/kvirc/module/kvi_mexserverimport.cpp
@@ -31,3 +31,5 @@ KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d)
 KviMexServerImport::~KviMexServerImport()
 {
 }
+
+#include "kvi_mexserverimport.moc"
diff --git a/src/kvirc/module/kvi_mextoolbar.cpp b/src/kvirc/module/kvi_mextoolbar.cpp
index ccae2f3..235804f 100644
--- a/src/kvirc/module/kvi_mextoolbar.cpp
+++ b/src/kvirc/module/kvi_mextoolbar.cpp
@@ -36,3 +36,4 @@ KviMexToolBar::~KviMexToolBar()
 	g_pFrame->unregisterModuleExtensionToolBar(this);
 }
 
+#include "kvi_mextoolbar.moc"
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 4d83edd..05e5aa8 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -367,3 +367,5 @@ void KviModuleManager::unloadAllModules()
 	for(KviModule * pModule = lModulesToUnload.first();pModule;pModule = lModulesToUnload.next())
 		unloadModule(pModule);
 }
+
+#include "kvi_modulemanager.moc"
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp
index 2637d4d..248cdb2 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/kvi_actiondrawer.cpp
@@ -213,4 +213,4 @@ void KviActionDrawer::fill()
 	}
 }
 
-
+#include "kvi_actiondrawer.moc"
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 24259c2..618940f 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -523,3 +523,5 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
 unhandled:
 	return KviToolBar::eventFilter(o,e);
 }
+
+#include "kvi_customtoolbar.moc"
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index 7065179..ec209c7 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -130,3 +130,4 @@ TQSize KviDebugWindow::sizeHint() const
 	return ret;
 }
 
+#include "kvi_debugwindow.moc"
diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp
index 1833054..da92abb 100644
--- a/src/kvirc/ui/kvi_htmldialog.cpp
+++ b/src/kvirc/ui/kvi_htmldialog.cpp
@@ -152,4 +152,4 @@ int KviHtmlDialog::display(TQWidget * pParent,KviHtmlDialogData * pData)
 	return pData->iSelectedButton;
 }
 
-
+#include "kvi_htmldialog.moc"
diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
index 4d79b93..1cd9fb3 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/kvi_imagedialog.cpp
@@ -361,3 +361,5 @@ void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
 	KviImageDialogItem * i = (KviImageDialogItem *)it;
 	m_pTip->tip(r,i->tipText());
 }
+
+#include "kvi_imagedialog.moc"
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
index e71e1ab..7fc44a3 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
@@ -337,3 +337,4 @@ void KviIrcViewToolTip::maybeTip(const TQPoint &pnt)
 	m_pView->maybeTip(pnt);
 }
 
+#include "kvi_ircviewtools.moc"
diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp
index 4a459e5..7352f5b 100644
--- a/src/kvirc/ui/kvi_listview.cpp
+++ b/src/kvirc/ui/kvi_listview.cpp
@@ -203,3 +203,5 @@ void KviListView::focusOutEvent(TQFocusEvent * e)
 }
 
 #endif
+
+#include "kvi_listview.moc"
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 6276f82..d9954ac 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -249,3 +249,4 @@ TQSize KviMenuBarToolButton::sizeHint() const
 	return TQSize(20,20);
 }
 
+#include "kvi_mdicaption.moc"
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 6f4e894..fd1b57a 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -557,4 +557,4 @@ TQSize KviMdiChild::sizeHint()
 	return TQFrame::sizeHint();
 }
 
-
+#include "kvi_mdichild.moc"
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 07013f7..1fea6ad 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -1050,4 +1050,4 @@ void KviMdiManager::tileAnodine()
 	updateContentsSize();
 }
 
-
+#include "kvi_mdimanager.moc"
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 2ec878b..f34567b 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -627,3 +627,5 @@ void KviStatusBar::setPermanentMessage()
 
 	m_pMessageLabel->setText(txt);
 }
+
+#include "kvi_statusbar.moc"
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 3a23bd3..2e61024 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -552,3 +552,4 @@ void KviStatusBarSeparator::selfRegister(KviStatusBar * pBar)
 	pBar->registerAppletDescriptor(d);
 }
 
+#include "kvi_statusbarapplet.moc"
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index e4f6fb5..34feb54 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -272,5 +272,4 @@ hideme:
 	doHide();
 }
 
-
 #include "kvi_texticonwin.moc"
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index 0a2ec1a..a526237 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -132,3 +132,5 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
 	p->rotate( -90 );
 	p->drawPixmap( 1 - pixmap.width(), 0, pixmap );
 }*/
+
+#include "kvi_toolwindows_container.moc"