diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:50:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:50:28 -0600 |
| commit | 6592a47e5dd48c7b5c506c3bde0dce57fe858298 (patch) | |
| tree | 7f6eaf648b3ca743de3f6220c7f2b29d40480144 /plugins/webinterface | |
| parent | 409b87cbe23e2f18e7a73a81ce958aa0fdd148e4 (diff) | |
| download | ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.tar.gz ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'plugins/webinterface')
| -rw-r--r-- | plugins/webinterface/httpserver.cpp | 4 | ||||
| -rw-r--r-- | plugins/webinterface/php_interface.cpp | 4 | ||||
| -rw-r--r-- | plugins/webinterface/webinterfaceplugin.cpp | 2 | ||||
| -rw-r--r-- | plugins/webinterface/webinterfaceprefpage.h | 4 | ||||
| -rw-r--r-- | plugins/webinterface/webinterfaceprefwidget.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp index 97aafae..24e847f 100644 --- a/plugins/webinterface/httpserver.cpp +++ b/plugins/webinterface/httpserver.cpp @@ -22,10 +22,10 @@ #include <tqdatetime.h> #include <tdeapplication.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kmdcodec.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfileinfo.h> #include <tqsocket.h> diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp index a4f5f6a..eb42684 100644 --- a/plugins/webinterface/php_interface.cpp +++ b/plugins/webinterface/php_interface.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include <tdeio/global.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <net/socketmonitor.h> #include <torrent/choker.h> diff --git a/plugins/webinterface/webinterfaceplugin.cpp b/plugins/webinterface/webinterfaceplugin.cpp index 32cc164..fb47d03 100644 --- a/plugins/webinterface/webinterfaceplugin.cpp +++ b/plugins/webinterface/webinterfaceplugin.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <util/log.h> #include <interfaces/coreinterface.h> diff --git a/plugins/webinterface/webinterfaceprefpage.h b/plugins/webinterface/webinterfaceprefpage.h index 9bf606e..f05c723 100644 --- a/plugins/webinterface/webinterfaceprefpage.h +++ b/plugins/webinterface/webinterfaceprefpage.h @@ -23,8 +23,8 @@ #include <interfaces/prefpageinterface.h> #include "webinterfaceprefwidget.h" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> namespace kt { diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/plugins/webinterface/webinterfaceprefwidget.cpp index 1e30a08..c1e19f4 100644 --- a/plugins/webinterface/webinterfaceprefwidget.cpp +++ b/plugins/webinterface/webinterfaceprefwidget.cpp @@ -21,8 +21,8 @@ #include "webinterfaceprefwidget.h" #include "webinterfacepluginsettings.h" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kstandarddirs.h> |