diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /krdc | |
parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'krdc')
-rw-r--r-- | krdc/keycapturedialog.cpp | 2 | ||||
-rw-r--r-- | krdc/krdc.cpp | 6 | ||||
-rw-r--r-- | krdc/main.cpp | 4 | ||||
-rw-r--r-- | krdc/maindialog.cpp | 2 | ||||
-rw-r--r-- | krdc/maindialogwidget.cpp | 4 | ||||
-rw-r--r-- | krdc/preferencesdialog.cpp | 2 | ||||
-rw-r--r-- | krdc/rdp/krdpview.cpp | 4 | ||||
-rw-r--r-- | krdc/rdp/rdphostpref.cpp | 2 | ||||
-rw-r--r-- | krdc/vnc/kvncview.cpp | 4 | ||||
-rw-r--r-- | krdc/vnc/vnchostpref.cpp | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index 9949471e..03322b56 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #define XK_XKB_KEYS #define XK_MISCELLANY diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 1cec72c0..750557f6 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -26,13 +26,13 @@ #include <kcombobox.h> #include <kurl.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <twin.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tqdockarea.h> #include <tqlabel.h> diff --git a/krdc/main.cpp b/krdc/main.cpp index d97145a8..9252e6a0 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -19,8 +19,8 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kdebug.h> #include <tdewallet.h> diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp index 3afb0f81..88310d57 100644 --- a/krdc/maindialog.cpp +++ b/krdc/maindialog.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kguiitem.h> -#include <klocale.h> +#include <tdelocale.h> MainDialog::MainDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Remote Desktop Connection" ), diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index a9ae12ce..93b39a43 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include "hostpreferences.h" diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index cffbfc26..6ab55205 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -30,7 +30,7 @@ #include <tqvbox.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name ) : KDialogBase( Tabbed, i18n( "Preferences" ), Ok|Cancel, Ok, diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 273f89d0..e20399df 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -21,8 +21,8 @@ #include <tdeapplication.h> #include <kdialogbase.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tdewallet.h> #include <kpassdlg.h> diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp index 42122549..e50dc7de 100644 --- a/krdc/rdp/rdphostpref.cpp +++ b/krdc/rdp/rdphostpref.cpp @@ -19,7 +19,7 @@ #include "rdphostpref.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> const TQString RdpHostPref::RdpType = "RDP"; diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 751a2db3..c3edc19b 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -21,8 +21,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kpassdlg.h> #include <kdialogbase.h> diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp index 4cff3768..05ac4139 100644 --- a/krdc/vnc/vnchostpref.cpp +++ b/krdc/vnc/vnchostpref.cpp @@ -17,7 +17,7 @@ #include "vnchostpref.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> const TQString VncHostPref::VncType = "VNC"; |