summaryrefslogtreecommitdiffstats
path: root/dcoppython
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-01-08 20:06:00 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-01-08 20:06:00 +0100
commit636f509299122d02087c6fd62e1e4a46dbd22026 (patch)
tree70e43efceeb5b00e7f19cdac8da44928bd2fb459 /dcoppython
parent719b61750c08343f530068ed4127623aeac71cf0 (diff)
downloadtdebindings-636f509299122d02087c6fd62e1e4a46dbd22026.tar.gz
tdebindings-636f509299122d02087c6fd62e1e4a46dbd22026.zip
Rename many classes to avoid conflicts with KDE
Diffstat (limited to 'dcoppython')
-rw-r--r--dcoppython/test/dcopserver/Makefile.am20
-rw-r--r--dcoppython/test/dcopserver/gen.py2
-rw-r--r--dcoppython/test/dcopserver/main.cpp4
-rw-r--r--dcoppython/test/dcopserver/mainclass.h2
-rw-r--r--dcoppython/test/dcopserver/tdedcoptest.cpp (renamed from dcoppython/test/dcopserver/kdedcoptest.cpp)6
-rw-r--r--dcoppython/test/dcopserver/tdedcoptest.desktop (renamed from dcoppython/test/dcopserver/kdedcoptest.desktop)4
-rw-r--r--dcoppython/test/dcopserver/tdedcoptest.h (renamed from dcoppython/test/dcopserver/kdedcoptest.h)0
-rw-r--r--dcoppython/test/dcopserver/tdedcoptestui.rc (renamed from dcoppython/test/dcopserver/kdedcoptestui.rc)2
8 files changed, 20 insertions, 20 deletions
diff --git a/dcoppython/test/dcopserver/Makefile.am b/dcoppython/test/dcopserver/Makefile.am
index 94a1c857..02c11238 100644
--- a/dcoppython/test/dcopserver/Makefile.am
+++ b/dcoppython/test/dcopserver/Makefile.am
@@ -2,35 +2,35 @@
INCLUDES = $(all_includes)
# these are the headers for your project
-noinst_HEADERS = kdedcoptest.h
+noinst_HEADERS = tdedcoptest.h
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kdedcoptest.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdedcoptest.pot
-KDE_ICON = kdedcoptest
+KDE_ICON = tdedcoptest
#########################################################################
# APPLICATION SECTION
#########################################################################
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
-bin_PROGRAMS = kdedcoptest
+bin_PROGRAMS = tdedcoptest
# the application source, library search path, and link libraries
-kdedcoptest_SOURCES = main.cpp kdedcoptest.cpp kdedcoptest_iface.skel mainclass.cpp
-kdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kdedcoptest_LDADD = $(LIB_TDEUI)
+tdedcoptest_SOURCES = main.cpp tdedcoptest.cpp tdedcoptest_iface.skel mainclass.cpp
+tdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdedcoptest_LDADD = $(LIB_TDEUI)
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
-shelldesktop_DATA = kdedcoptest.desktop
+shelldesktop_DATA = tdedcoptest.desktop
# this is where the shell's XML-GUI resource file goes
-shellrcdir = $(kde_datadir)/kdedcoptest
-shellrc_DATA = kdedcoptestui.rc
+shellrcdir = $(kde_datadir)/tdedcoptest
+shellrc_DATA = tdedcoptestui.rc
h_inc.h: gen.py
python gen.py
diff --git a/dcoppython/test/dcopserver/gen.py b/dcoppython/test/dcopserver/gen.py
index 26f21113..4d1b8ff2 100644
--- a/dcoppython/test/dcopserver/gen.py
+++ b/dcoppython/test/dcopserver/gen.py
@@ -34,7 +34,7 @@ for inc in iface_inc_list:
iface_inc += iface_inc_1
iface_inc.append("};")
-files = {'kdedcoptest_iface.h': iface_inc,
+files = {'tdedcoptest_iface.h': iface_inc,
'h_inc.h': h_inc,
'cpp_inc.h': cpp_inc
}
diff --git a/dcoppython/test/dcopserver/main.cpp b/dcoppython/test/dcopserver/main.cpp
index 458986eb..f017455c 100644
--- a/dcoppython/test/dcopserver/main.cpp
+++ b/dcoppython/test/dcopserver/main.cpp
@@ -2,7 +2,7 @@
* Copyright (C) 2003 Julian Rockey <kde@jrockey.com>
*/
-#include "kdedcoptest.h"
+#include "tdedcoptest.h"
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
@@ -21,7 +21,7 @@ static TDECmdLineOptions options[] =
int main(int argc, char **argv)
{
- TDEAboutData about("kdedcoptest", I18N_NOOP("TDEDcopTest"), version, description,
+ TDEAboutData about("tdedcoptest", I18N_NOOP("TDEDcopTest"), version, description,
TDEAboutData::License_GPL, "(C) 2003 Julian Rockey", 0, 0, "kde@jrockey.com");
about.addAuthor( "Julian Rockey", 0, "kde@jrockey.com" );
TDECmdLineArgs::init(argc, argv, &about);
diff --git a/dcoppython/test/dcopserver/mainclass.h b/dcoppython/test/dcopserver/mainclass.h
index 7d4f7f4e..44379735 100644
--- a/dcoppython/test/dcopserver/mainclass.h
+++ b/dcoppython/test/dcopserver/mainclass.h
@@ -3,7 +3,7 @@
#define MAINCLASS_H
-#include "kdedcoptest_iface.h"
+#include "tdedcoptest_iface.h"
/**
*
diff --git a/dcoppython/test/dcopserver/kdedcoptest.cpp b/dcoppython/test/dcopserver/tdedcoptest.cpp
index d9ebd557..58fd9ed5 100644
--- a/dcoppython/test/dcopserver/kdedcoptest.cpp
+++ b/dcoppython/test/dcopserver/tdedcoptest.cpp
@@ -2,7 +2,7 @@
* Copyright (C) 2003 Julian Rockey <kde@jrockey.com>
*/
-#include "kdedcoptest.h"
+#include "tdedcoptest.h"
#include <tqlabel.h>
@@ -13,7 +13,7 @@ KDEDcopTest::KDEDcopTest()
: TDEMainWindow( 0, "KDEDcopTest" )
{
// set the shell's ui resource file
- //setXMLFile("kdedcoptestui.rc");
+ //setXMLFile("tdedcoptestui.rc");
//new TQLabel( "Hello World", this, "hello label" );
m_mainClass = new MainClass();
@@ -24,4 +24,4 @@ KDEDcopTest::~KDEDcopTest()
if (m_mainClass) delete m_mainClass;
}
-#include "kdedcoptest.moc"
+#include "tdedcoptest.moc"
diff --git a/dcoppython/test/dcopserver/kdedcoptest.desktop b/dcoppython/test/dcopserver/tdedcoptest.desktop
index 62510524..1473e35e 100644
--- a/dcoppython/test/dcopserver/kdedcoptest.desktop
+++ b/dcoppython/test/dcopserver/tdedcoptest.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=KDEDcopTest
-Exec=kdedcoptest
-Icon=kdedcoptest
+Exec=tdedcoptest
+Icon=tdedcoptest
Type=Application
Comment=A simple TDE Application
diff --git a/dcoppython/test/dcopserver/kdedcoptest.h b/dcoppython/test/dcopserver/tdedcoptest.h
index 84a4db01..84a4db01 100644
--- a/dcoppython/test/dcopserver/kdedcoptest.h
+++ b/dcoppython/test/dcopserver/tdedcoptest.h
diff --git a/dcoppython/test/dcopserver/kdedcoptestui.rc b/dcoppython/test/dcopserver/tdedcoptestui.rc
index 7f6ee828..25ca9f68 100644
--- a/dcoppython/test/dcopserver/kdedcoptestui.rc
+++ b/dcoppython/test/dcopserver/tdedcoptestui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdedcoptest" version="1">
+<kpartgui name="tdedcoptest" version="1">
<MenuBar>
<Menu name="custom"><text>C&amp;ustom</text>
<Action name="custom_action" />