diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:37 -0600 |
| commit | 279764bab1514a051db18e14241e9bae62be14d6 (patch) | |
| tree | c587a443a0a228897e395535e2791dbde757bb3d /quanta/utility | |
| parent | ee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff) | |
| download | tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'quanta/utility')
| -rw-r--r-- | quanta/utility/newstuff.cpp | 6 | ||||
| -rw-r--r-- | quanta/utility/qpevents.cpp | 4 | ||||
| -rw-r--r-- | quanta/utility/quantabookmarks.cpp | 2 | ||||
| -rw-r--r-- | quanta/utility/quantacommon.cpp | 6 | ||||
| -rw-r--r-- | quanta/utility/quantanetaccess.cpp | 4 | ||||
| -rw-r--r-- | quanta/utility/tagaction.cpp | 6 | ||||
| -rw-r--r-- | quanta/utility/tagactionmanager.cpp | 2 | ||||
| -rw-r--r-- | quanta/utility/tagactionset.cpp | 2 | ||||
| -rw-r--r-- | quanta/utility/toolbartabwidget.cpp | 6 |
9 files changed, 19 insertions, 19 deletions
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index 96c18bbe..f818571d 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -16,9 +16,9 @@ #include <tqfileinfo.h> //kde includes -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <ktar.h> diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index 0482a84a..8a8dfa26 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -22,8 +22,8 @@ //kde includes #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> //app includes #include "qpevents.h" diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index ba312f80..37151a85 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kdebug.h> #include <tdepopupmenu.h> diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index 9ebabe86..84679f0d 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -33,13 +33,13 @@ #include <kdirwatch.h> #include <kmimetype.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprotocolinfo.h> #include <kprogress.h> #include <ktempdir.h> -#include <ktempfile.h> +#include <tdetempfile.h> //remove the below ones when KTQPasteAction is removed #include <dcopclient.h> diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index eb47cb86..56046601 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -19,8 +19,8 @@ #include <tdeio/netaccess.h> #include <kurl.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdefileitem.h> #include <kstringhandler.h> diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 903f353a..1ea54048 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -30,11 +30,11 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kprocess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeshortcut.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdetexteditor/document.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/editinterface.h> diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index 2fda25f7..542b5064 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -19,7 +19,7 @@ #include <tdeactioncollection.h> #include <tdeaction.h> #include <tdehtmlview.h> -#include <klocale.h> +#include <tdelocale.h> #include <dom/dom_node.h> #include <tqwidget.h> diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 87d88d46..18d4c419 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -21,7 +21,7 @@ #include <tdeactionclasses.h> #include <dom/dom_node.h> #include <dom/dom_string.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqwidget.h> diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 5f95cdc6..26765eee 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -27,13 +27,13 @@ #include <tdeaccelmanager.h> #include <tdeversion.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> //app includes #include "toolbartabwidget.h" |