From 636f509299122d02087c6fd62e1e4a46dbd22026 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 8 Jan 2014 20:06:00 +0100 Subject: Rename many classes to avoid conflicts with KDE --- dcoppython/test/dcopserver/Makefile.am | 20 +++++++------- dcoppython/test/dcopserver/gen.py | 2 +- dcoppython/test/dcopserver/kdedcoptest.cpp | 27 ------------------ dcoppython/test/dcopserver/kdedcoptest.desktop | 6 ---- dcoppython/test/dcopserver/kdedcoptest.h | 38 -------------------------- dcoppython/test/dcopserver/kdedcoptestui.rc | 8 ------ dcoppython/test/dcopserver/main.cpp | 4 +-- dcoppython/test/dcopserver/mainclass.h | 2 +- dcoppython/test/dcopserver/tdedcoptest.cpp | 27 ++++++++++++++++++ dcoppython/test/dcopserver/tdedcoptest.desktop | 6 ++++ dcoppython/test/dcopserver/tdedcoptest.h | 38 ++++++++++++++++++++++++++ dcoppython/test/dcopserver/tdedcoptestui.rc | 8 ++++++ 12 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 dcoppython/test/dcopserver/kdedcoptest.cpp delete mode 100644 dcoppython/test/dcopserver/kdedcoptest.desktop delete mode 100644 dcoppython/test/dcopserver/kdedcoptest.h delete mode 100644 dcoppython/test/dcopserver/kdedcoptestui.rc create mode 100644 dcoppython/test/dcopserver/tdedcoptest.cpp create mode 100644 dcoppython/test/dcopserver/tdedcoptest.desktop create mode 100644 dcoppython/test/dcopserver/tdedcoptest.h create mode 100644 dcoppython/test/dcopserver/tdedcoptestui.rc (limited to 'dcoppython') 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/kdedcoptest.cpp b/dcoppython/test/dcopserver/kdedcoptest.cpp deleted file mode 100644 index d9ebd557..00000000 --- a/dcoppython/test/dcopserver/kdedcoptest.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2003 Julian Rockey - */ - -#include "kdedcoptest.h" - -#include - -#include -#include - -KDEDcopTest::KDEDcopTest() - : TDEMainWindow( 0, "KDEDcopTest" ) -{ - // set the shell's ui resource file - //setXMLFile("kdedcoptestui.rc"); - - //new TQLabel( "Hello World", this, "hello label" ); - m_mainClass = new MainClass(); -} - -KDEDcopTest::~KDEDcopTest() -{ - if (m_mainClass) delete m_mainClass; -} - -#include "kdedcoptest.moc" diff --git a/dcoppython/test/dcopserver/kdedcoptest.desktop b/dcoppython/test/dcopserver/kdedcoptest.desktop deleted file mode 100644 index 62510524..00000000 --- a/dcoppython/test/dcopserver/kdedcoptest.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=KDEDcopTest -Exec=kdedcoptest -Icon=kdedcoptest -Type=Application -Comment=A simple TDE Application diff --git a/dcoppython/test/dcopserver/kdedcoptest.h b/dcoppython/test/dcopserver/kdedcoptest.h deleted file mode 100644 index 84a4db01..00000000 --- a/dcoppython/test/dcopserver/kdedcoptest.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2003 Julian Rockey - */ - -#ifndef _KDEDCOPTEST_H_ -#define _KDEDCOPTEST_H_ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -#include "mainclass.h" - -/** - * @short Application Main Window - * @author Julian Rockey - * @version 0.1 - */ -class KDEDcopTest : public TDEMainWindow -{ - Q_OBJECT -public: - /** - * Default Constructor - */ - KDEDcopTest(); - - /** - * Default Destructor - */ - virtual ~KDEDcopTest(); -private: - MainClass *m_mainClass; -}; - -#endif // _KDEDCOPTEST_H_ diff --git a/dcoppython/test/dcopserver/kdedcoptestui.rc b/dcoppython/test/dcopserver/kdedcoptestui.rc deleted file mode 100644 index 7f6ee828..00000000 --- a/dcoppython/test/dcopserver/kdedcoptestui.rc +++ /dev/null @@ -1,8 +0,0 @@ - - - - C&ustom - - - - 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 */ -#include "kdedcoptest.h" +#include "tdedcoptest.h" #include #include #include @@ -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/tdedcoptest.cpp b/dcoppython/test/dcopserver/tdedcoptest.cpp new file mode 100644 index 00000000..58fd9ed5 --- /dev/null +++ b/dcoppython/test/dcopserver/tdedcoptest.cpp @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2003 Julian Rockey + */ + +#include "tdedcoptest.h" + +#include + +#include +#include + +KDEDcopTest::KDEDcopTest() + : TDEMainWindow( 0, "KDEDcopTest" ) +{ + // set the shell's ui resource file + //setXMLFile("tdedcoptestui.rc"); + + //new TQLabel( "Hello World", this, "hello label" ); + m_mainClass = new MainClass(); +} + +KDEDcopTest::~KDEDcopTest() +{ + if (m_mainClass) delete m_mainClass; +} + +#include "tdedcoptest.moc" diff --git a/dcoppython/test/dcopserver/tdedcoptest.desktop b/dcoppython/test/dcopserver/tdedcoptest.desktop new file mode 100644 index 00000000..1473e35e --- /dev/null +++ b/dcoppython/test/dcopserver/tdedcoptest.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=KDEDcopTest +Exec=tdedcoptest +Icon=tdedcoptest +Type=Application +Comment=A simple TDE Application diff --git a/dcoppython/test/dcopserver/tdedcoptest.h b/dcoppython/test/dcopserver/tdedcoptest.h new file mode 100644 index 00000000..84a4db01 --- /dev/null +++ b/dcoppython/test/dcopserver/tdedcoptest.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2003 Julian Rockey + */ + +#ifndef _KDEDCOPTEST_H_ +#define _KDEDCOPTEST_H_ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "mainclass.h" + +/** + * @short Application Main Window + * @author Julian Rockey + * @version 0.1 + */ +class KDEDcopTest : public TDEMainWindow +{ + Q_OBJECT +public: + /** + * Default Constructor + */ + KDEDcopTest(); + + /** + * Default Destructor + */ + virtual ~KDEDcopTest(); +private: + MainClass *m_mainClass; +}; + +#endif // _KDEDCOPTEST_H_ diff --git a/dcoppython/test/dcopserver/tdedcoptestui.rc b/dcoppython/test/dcopserver/tdedcoptestui.rc new file mode 100644 index 00000000..25ca9f68 --- /dev/null +++ b/dcoppython/test/dcopserver/tdedcoptestui.rc @@ -0,0 +1,8 @@ + + + + C&ustom + + + + -- cgit v1.2.1