diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:51:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:51:38 -0600 |
| commit | 2f56d1e427efea53bbd24132100bbeadfae03277 (patch) | |
| tree | 3c37dca4917301736605a8ee507a61baa6a42812 /smb4k/configdlg | |
| parent | e8d9e8424504dac5aed9cc60b3cd565a0494fd29 (diff) | |
| download | smb4k-2f56d1e427efea53bbd24132100bbeadfae03277.tar.gz smb4k-2f56d1e427efea53bbd24132100bbeadfae03277.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'smb4k/configdlg')
| -rw-r--r-- | smb4k/configdlg/smb4kauthoptions.cpp | 2 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4knetworkoptions.cpp | 2 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4ksambaoptions.cpp | 4 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4kshareoptions.cpp | 2 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4ksuperuseroptions.cpp | 2 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4kuserinterfaceoptions.cpp | 2 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4tdeconfigdialog.cpp | 4 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4tdersyncoptions.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index ac9c918..6a25740 100644 --- a/smb4k/configdlg/smb4kauthoptions.cpp +++ b/smb4k/configdlg/smb4kauthoptions.cpp @@ -33,7 +33,7 @@ #include <tqwhatsthis.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> // application specific includes diff --git a/smb4k/configdlg/smb4knetworkoptions.cpp b/smb4k/configdlg/smb4knetworkoptions.cpp index eab4640..18de2fc 100644 --- a/smb4k/configdlg/smb4knetworkoptions.cpp +++ b/smb4k/configdlg/smb4knetworkoptions.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kcombobox.h> diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index 73cef83..79ef628 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -34,7 +34,7 @@ #include <tqmap.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <knuminput.h> #include <kcombobox.h> @@ -48,7 +48,7 @@ // application specific includes #include "smb4ksambaoptions.h" -#include "../core/smb4kglobal.h" +#include "../core/smb4tdeglobal.h" #include "../core/smb4ksettings.h" using namespace Smb4TDEGlobal; diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp index 6627b51..26f8b28 100644 --- a/smb4k/configdlg/smb4kshareoptions.cpp +++ b/smb4k/configdlg/smb4kshareoptions.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <kurlrequester.h> #include <knuminput.h> diff --git a/smb4k/configdlg/smb4ksuperuseroptions.cpp b/smb4k/configdlg/smb4ksuperuseroptions.cpp index a3e422e..924a8c0 100644 --- a/smb4k/configdlg/smb4ksuperuseroptions.cpp +++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp @@ -33,7 +33,7 @@ #include <tqcheckbox.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kguiitem.h> diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp index 5f7f465..11226a1 100644 --- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp +++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp @@ -31,7 +31,7 @@ #include <tqradiobutton.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> // application specific includes #include "smb4kuserinterfaceoptions.h" diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp index cb3f3bf..d61dec4 100644 --- a/smb4k/configdlg/smb4tdeconfigdialog.cpp +++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp @@ -31,7 +31,7 @@ #include <tdelistview.h> #include <klineedit.h> #include <kpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequester.h> // system specific includes @@ -48,7 +48,7 @@ #include "smb4ksambaoptions.h" #include "smb4tdersyncoptions.h" #include "../core/smb4ksettings.h" -#include "../core/smb4kglobal.h" +#include "../core/smb4tdeglobal.h" #include "../core/smb4ksambaoptionsinfo.h" #include "../core/smb4ksambaoptionshandler.h" #include "../core/smb4kcore.h" diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp index 2fbbe8a..a34bf8b 100644 --- a/smb4k/configdlg/smb4tdersyncoptions.cpp +++ b/smb4k/configdlg/smb4tdersyncoptions.cpp @@ -31,7 +31,7 @@ #include <tqradiobutton.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <klineedit.h> #include <knuminput.h> |