summaryrefslogtreecommitdiffstats
path: root/krfb
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
commit0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch)
tree54cce3e6ae07c4fc8921244b1397c75cc21a2997 /krfb
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'krfb')
-rw-r--r--krfb/kcm_krfb/kcm_krfb.cpp2
-rw-r--r--krfb/kinetd/kinetd.cpp4
-rw-r--r--krfb/krfb/configuration.cc6
-rw-r--r--krfb/krfb/connectiondialog.cc2
-rw-r--r--krfb/krfb/invitedialog.cc2
-rw-r--r--krfb/krfb/main.cpp4
-rw-r--r--krfb/krfb/personalinvitedialog.cc2
-rw-r--r--krfb/krfb/rfbcontroller.cc4
-rw-r--r--krfb/krfb/trayicon.cpp4
9 files changed, 15 insertions, 15 deletions
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 50855f4f..b269b95a 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -30,7 +30,7 @@
#include <tdeapplication.h>
#include <kdialog.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdeconfig.h>
#include <kgenericfactory.h>
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 4a5abecd..a446c6fc 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -29,8 +29,8 @@
#include <knotifyclient.h>
#include <ksockaddr.h>
#include <kextsock.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 926c915c..069b5696 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -18,10 +18,10 @@
#include "configuration.h"
#include "kinetinterface.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <ksockaddr.h>
#include <kactivelabel.h>
diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc
index d767b5a2..96ad06b9 100644
--- a/krfb/krfb/connectiondialog.cc
+++ b/krfb/krfb/connectiondialog.cc
@@ -24,7 +24,7 @@
#include <tqlabel.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "New Connection" ),
diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc
index f3b202a9..59d62fb7 100644
--- a/krfb/krfb/invitedialog.cc
+++ b/krfb/krfb/invitedialog.cc
@@ -21,7 +21,7 @@
#include "invitewidget.h"
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <tqlabel.h>
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index d9d12ad8..3ec53e3f 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -29,8 +29,8 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <tdeaboutapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqobject.h>
#include <tqwindowdefs.h>
#include <tqcstring.h>
diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc
index a5664bcb..2949ba03 100644
--- a/krfb/krfb/personalinvitedialog.cc
+++ b/krfb/krfb/personalinvitedialog.cc
@@ -24,7 +24,7 @@
#include <kactivelabel.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Personal Invitation" ),
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 85673464..57fb1cbd 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -39,8 +39,8 @@
#include <tdeapplication.h>
#include <knotifyclient.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kextsock.h>
#include <tqstring.h>
#include <tqcursor.h>
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 06807967..84018384 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -19,9 +19,9 @@
#include <tqtooltip.h>
#include <kstdaction.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>