diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:58 -0600 |
| commit | 281d226f744d70a826a3bffff1ee964ef5915d4f (patch) | |
| tree | c42d5ae7840ea2a74f5f6c1b1a958569a8d2bf27 /libk3b/plugin | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/plugin')
| -rw-r--r-- | libk3b/plugin/k3baudioserver.cpp | 4 | ||||
| -rw-r--r-- | libk3b/plugin/k3bpluginfactory.h | 4 | ||||
| -rw-r--r-- | libk3b/plugin/k3bpluginmanager.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index 353a3f1..8578551 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <k3bthread.h> diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index ab415fa..dde5e9f 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -19,8 +19,8 @@ #include <klibloader.h> #include <kinstance.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> /** * Template based on KGenericFactory. This is just here to avoid using the TQStringList args parameter diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index 2e3724d..a461f51 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -20,11 +20,11 @@ #include <kdebug.h> #include <ksimpleconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klibloader.h> #include <tqptrlist.h> |