diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
| commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
| tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /kexi/widget | |
| parent | 3fe437def8063926892bddf2dcc733861308836d (diff) | |
| download | koffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kexi/widget')
| -rw-r--r-- | kexi/widget/Makefile.am | 2 | ||||
| -rw-r--r-- | kexi/widget/kexieditor.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kexi/widget/Makefile.am b/kexi/widget/Makefile.am index 70c75203..9d4856fd 100644 --- a/kexi/widget/Makefile.am +++ b/kexi/widget/Makefile.am @@ -15,7 +15,7 @@ libkexiextendedwidgets_la_SOURCES = kexidataawareview.cpp \ kexiprjtypeselectorbase.ui kexiprjtypeselector.cpp libkexiextendedwidgets_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -lktexteditor +libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -ltdetexteditor SUBDIRS = utils tableview . relations diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 121ee8dd..05115b69 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -34,15 +34,15 @@ #ifdef KTEXTEDIT_BASED_SQL_EDITOR # include <ktextedit.h> #else -# include <ktexteditor/document.h> -# include <ktexteditor/view.h> -# include <ktexteditor/editorchooser.h> -# include <ktexteditor/editinterface.h> -# include <ktexteditor/viewcursorinterface.h> -# include <ktexteditor/popupmenuinterface.h> -# include <ktexteditor/undointerface.h> -# include <ktexteditor/configinterface.h> -# include <ktexteditor/highlightinginterface.h> +# include <tdetexteditor/document.h> +# include <tdetexteditor/view.h> +# include <tdetexteditor/editorchooser.h> +# include <tdetexteditor/editinterface.h> +# include <tdetexteditor/viewcursorinterface.h> +# include <tdetexteditor/popupmenuinterface.h> +# include <tdetexteditor/undointerface.h> +# include <tdetexteditor/configinterface.h> +# include <tdetexteditor/highlightinginterface.h> #endif /** Used for the shared action framework to redirect shared actions like |