Rename additional header files to avoid conflicts with KDE4

6 files changed, 10 insertions, 10 deletions

diff --git a/src/kvilib/tal/kvi_tal_menubar_kde.h b/src/kvilib/tal/kvi_tal_menubar_kde.h
index 4aff834..f860cda 100644
--- a/src/kvilib/tal/kvi_tal_menubar_kde.h
+++ b/src/kvilib/tal/kvi_tal_menubar_kde.h
@@ -22,7 +22,7 @@
 //   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 class KVILIB_API KviTalMenuBar : public KMenuBar
 {
diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp
index e86502c..d340bb9 100644
--- a/src/kvirc/ui/kvi_msgbox.cpp
+++ b/src/kvirc/ui/kvi_msgbox.cpp
@@ -25,7 +25,7 @@
 // FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApp!"
 
 #ifdef COMPILE_TDE_SUPPORT
-	#include <kmessagebox.h>
+	#include <tdemessagebox.h>
 #else
 	#include <tqmessagebox.h>
 #endif //!COMPILE_WITH_KDE
diff --git a/src/modules/options/Makefile.am b/src/modules/options/Makefile.am
index 53c0988..738158c 100644
--- a/src/modules/options/Makefile.am
+++ b/src/modules/options/Makefile.am
@@ -28,7 +28,7 @@ libkvioptions_la_SOURCES = libkvioptions.cpp \
 				optw_ignore.cpp \
 				optw_input.cpp \
 				optw_interfacefeatures.cpp \
-				optw_interfacelookglobal.cpp \
+				optw_interfacelootdeglobal.cpp \
 				optw_irc.cpp \
 				optw_ircoutput.cpp \
 				optw_ircview.cpp \
@@ -75,7 +75,7 @@ noinst_HEADERS= container.h \
 				optw_ignore.h \
 				optw_input.h \
 				optw_interfacefeatures.h \
-				optw_interfacelookglobal.h \
+				optw_interfacelootdeglobal.h \
 				optw_irc.h \
 				optw_ircoutput.h \
 				optw_ircview.h \
@@ -127,7 +127,7 @@ 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_interfacelootdeglobal.cpp: m_optw_interfacelootdeglobal.moc
 optw_irc.cpp: m_optw_irc.moc
 optw_ircoutput.cpp: m_optw_ircoutput.moc
 optw_ircview.cpp: m_optw_ircview.moc
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 7e1e896..b61c33a 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -42,7 +42,7 @@
 #include "optw_ignore.h"
 #include "optw_input.h"
 #include "optw_interfacefeatures.h"
-#include "optw_interfacelookglobal.h"
+#include "optw_interfacelootdeglobal.h"
 #include "optw_irc.h"
 #include "optw_ircoutput.h"
 #include "optw_ircview.h"
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index fe27dbd..8364a7e 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -1,5 +1,5 @@
 //
-//   File : optw_interfacelookglobal.cpp
+//   File : optw_interfacelootdeglobal.cpp
 //   Creation date : Sun Jun 3 2001 20:50:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -20,7 +20,7 @@
 //   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
-#include "optw_interfacelookglobal.h"
+#include "optw_interfacelootdeglobal.h"
 
 #include <tqlayout.h>
 
@@ -212,4 +212,4 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
 }
 
 
-#include "m_optw_interfacelookglobal.moc"
+#include "m_optw_interfacelootdeglobal.moc"
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index 62a5517..0259873 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -2,7 +2,7 @@
 #define _OPTW_INTERFACELOOKGLOBAL_H_
 
 //
-//   File : optw_interfacelookglobal.h
+//   File : optw_interfacelootdeglobal.h
 //   Creation date : Sun Jun 3 2001 20:49:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution