diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /kmrml | |
parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmrml')
-rw-r--r-- | kmrml/kmrml/algorithmdialog.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/indexer.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/indextest.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.cpp | 6 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/mainpage.cpp | 6 | ||||
-rw-r--r-- | kmrml/kmrml/lib/kmrml_config.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/mrml.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/mrml_part.cpp | 8 | ||||
-rw-r--r-- | kmrml/kmrml/mrml_view.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/mrmlsearch.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/server/watcher.cpp | 4 |
11 files changed, 21 insertions, 21 deletions
diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp index 7756d432..f2a0a089 100644 --- a/kmrml/kmrml/algorithmdialog.cpp +++ b/kmrml/kmrml/algorithmdialog.cpp @@ -27,7 +27,7 @@ #include <tqvbox.h> #include <tqvgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KMrml; diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 2555ce6f..2392cfd5 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -20,8 +20,8 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kprocio.h> #include "indexer.h" diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp index ac254b2b..cc816c0b 100644 --- a/kmrml/kmrml/kcontrol/indextest.cpp +++ b/kmrml/kmrml/kcontrol/indextest.cpp @@ -4,7 +4,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> using namespace KMrmlConfig; diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 03aa2bb4..e055a8bf 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -23,9 +23,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index ee8fd88f..9ddd6bf9 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -26,10 +26,10 @@ #include <kcombobox.h> #include <kdialog.h> #include <keditlistbox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kprogress.h> #include <kurlrequester.h> diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index c37e0fec..912658fd 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index 19560cec..8c49f009 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -27,9 +27,9 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <mrml_utils.h> diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index ab2731d0..a35814cf 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -33,17 +33,17 @@ #include <tdeconfig.h> #include <kdatastream.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kprotocolinfo.h> #include <tdeparts/genericfactory.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <mrml_utils.h> diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index 6b7ed49c..07c4ac46 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -25,7 +25,7 @@ #include <kcursor.h> #include <kdatastream.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kmimetype.h> #include <kurl.h> diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp index 13efb411..9bdb85cf 100644 --- a/kmrml/kmrml/mrmlsearch.cpp +++ b/kmrml/kmrml/mrmlsearch.cpp @@ -33,7 +33,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <kurl.h> diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp index 8b524929..67f0c69a 100644 --- a/kmrml/kmrml/server/watcher.cpp +++ b/kmrml/kmrml/server/watcher.cpp @@ -21,8 +21,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "watcher.h" |