diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:04 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:04 -0600 |
commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
tree | a0d01a91644fd94aa6da5d8944e052b67461faad /interfaces | |
parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'interfaces')
-rw-r--r-- | interfaces/tdescript/scriptloader.cpp | 2 | ||||
-rw-r--r-- | interfaces/tdescript/scriptloader.h | 4 | ||||
-rw-r--r-- | interfaces/tdetexteditor/CMakeLists.txt | 8 | ||||
-rw-r--r-- | interfaces/tdetexteditor/Makefile.am | 8 | ||||
-rw-r--r-- | interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp | 4 | ||||
-rw-r--r-- | interfaces/tdetexteditor/bloctdeselectiondcopinterface.h | 4 | ||||
-rw-r--r-- | interfaces/tdetexteditor/bloctdeselectioninterface.cpp | 4 | ||||
-rw-r--r-- | interfaces/tdetexteditor/bloctdeselectioninterface.h | 6 | ||||
-rw-r--r-- | interfaces/tdetexteditor/tdetexteditor.cpp | 2 | ||||
-rw-r--r-- | interfaces/terminal/test/main.cc | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index a11032ada..65b6604b5 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -26,7 +26,7 @@ #include <tdeconfig.h> #include <kdesktopfile.h> #include <kstandarsdirs.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kdebug.h> #include <tqdir.h> diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h index d0b338822..7fa4fa93f 100644 --- a/interfaces/tdescript/scriptloader.h +++ b/interfaces/tdescript/scriptloader.h @@ -19,8 +19,8 @@ #ifndef _script_loader_h #define _script_loader_h #include <tqptrlist.h> -#include <kmainwindow.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaction.h> #include <tdescript/scriptinterface.h> /** diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt index 0808a84f3..5ed7edeca 100644 --- a/interfaces/tdetexteditor/CMakeLists.txt +++ b/interfaces/tdetexteditor/CMakeLists.txt @@ -37,7 +37,7 @@ install( FILES document.h view.h editor.h plugin.h editinterface.h undointerface.h selectioninterface.h cursorinterface.h clipboardinterface.h popupmenuinterface.h viewcursorinterface.h - searchinterface.h highlightinginterface.h blockselectioninterface.h + searchinterface.h highlightinginterface.h bloctdeselectioninterface.h codecompletioninterface.h configinterface.h markinterface.h printinterface.h wordwrapinterface.h dynwordwrapinterface.h markinterfaceextension.h configinterfaceextension.h @@ -69,7 +69,7 @@ set( target tdetexteditor ) set( ${target}_SRCS tdetexteditor.cpp editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp - codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp + codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp printinterface.cpp highlightinginterface.cpp markinterface.cpp popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp @@ -78,8 +78,8 @@ set( ${target}_SRCS searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp - blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp - blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp + bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp + bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am index b535b39cc..7cba7d096 100644 --- a/interfaces/tdetexteditor/Makefile.am +++ b/interfaces/tdetexteditor/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdetexteditor.la libtdetexteditor_la_SOURCES = tdetexteditor.cpp \ editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \ - codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \ + codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \ configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \ printinterface.cpp highlightinginterface.cpp markinterface.cpp \ popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \ @@ -13,8 +13,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \ searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp \ configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \ viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp \ - blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\ - blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \ + bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\ + bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \ encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel \ undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp \ viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp \ @@ -29,7 +29,7 @@ tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface selectioninterface.h cursorinterface.h \ clipboardinterface.h popupmenuinterface.h \ viewcursorinterface.h searchinterface.h highlightinginterface.h \ - blockselectioninterface.h codecompletioninterface.h \ + bloctdeselectioninterface.h codecompletioninterface.h \ configinterface.h markinterface.h printinterface.h wordwrapinterface.h \ dynwordwrapinterface.h markinterfaceextension.h configinterfaceextension.h \ encodinginterface.h viewstatusmsginterface.h sessionconfiginterface.h editorchooser.h \ diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp index 34b7294b2..1648c3eb3 100644 --- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp +++ b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp @@ -1,5 +1,5 @@ -#include "blockselectiondcopinterface.h" -#include "blockselectioninterface.h" +#include "bloctdeselectiondcopinterface.h" +#include "bloctdeselectioninterface.h" #include <dcopclient.h> using namespace KTextEditor; diff --git a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h index 4b74fd2a0..3117ee163 100644 --- a/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h +++ b/interfaces/tdetexteditor/bloctdeselectiondcopinterface.h @@ -38,13 +38,13 @@ namespace KTextEditor /** * Returns the status of the selection mode - true indicates block selection mode is on. * If this is true, selections applied via the SelectionInterface are handled as - * blockselections and the paste functions of the ClipboardInterface works on + * bloctdeselections and the paste functions of the ClipboardInterface works on * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;) */ bool blockSelectionMode (); /** - * set blockselection mode to state "on" + * set bloctdeselection mode to state "on" */ bool setBlockSelectionMode (bool on) ; diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp b/interfaces/tdetexteditor/bloctdeselectioninterface.cpp index 6d562a43e..0a7068dba 100644 --- a/interfaces/tdetexteditor/bloctdeselectioninterface.cpp +++ b/interfaces/tdetexteditor/bloctdeselectioninterface.cpp @@ -18,8 +18,8 @@ // $Id$ -#include "blockselectioninterface.h" -#include "blockselectiondcopinterface.h" +#include "bloctdeselectioninterface.h" +#include "bloctdeselectiondcopinterface.h" #include "document.h" namespace KTextEditor diff --git a/interfaces/tdetexteditor/bloctdeselectioninterface.h b/interfaces/tdetexteditor/bloctdeselectioninterface.h index b2cd785eb..34ab553f9 100644 --- a/interfaces/tdetexteditor/bloctdeselectioninterface.h +++ b/interfaces/tdetexteditor/bloctdeselectioninterface.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __tdetexteditor_blockselectioninterface_h__ -#define __tdetexteditor_blockselectioninterface_h__ +#ifndef __tdetexteditor_bloctdeselectioninterface_h__ +#define __tdetexteditor_bloctdeselectioninterface_h__ #include <tdelibs_export.h> @@ -51,7 +51,7 @@ class KTEXTEDITOR_EXPORT BlockSelectionInterface /** * Returns the status of the selection mode - true indicates block selection mode is on. * If this is true, selections applied via the SelectionInterface are handled as - * blockselections and the paste functions of the ClipboardInterface works on + * bloctdeselections and the paste functions of the ClipboardInterface works on * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;) */ virtual bool blockSelectionMode () = 0; diff --git a/interfaces/tdetexteditor/tdetexteditor.cpp b/interfaces/tdetexteditor/tdetexteditor.cpp index 354361ed2..25726577b 100644 --- a/interfaces/tdetexteditor/tdetexteditor.cpp +++ b/interfaces/tdetexteditor/tdetexteditor.cpp @@ -24,7 +24,7 @@ #include "plugin.h" #include "editor.h" -#include <kaction.h> +#include <tdeaction.h> #include <tdeparts/factory.h> #include <tdeparts/componentfactory.h> diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc index 399b6451c..19b820056 100644 --- a/interfaces/terminal/test/main.cc +++ b/interfaces/terminal/test/main.cc @@ -2,7 +2,7 @@ #include <tdeparts/part.h> #include <ktrader.h> #include <klibloader.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <kapplication.h> |