diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:00 -0600 |
| commit | 2d84c9d3ad0aaea0620658024537d54e6a7939f4 (patch) | |
| tree | 35675532f42e78dbfcd56c6b344e1f0e79013a2e /xparts/mozilla | |
| parent | 980972d200e109a643e5a10037d7f9fcf02382ed (diff) | |
| download | tdebindings-2d84c9d3ad0aaea0620658024537d54e6a7939f4.tar.gz tdebindings-2d84c9d3ad0aaea0620658024537d54e6a7939f4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'xparts/mozilla')
| -rw-r--r-- | xparts/mozilla/Makefile.am | 2 | ||||
| -rw-r--r-- | xparts/mozilla/kmozilla.rc | 2 | ||||
| -rw-r--r-- | xparts/mozilla/kmozillapart.cpp | 4 | ||||
| -rw-r--r-- | xparts/mozilla/kshell.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xparts/mozilla/Makefile.am b/xparts/mozilla/Makefile.am index ad5ed675..743ce97e 100644 --- a/xparts/mozilla/Makefile.am +++ b/xparts/mozilla/Makefile.am @@ -18,7 +18,7 @@ kmozilla_LDADD = ../src/gtk/libgtkxparts.la $(GTK2_LIBS) $(GLIB2_LIBS) kmozilla_LDFLAGS = $(MOZILLA_LDFLAGS) $(GLIB2_LDFLAGS) $(GTK2_LIBS) -L/usr/lib/mozilla -Wl,--rpath=/usr/lib/mozilla -lxul -lxpcom -lmozjs $(all_libraries) #kshell_SOURCES = kshell.cpp -#kshell_LDADD = $(top_builddir)/xkparts/kde/libkdexparts.la +#kshell_LDADD = $(top_builddir)/xtdeparts/kde/libkdexparts.la #kshell_LDFLAGS = $(all_libraries) METASOURCES = AUTO diff --git a/xparts/mozilla/kmozilla.rc b/xparts/mozilla/kmozilla.rc index 9c80e6c3..e0441a85 100644 --- a/xparts/mozilla/kmozilla.rc +++ b/xparts/mozilla/kmozilla.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="khtmlpart" version="1"> +<kpartgui name="tdehtmlpart" version="1"> <MenuBar> <Menu name="edit"> <Action name="stop" /> diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp index f083d779..625de5ad 100644 --- a/xparts/mozilla/kmozillapart.cpp +++ b/xparts/mozilla/kmozillapart.cpp @@ -7,10 +7,10 @@ #include <kaction.h> #include <kmainwindow.h> #include <kprocess.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kdebug.h> #include <kaboutdata.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> typedef KParts::GenericFactory<KMozillaPart> KMozillaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkmozillapart, KMozillaPartFactory ); diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index 9e83f9a4..b6935b47 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -8,7 +8,7 @@ #include <kaction.h> #include <kmainwindow.h> #include <kprocess.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kdebug.h> class ShellWindow : public KParts::MainWindow @@ -62,7 +62,7 @@ private: int main( int argc, char **argv ) { - TDEApplication app( argc, argv, "xkpartsshell" ); + TDEApplication app( argc, argv, "xtdepartsshell" ); app.dcopClient()->registerAs("kshell"); |