diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /konq-plugins/fsview | |
parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/fsview')
-rw-r--r-- | konq-plugins/fsview/fsview.cpp | 6 | ||||
-rw-r--r-- | konq-plugins/fsview/fsview_part.cpp | 6 | ||||
-rw-r--r-- | konq-plugins/fsview/inode.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/fsview/main.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/fsview/treemap.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index bda0446..8ad2ed0 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -28,9 +28,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kurl.h> diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 4f76c7c..bbfe98a 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -30,13 +30,13 @@ #include <tdeparts/genericfactory.h> #include <tdeapplication.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kprotocolinfo.h> #include <tdeio/job.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // from tdebase/libkonq... #include <konq_operations.h> diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 79e5326..b26917c 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -24,8 +24,8 @@ #include <kurl.h> #include <kmimetype.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "inode.h" #include "scan.h" diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index 9a112e6..1f6f268 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -7,8 +7,8 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include "fsview.h" diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index d0356ab..2f85060 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -29,7 +29,7 @@ #include <tqstyle.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> |