diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:14 -0600 |
| commit | c1ef0b3a195d4a550caa3bd4b00b034ac9d634ef (patch) | |
| tree | 60d6a6e98fda48f18f32c296523c927af10d9257 | |
| parent | 114bf522e0797aa7b9b07290a1bc285cbcbfc36f (diff) | |
| download | libkipi-c1ef0b3a195d4a550caa3bd4b00b034ac9d634ef.tar.gz libkipi-c1ef0b3a195d4a550caa3bd4b00b034ac9d634ef.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | libkipi/libkipi/batchprogressdialog.cpp | 4 | ||||
| -rw-r--r-- | libkipi/libkipi/imagecollectionselector.cpp | 2 | ||||
| -rw-r--r-- | libkipi/libkipi/imagedialog.cpp | 4 | ||||
| -rw-r--r-- | libkipi/libkipi/plugin.cpp | 2 | ||||
| -rw-r--r-- | libkipi/libkipi/plugin.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp index 218bd45..2a506eb 100644 --- a/libkipi/libkipi/batchprogressdialog.cpp +++ b/libkipi/libkipi/batchprogressdialog.cpp @@ -50,13 +50,13 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <kstandarddirs.h> #include <kapplication.h> #include <kaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> // Include files for libKipi. diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp index 7b3f3ad..470cd1e 100644 --- a/libkipi/libkipi/imagecollectionselector.cpp +++ b/libkipi/libkipi/imagecollectionselector.cpp @@ -33,7 +33,7 @@ #include <kbuttonbox.h> #include <kdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kglobal.h> #include <tdeio/previewjob.h> diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp index aeec94b..0f3b37d 100644 --- a/libkipi/libkipi/imagedialog.cpp +++ b/libkipi/libkipi/imagedialog.cpp @@ -33,7 +33,7 @@ // KDE includes. #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kstandarddirs.h> #include <tdeio/previewjob.h> @@ -41,7 +41,7 @@ #include <kaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> // Include files for libKipi. diff --git a/libkipi/libkipi/plugin.cpp b/libkipi/libkipi/plugin.cpp index d3ed293..b96057d 100644 --- a/libkipi/libkipi/plugin.cpp +++ b/libkipi/libkipi/plugin.cpp @@ -26,7 +26,7 @@ // KDE includes. -#include <kaction.h> +#include <tdeaction.h> #include <kinstance.h> #include <kdebug.h> diff --git a/libkipi/libkipi/plugin.h b/libkipi/libkipi/plugin.h index 51a91f3..f10939a 100644 --- a/libkipi/libkipi/plugin.h +++ b/libkipi/libkipi/plugin.h @@ -29,7 +29,7 @@ // KDE includes. -#include <kaction.h> +#include <tdeaction.h> // Lib KIPI includes. |