diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
commit | 82072ef281de2d5948a42fb69ae800d47e0800be (patch) | |
tree | be82dd63affaf693c5e0857c997fa9589d344cc2 /quanta/components | |
parent | 93ec82602aa008218cc1ee075ff13d65b3a317ea (diff) | |
download | tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.tar.gz tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'quanta/components')
-rw-r--r-- | quanta/components/csseditor/csseditor.cpp | 6 | ||||
-rw-r--r-- | quanta/components/csseditor/styleeditor.cpp | 4 | ||||
-rw-r--r-- | quanta/components/debugger/dbgp/Makefile.am | 2 | ||||
-rw-r--r-- | quanta/components/debugger/debuggerbreakpointlist.cpp | 2 | ||||
-rw-r--r-- | quanta/components/debugger/debuggermanager.cpp | 8 | ||||
-rw-r--r-- | quanta/components/debugger/debuggerui.cpp | 4 | ||||
-rw-r--r-- | quanta/components/debugger/debuggerui.h | 2 | ||||
-rw-r--r-- | quanta/components/debugger/gubed/Makefile.am | 2 | ||||
-rw-r--r-- | quanta/components/debugger/quantadebuggerinterface.cpp | 2 | ||||
-rw-r--r-- | quanta/components/framewizard/selectablearea.h | 4 | ||||
-rw-r--r-- | quanta/components/tableeditor/tableeditor.cpp | 6 |
11 files changed, 21 insertions, 21 deletions
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index e548d7d9..d3586f57 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -26,13 +26,13 @@ #include <kapplication.h> #include <klocale.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kstandarddirs.h> #include <klineedit.h> #include <kdebug.h> #include <kconfig.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include "propertysetter.h" #include "qmyhighlighter.h" diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index c62cc7a7..e39e5564 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -25,8 +25,8 @@ #include <klocale.h> #include <kpushbutton.h> #include <kurl.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/viewcursorinterface.h> //app includes #include "parser.h" diff --git a/quanta/components/debugger/dbgp/Makefile.am b/quanta/components/debugger/dbgp/Makefile.am index da7bf880..cb1d9d0c 100644 --- a/quanta/components/debugger/dbgp/Makefile.am +++ b/quanta/components/debugger/dbgp/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = quantadebuggerdbgp.la quantadebuggerdbgp_la_SOURCES = quantadebuggerdbgp.cpp dbgpsettingss.ui \ dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp -quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor +quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor quantadebuggerdbgp_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggerdbgp.desktop diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp index 6a47d296..13bed5c9 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.cpp +++ b/quanta/components/debugger/debuggerbreakpointlist.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqobject.h> -#include <ktexteditor/markinterfaceextension.h> +#include <tdetexteditor/markinterfaceextension.h> #include <kdebug.h> #include "debuggerbreakpointlist.h" diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index fa8f9719..9583db91 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include <ktexteditor/document.h> -#include <ktexteditor/markinterfaceextension.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/markinterfaceextension.h> +#include <tdetexteditor/viewcursorinterface.h> #include <kdebug.h> #include <klocale.h> #include <kcombobox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kiconloader.h> #include <kmessagebox.h> #include <qextfileinfo.h> diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index fdf32a5c..faf844bc 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -22,8 +22,8 @@ #include <klocale.h> #include <kdebug.h> #include <tqstring.h> -#include <khtmlview.h> -#include <kmditoolviewaccessor.h> +#include <tdehtmlview.h> +#include <tdemditoolviewaccessor.h> #include <kstatusbar.h> #include "variableslistview.h" diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 568a933f..04db4e94 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -21,7 +21,7 @@ #include <tqobject.h> #include <tqptrlist.h> -#include <kmditoolviewaccessor.h> +#include <tdemditoolviewaccessor.h> #include "backtracelistview.h" class VariablesListView; diff --git a/quanta/components/debugger/gubed/Makefile.am b/quanta/components/debugger/gubed/Makefile.am index 9c2aebc0..e5c0c826 100644 --- a/quanta/components/debugger/gubed/Makefile.am +++ b/quanta/components/debugger/gubed/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = quantadebuggergubed.la quantadebuggergubed_la_SOURCES = gubedsettingss.ui quantadebuggergubed.cpp gubedsettings.cpp -quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor +quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor quantadebuggergubed_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggergubed.desktop diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index af70da0a..83f5ce0c 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <ktexteditor/document.h> +#include <tdetexteditor/document.h> #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 0fc95d8b..3eacaf4f 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -19,8 +19,8 @@ #define SELECTABLEAREA_H //#include <tqwidget.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> /**a TQTextBrowser that can be selected *@author gulmini luciano diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 45bcf07c..60eb455e 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -18,11 +18,11 @@ #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kpopupmenu.h> #include <kpushbutton.h> -#include <ktexteditor/document.h> -#include <ktexteditor/editinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/editinterface.h> //qt includes #include <tqcheckbox.h> |