diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:46 -0600 |
commit | ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8 (patch) | |
tree | ac4650a642d502c458d0b654c8b731739ce601dc /kimagemapeditor | |
parent | a32b928478b59d4fa8b8495bbad6864476c129b1 (diff) | |
download | tdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.tar.gz tdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kimagemapeditor')
-rw-r--r-- | kimagemapeditor/kimagemapeditor.cpp | 4 | ||||
-rw-r--r-- | kimagemapeditor/kimedialogs.cpp | 2 | ||||
-rw-r--r-- | kimagemapeditor/kimeshell.cpp | 2 | ||||
-rw-r--r-- | kimagemapeditor/qextfileinfo.cpp | 8 | ||||
-rw-r--r-- | kimagemapeditor/qextfileinfo.h | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index c4d698c5..199b757b 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -46,7 +46,7 @@ #include <kaccel.h> #include <kstdaction.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kapplication.h> #include <kkeydialog.h> @@ -57,7 +57,7 @@ #include <kstatusbar.h> #include <kxmlguifactory.h> #include <kdockwidget.h> -#include <kio/job.h> +#include <tdeio/job.h> #if KDE_IS_VERSION(3,1,90) #include <kinputdialog.h> #else diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 665984ea..59187ffc 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -34,7 +34,7 @@ //#include <tqwidget.h> // KDE #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kdebug.h> #include <kapplication.h> diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index cb7d9e21..3914ac50 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -21,7 +21,7 @@ #include <kaction.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kkeydialog.h> #include <kedittoolbar.h> diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 440e9c78..518dc79a 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -21,11 +21,11 @@ //kde includes #include <kurl.h> -#include <kio/job.h> -#include <kio/netaccess.h> -#include <kio/scheduler.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/scheduler.h> #include <kdirlister.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobal.h> #include <kdebug.h> diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h index b064bcd8..86dd2923 100644 --- a/kimagemapeditor/qextfileinfo.h +++ b/kimagemapeditor/qextfileinfo.h @@ -12,10 +12,10 @@ #ifndef _TQEXTFILEINFO_H_ #define _TQEXTFILEINFO_H_ -#include <kio/global.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/job.h> #include <kurl.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqobject.h> #include <tqptrlist.h> |