diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:53 -0600 |
| commit | 545706afdcf29b8f584e78275452cca715e284db (patch) | |
| tree | fdbfaa34f2d633372ba4ab3e46d22cf10f38b40b /kjsembed/bindings | |
| parent | 9d4971a2ffb5be9c6fc1b6d6bc74020c37fb2169 (diff) | |
| download | tdebindings-545706afdcf29b8f584e78275452cca715e284db.tar.gz tdebindings-545706afdcf29b8f584e78275452cca715e284db.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed/bindings')
| -rw-r--r-- | kjsembed/bindings/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/bindings/bindings.pro | 4 | ||||
| -rw-r--r-- | kjsembed/bindings/dcop_imp.cpp | 2 | ||||
| -rw-r--r-- | kjsembed/bindings/netaccess_imp.cpp | 2 | ||||
| -rw-r--r-- | kjsembed/bindings/tdeconfig_imp.cpp (renamed from kjsembed/bindings/kconfig_imp.cpp) | 6 | ||||
| -rw-r--r-- | kjsembed/bindings/tdeconfig_imp.h (renamed from kjsembed/bindings/kconfig_imp.h) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index cc7cac22..1aa5ce49 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -9,7 +9,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \ painter_imp.cpp \ pixmap_imp.cpp \ netaccess_imp.cpp \ - kconfig_imp.cpp \ + tdeconfig_imp.cpp \ bindingobject.cpp \ movie_imp.cpp \ sql_imp.cpp \ diff --git a/kjsembed/bindings/bindings.pro b/kjsembed/bindings/bindings.pro index d83d3ba5..6cb7b23d 100644 --- a/kjsembed/bindings/bindings.pro +++ b/kjsembed/bindings/bindings.pro @@ -15,7 +15,7 @@ HEADERS += bindingobject.h \ pen_imp.h \ pixmap_imp.h \ sql_imp.h \ - kconfig_imp.h \ + tdeconfig_imp.h \ point_imp.h \ rect_imp.h \ size_imp.h @@ -29,7 +29,7 @@ SOURCES += bindingobject.cpp \ pen_imp.cpp \ pixmap_imp.cpp \ sql_imp.cpp \ - kconfig_imp.cpp \ + tdeconfig_imp.cpp \ point_imp.cpp \ rect_imp.cpp \ size_imp.cpp diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index 9dfaf4be..27c4ad22 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -605,7 +605,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQDataStream arg(data, IO_WriteOnly); arg << appName << args; - if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(), data, replyType, replyData) ) + if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) { kdWarning() << "Error: Dcop call failed" << endl; } diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index 0ffbc12c..91dcf708 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -21,7 +21,7 @@ */ #include "netaccess_imp.h" -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kpropertiesdialog.h> #include <kurl.h> diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/tdeconfig_imp.cpp index 73ca58ed..e4fe3211 100644 --- a/kjsembed/bindings/kconfig_imp.cpp +++ b/kjsembed/bindings/tdeconfig_imp.cpp @@ -17,15 +17,15 @@ * Boston, MA 02110-1301, USA. */ -#include "kconfig_imp.h" +#include "tdeconfig_imp.h" #include <kjsembed/global.h> #ifndef QT_ONLY -#include <kconfig.h> +#include <tdeconfig.h> #include <kstddirs.h> #include <kapplication.h> -#include "kconfig_imp.moc" +#include "tdeconfig_imp.moc" #else #include <tqsettings.h> #endif diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h index 75bf3bfd..75bf3bfd 100644 --- a/kjsembed/bindings/kconfig_imp.h +++ b/kjsembed/bindings/tdeconfig_imp.h |