diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 22:00:04 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 22:00:04 -0600 |
commit | 783715b853042d24841e3e888051f3a184e78a40 (patch) | |
tree | 33ce107e439bb622368ba17b8a2a6485ef28e3b5 /superkaramba | |
parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba')
-rw-r--r-- | superkaramba/src/imagelabel.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/karamba.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/karambaapp.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/kwidgetlistbox.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/main.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/misc_python.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/systemtray.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/taskbartest.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/taskmanager.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/taskmanager.h | 2 | ||||
-rw-r--r-- | superkaramba/src/themefile.cpp | 4 | ||||
-rw-r--r-- | superkaramba/src/themelocale.cpp | 6 | ||||
-rw-r--r-- | superkaramba/src/themesdlg.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/themewidget.cpp | 2 |
14 files changed, 22 insertions, 22 deletions
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index 91638b6..514e7f8 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -27,7 +27,7 @@ #include <kpixmapeffect.h> #include <kdebug.h> #include <kimageeffect.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/job.h> #include "karambaapp.h" #include "imagelabel.h" diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index e4116f1..316d0f4 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -32,9 +32,9 @@ #include "superkarambasettings.h" #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <tdeversion.h> #include <kdirwatch.h> diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index 3f751d8..d567eb7 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -14,8 +14,8 @@ #include <tdefiledialog.h> #include <tdecmdlineargs.h> #include <fcntl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <khelpmenu.h> diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index 0193926..1811f38 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "kwidgetlistbox.h" #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) : TQTable(parent, name) diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index e29b3c3..ec9e686 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdemainwindow.h> #include <tqfileinfo.h> diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index 3dc5213..e4a6fa4 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -31,8 +31,8 @@ #include <tqglobal.h> #include <tqobject.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "kdebug.h" #include "karamba.h" diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index fbe220d..ab539cd 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -21,9 +21,9 @@ #include <tqobject.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <twinmodule.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <twin.h> diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp index c385042..22f60d7 100644 --- a/superkaramba/src/taskbartest.cpp +++ b/superkaramba/src/taskbartest.cpp @@ -24,7 +24,7 @@ #include <tdefiledialog.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tqfileinfo.h> diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 4e3afb2..48cef86 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <kiconloader.h> diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index 6740f54..ceb62ff 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopobject.h> #include <twin.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include "karambaapp.h" class TaskManager; diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index 4e3258b..04020a6 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -28,9 +28,9 @@ #include <kurl.h> #include <kzip.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tqtextstream.h> #include <tqfileinfo.h> diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index 7d9490a..f451eaf 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -1,5 +1,5 @@ /* - * languageList from klocale.cpp + * languageList from tdelocale.cpp * Copyright (c) 1997,2001 Stephan Kulow <[email protected]> * Copyright (c) 1999 Preston Brown <[email protected]> * Copyright (c) 1999-2002 Hans Petter Bieker <[email protected]> @@ -31,8 +31,8 @@ #include "themefile.h" #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqbuffer.h> #include <tqglobal.h> #include <tqiodevice.h> diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index 107d2c5..d24fa8b 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -41,7 +41,7 @@ #include <kstandarddirs.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <tqtable.h> #include <tqdir.h> diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index cad020c..a0acbde 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -21,7 +21,7 @@ #include "themelocale.h" #include <kpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> |