diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:23 -0600 |
| commit | e7f6c396cd6f903a118447cd894ef63299d8a218 (patch) | |
| tree | 10991c53e84fc9d69880cc0769e60e499c73939e /katapult/katapult | |
| parent | 4dfec23a61d2218750724212722e8b850f79e83e (diff) | |
| download | katapult-e7f6c396cd6f903a118447cd894ef63299d8a218.tar.gz katapult-e7f6c396cd6f903a118447cd894ef63299d8a218.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'katapult/katapult')
| -rw-r--r-- | katapult/katapult/katapult.cpp | 4 | ||||
| -rw-r--r-- | katapult/katapult/katapultconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | katapult/katapult/katapultsettings.cpp | 2 | ||||
| -rw-r--r-- | katapult/katapult/main.cpp | 2 | ||||
| -rw-r--r-- | katapult/katapult/settings.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 1553573..6a14011 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -20,14 +20,14 @@ #include <kapp.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <kkeydialog.h> #include <tdeaction.h> #include <tdeparts/componentfactory.h> #include <kpassivepopup.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutapplication.h> #include <dcopclient.h> diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index 64e7e89..369971c 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <tdeapplication.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqframe.h> #include <tqlayout.h> diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index 0f41281..a3abe40 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeparts/componentfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/katapult/katapult/main.cpp b/katapult/katapult/main.cpp index 7d473ee..958e2c6 100644 --- a/katapult/katapult/main.cpp +++ b/katapult/katapult/main.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kapp.h> #include <dcopclient.h> diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp index 8f23bf5..002aee6 100644 --- a/katapult/katapult/settings.cpp +++ b/katapult/katapult/settings.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/doros/src/local/kde/katapult/katapult/settings.ui' ** |