diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:23:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:23:27 -0600 |
| commit | c46f36d00839916c8b6cde8ed2ca54aeb40dba19 (patch) | |
| tree | 990b3fd4f5a01a1a86b43d158686456eae2bdc44 /quanta/utility | |
| parent | 1e8f4c1ed6da13b851a7100e395d9243871c464d (diff) | |
| download | tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.tar.gz tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'quanta/utility')
| -rw-r--r-- | quanta/utility/quantabookmarks.cpp | 4 | ||||
| -rw-r--r-- | quanta/utility/quantacommon.cpp | 6 | ||||
| -rw-r--r-- | quanta/utility/tagaction.cpp | 2 | ||||
| -rw-r--r-- | quanta/utility/tagaction.h | 4 | ||||
| -rw-r--r-- | quanta/utility/tagactionmanager.cpp | 4 | ||||
| -rw-r--r-- | quanta/utility/tagactionset.cpp | 4 | ||||
| -rw-r--r-- | quanta/utility/toolbartabwidget.cpp | 10 |
7 files changed, 17 insertions, 17 deletions
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 09529616..873c2843 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -23,9 +23,9 @@ #include <kapplication.h> #include <tdeconfig.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdetexteditor/markinterface.h> #include <tdetexteditor/editinterface.h> diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index db1ce345..5235d5ce 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -44,9 +44,9 @@ //remove the below ones when KTQPasteAction is removed #include <dcopclient.h> #include <kdebug.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <kstringhandler.h> #include <tqwhatsthis.h> #include <tqtimer.h> diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index c4c3b870..1c06b9c1 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -32,7 +32,7 @@ #include <kprocess.h> #include <klocale.h> #include <kmessagebox.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kstandarddirs.h> #include <ktempfile.h> #include <tdetexteditor/document.h> diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index 84e01465..97111a36 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -19,8 +19,8 @@ #define TAGACTION_H #include <tdeversion.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <tqstring.h> #include <tqdom.h> diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index 63df0010..2fda25f7 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include <kstaticdeleter.h> -#include <kactioncollection.h> -#include <kaction.h> +#include <tdeactioncollection.h> +#include <tdeaction.h> #include <tdehtmlview.h> #include <klocale.h> #include <dom/dom_node.h> diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 31f246ec..71a737aa 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -17,8 +17,8 @@ #include <kapplication.h> #include <tdeconfig.h> -#include <kactioncollection.h> -#include <kactionclasses.h> +#include <tdeactioncollection.h> +#include <tdeactionclasses.h> #include <dom/dom_node.h> #include <dom/dom_string.h> #include <klocale.h> diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 6d715d64..5f95cdc6 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -23,15 +23,15 @@ #include <tqfontmetrics.h> //kde includes -#include <kaction.h> -#include <kaccelmanager.h> +#include <tdeaction.h> +#include <tdeaccelmanager.h> #include <tdeversion.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <kdebug.h> #include <kglobalsettings.h> |