code clean; applied patch for MacOS X

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1370 17fca916-40b9-46aa-a4ea-0a15b648b75c

15 files changed, 31 insertions, 6 deletions

diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 69434fcb2..e118f6a0b 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,4 +1,7 @@
 # CMakeLists.txt for src/modules/
+IF(APPLE)
+	set(CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress")
+ENDIF()
 
 INCLUDE_DIRECTORIES(
 	../kvilib/tal/
@@ -42,4 +45,4 @@ SUBDIRS(
 
 	# forgotten ?
 	# clock iograph
-)
\ No newline at end of file
+)
diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt
index 6d0202de1..798581e92 100644
--- a/src/modules/about/CMakeLists.txt
+++ b/src/modules/about/CMakeLists.txt
@@ -1,5 +1,4 @@
 # CMakeLists for src/modules/about
-
 SET(kviabout_MOC_HDRS
 	aboutdialog.h
 	libkviabout.h
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 0954e7437..8025d6c19 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -297,5 +297,6 @@ void KviChannelsJoinWindow::closeEvent(QCloseEvent *e)
 	e->ignore();
 	delete this;
 }
-
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_channelsjoinwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 0212adac4..4c081713d 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -895,4 +895,6 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
 }
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_broker.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index d629b3d14..ef06da588 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -839,4 +839,6 @@ out_of_the_loop:
 	return bRet;
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_chat.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index c999e53bb..18f1f4f5c 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -203,4 +203,6 @@ void KviDccRenameBox::cancelClicked()
 
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_dialogs.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 2aa383434..add48e9bc 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -644,4 +644,6 @@ void KviDccMarshal::connectionTimedOut()
 }
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_marshal.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index e88c1424b..82315fe7b 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1894,5 +1894,6 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e)
 
 
 
-
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_send.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 787d43665..af0c46f44 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -1038,4 +1038,6 @@ void KviDccVoice::focusInEvent(QFocusEvent *e)
 	KviWindow::focusInEvent(e);
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_voice.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index 11fe893fd..6f9a36b60 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -50,4 +50,6 @@ const char * KviDccWindow::dccMarshalOutputContextString()
 	return static_context;
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_window.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 426580d8f..38f418578 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -917,4 +917,6 @@ KVIRC_MODULE(
 	dialog_module_cleanup
 )
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "libkvidialog.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 93b8a6b33..5a768da47 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -765,4 +765,6 @@ void KviFileTransferWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_filetransferwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index b35c1d1a0..e0068b715 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -151,4 +151,6 @@ bool KviHelpWidget::eventFilter(QObject * o, QEvent *e)
 
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "helpwidget.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 8fa4cfcc1..13dcd62e3 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -326,4 +326,6 @@ void KviHelpWindow::fillCaptionBuffers()
 }
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "helpwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 659ff44cb..6a5440292 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -850,5 +850,6 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 }
 
 
-
-#include "index.moc"
\ No newline at end of file
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
+#include "index.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES