diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:45:52 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:45:52 -0600 |
commit | be149882a766126c07b7f109d8f732c2e6c87fd6 (patch) | |
tree | d1794e67029135eccdaf0a1c28bec0fee909aaf2 | |
parent | 0fd2941274b59792cf574433cdf35ae17a85c48a (diff) | |
download | kdirstat-be149882a766126c07b7f109d8f732c2e6c87fd6.tar.gz kdirstat-be149882a766126c07b7f109d8f732c2e6c87fd6.zip |
Rename additional header files to avoid conflicts with KDE4
-rw-r--r-- | kdirstat/kcleanup.cpp | 6 | ||||
-rw-r--r-- | kdirstat/kcleanupcollection.cpp | 2 | ||||
-rw-r--r-- | kdirstat/kdirstatapp.cpp | 6 | ||||
-rw-r--r-- | kdirstat/kdirstatfeedback.cpp | 2 | ||||
-rw-r--r-- | kdirstat/kdirstatmain.cpp | 2 | ||||
-rw-r--r-- | kdirstat/kdirstatsettings.cpp | 4 | ||||
-rw-r--r-- | kdirstat/kdirtree.cpp | 2 | ||||
-rw-r--r-- | kdirstat/kdirtreeview.cpp | 6 | ||||
-rw-r--r-- | kdirstat/kfeedback.cpp | 4 | ||||
-rw-r--r-- | kdirstat/kstdcleanup.cpp | 2 | ||||
-rw-r--r-- | kdirstat/ktreemaptile.cpp | 4 | ||||
-rw-r--r-- | kdirstat/ktreemapview.cpp | 4 |
12 files changed, 22 insertions, 22 deletions
diff --git a/kdirstat/kcleanup.cpp b/kdirstat/kcleanup.cpp index 831b628..64cf1ad 100644 --- a/kdirstat/kcleanup.cpp +++ b/kdirstat/kcleanup.cpp @@ -15,9 +15,9 @@ #include <kapp.h> #include <kprocess.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include "kcleanup.h" #include "kdirsaver.h" diff --git a/kdirstat/kcleanupcollection.cpp b/kdirstat/kcleanupcollection.cpp index 146dfe6..3a58c79 100644 --- a/kdirstat/kcleanupcollection.cpp +++ b/kdirstat/kcleanupcollection.cpp @@ -8,7 +8,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "kcleanup.h" #include "kstdcleanup.h" #include "kcleanupcollection.h" diff --git a/kdirstat/kdirstatapp.cpp b/kdirstat/kdirstatapp.cpp index 501b20d..5d8c817 100644 --- a/kdirstat/kdirstatapp.cpp +++ b/kdirstat/kdirstatapp.cpp @@ -20,9 +20,9 @@ #include <tdeconfig.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <krun.h> #include <kstatusbar.h> #include <kstdaction.h> diff --git a/kdirstat/kdirstatfeedback.cpp b/kdirstat/kdirstatfeedback.cpp index 3e2b2e1..fc77184 100644 --- a/kdirstat/kdirstatfeedback.cpp +++ b/kdirstat/kdirstatfeedback.cpp @@ -9,7 +9,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "kdirstatapp.h" #include "kfeedback.h" diff --git a/kdirstat/kdirstatmain.cpp b/kdirstat/kdirstatmain.cpp index 930f06b..b6d54e7 100644 --- a/kdirstat/kdirstatmain.cpp +++ b/kdirstat/kdirstatmain.cpp @@ -12,7 +12,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "kdirstatapp.h" diff --git a/kdirstat/kdirstatsettings.cpp b/kdirstat/kdirstatsettings.cpp index c30c6b6..b806d5b 100644 --- a/kdirstat/kdirstatsettings.cpp +++ b/kdirstat/kdirstatsettings.cpp @@ -21,8 +21,8 @@ #include <tqspinbox.h> #include <kcolorbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kdirtreeview.h" #include "ktreemapview.h" diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp index 82f7df6..ae8cf14 100644 --- a/kdirstat/kdirtree.cpp +++ b/kdirstat/kdirtree.cpp @@ -13,7 +13,7 @@ #include <sys/errno.h> #include <tqtimer.h> #include <kapp.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "kdirtree.h" #include "kdirtreeiterators.h" diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp index fa4dd51..447bebd 100644 --- a/kdirstat/kdirtreeview.cpp +++ b/kdirstat/kdirtreeview.cpp @@ -17,9 +17,9 @@ #include <tqpopupmenu.h> #include <kapp.h> -#include <klocale.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kicontheme.h> #include <kiconloader.h> diff --git a/kdirstat/kfeedback.cpp b/kdirstat/kfeedback.cpp index 294d35c..c3b0e1d 100644 --- a/kdirstat/kfeedback.cpp +++ b/kdirstat/kfeedback.cpp @@ -15,9 +15,9 @@ #include <tqmultilineedit.h> #include <tqhbox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kapp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaboutdata.h> #include <kiconloader.h> diff --git a/kdirstat/kstdcleanup.cpp b/kdirstat/kstdcleanup.cpp index df21802..9898410 100644 --- a/kdirstat/kstdcleanup.cpp +++ b/kdirstat/kstdcleanup.cpp @@ -8,7 +8,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "kcleanup.h" #include "kstdcleanup.h" diff --git a/kdirstat/ktreemaptile.cpp b/kdirstat/ktreemaptile.cpp index 6efed77..21d363c 100644 --- a/kdirstat/ktreemaptile.cpp +++ b/kdirstat/ktreemaptile.cpp @@ -12,8 +12,8 @@ #include <algorithm> #include <kapp.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tqimage.h> #include <tqpainter.h> diff --git a/kdirstat/ktreemapview.cpp b/kdirstat/ktreemapview.cpp index 473422a..b90181a 100644 --- a/kdirstat/ktreemapview.cpp +++ b/kdirstat/ktreemapview.cpp @@ -15,8 +15,8 @@ #include <kapp.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "kdirtree.h" #include "ktreemapview.h" |