diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:59 -0600 |
| commit | 1515a4f2eb9cf023ed7f9c2e10106b5e93164a08 (patch) | |
| tree | d5617734090b254659ff331ce7d1e574c4807caf /kbabel/commonui | |
| parent | f8069e2ea048f2657cc417d83820576ec55c181b (diff) | |
| download | tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.tar.gz tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/commonui')
| -rw-r--r-- | kbabel/commonui/Makefile.am | 2 | ||||
| -rw-r--r-- | kbabel/commonui/context.cpp | 8 | ||||
| -rw-r--r-- | kbabel/commonui/context.h | 4 | ||||
| -rw-r--r-- | kbabel/commonui/finddialog.cpp | 2 | ||||
| -rw-r--r-- | kbabel/commonui/projectprefwidgets.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kbabel/commonui/Makefile.am b/kbabel/commonui/Makefile.am index e0ca94ce..65fd166b 100644 --- a/kbabel/commonui/Makefile.am +++ b/kbabel/commonui/Makefile.am @@ -19,7 +19,7 @@ libkbabelcommonui_la_SOURCES = klisteditor.ui context.cpp kactionselector.cpp \ cmdedit.cpp \ diffpreferences.ui -libkbabelcommonui_la_LIBADD = $(LIB_KIO) -lktexteditor ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la +libkbabelcommonui_la_LIBADD = $(LIB_KIO) -ltdetexteditor ../common/libkbabelcommon.la ../kbabeldict/libkbabeldict.la libkbabelcommonui_la_LDFLAGS = $(all_libraries) diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 6f4f16a7..cf79f4b1 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -57,10 +57,10 @@ #include <klibloader.h> #include <ktrader.h> -#include <ktexteditor/document.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/viewcursorinterface.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/viewcursorinterface.h> SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent) , m_parent( parent ) diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h index cb641c67..512bd741 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.h @@ -36,8 +36,8 @@ #include <tqvaluelist.h> #include <tqwidget.h> -#include <ktexteditor/document.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/view.h> #include <kbproject.h> diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 02a1b2c3..222fbea1 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -47,7 +47,7 @@ #include <kconfig.h> #include <kglobal.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> using namespace KBabel; diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index d9f7a051..d4785445 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -52,7 +52,7 @@ #include <kurlcompletion.h> #include <kfontdialog.h> #include <kcolorbutton.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> #include <ksconfig.h> #include <kurldrag.h> |