diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:28 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:28 -0600 |
commit | e382b58890c5ea7a734fe946b3220155091a184c (patch) | |
tree | b253f1ebc3697b433952d73df95c8671e33578c0 /katapult | |
parent | 1d9e8614a0c76018677c786694ba89c561f79b3e (diff) | |
download | katapult-e382b58890c5ea7a734fe946b3220155091a184c.tar.gz katapult-e382b58890c5ea7a734fe946b3220155091a184c.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'katapult')
-rw-r--r-- | katapult/common/imagedisplay.cpp | 2 | ||||
-rw-r--r-- | katapult/katapult/katapultconfigdlg.cpp | 2 | ||||
-rw-r--r-- | katapult/katapult/katapultsettings.cpp | 2 | ||||
-rw-r--r-- | katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h | 2 | ||||
-rw-r--r-- | katapult/plugins/catalogs/documentcatalog/document.cpp | 2 | ||||
-rw-r--r-- | katapult/plugins/catalogs/documentcatalog/document.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp index a1ba512..7ae95f7 100644 --- a/katapult/common/imagedisplay.cpp +++ b/katapult/common/imagedisplay.cpp @@ -26,7 +26,7 @@ #include <twin.h> #include <kimageeffect.h> #include <kgenericfactory.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kfontcombo.h> #include <klocale.h> diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index 99e4c68..0cffd2c 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include <kactionselector.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kcombobox.h> #include <klocale.h> diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index 522592c..7188c48 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeparts/componentfactory.h> #include <klocale.h> diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h index 0e2b527..888fb57 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h @@ -22,7 +22,7 @@ #include <katapultcatalog.h> #include <kgenericfactory.h> -#include <kconfigbase.h> +#include <tdeconfigbase.h> #include "song.h" class TQWidget; diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp index 3c0f703..ca89717 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.cpp +++ b/katapult/plugins/catalogs/documentcatalog/document.cpp @@ -21,7 +21,7 @@ #include <tqfileinfo.h> #include <kmimetype.h> #include <kiconloader.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include "document.h" diff --git a/katapult/plugins/catalogs/documentcatalog/document.h b/katapult/plugins/catalogs/documentcatalog/document.h index c46610f..b36661c 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.h +++ b/katapult/plugins/catalogs/documentcatalog/document.h @@ -21,7 +21,7 @@ #define DOCUMENT_H #include <katapultitem.h> -#include <kfileitem.h> +#include <tdefileitem.h> /** @author Joe Ferris |