[Tux4kids-commits] r1185 - in tux4kids-admin/trunk: libtux4kidsadmin libtux4kidsadmin_tuxmath tux4kids-admin/plugins/tuxmathPlugin
Michał Świtakowski
swistakers-guest at alioth.debian.org
Sat Jul 11 23:00:18 UTC 2009
Author: swistakers-guest
Date: 2009-07-11 23:00:17 +0000 (Sat, 11 Jul 2009)
New Revision: 1185
Added:
tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h
tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp
tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.h
Removed:
tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.cpp
tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.cpp
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h
Modified:
tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.cpp
tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
Log:
profile classes follow d-pointer technique
Modified: tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt 2009-07-11 23:00:17 UTC (rev 1185)
@@ -3,10 +3,11 @@
SET(LIBTUX4KIDSADMIN_SOURCES
libtux4kidsadmin.cpp
- applicationDir.cpp )
+ profileDir.cpp
+ profileDirPrivate.cpp )
SET(LIBTUX4KIDSADMIN_MOC_HEADERS
- applicationDir.h )
+ profileDir.h )
# enable warnings
ADD_DEFINITIONS( -Wall -DLIBTUX4KIDSADMIN_LIBRARY )
Deleted: tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.cpp 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -1,11 +0,0 @@
-#include "applicationDir.h"
-
-ApplicationDir::ApplicationDir(QObject *parent) : QObject(parent)
-{
-}
-
-QString ApplicationDir::foo()
-{
- return "general";
-}
-
Deleted: tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin/applicationDir.h 2009-07-11 23:00:17 UTC (rev 1185)
@@ -1,17 +0,0 @@
-#ifndef APPLICATIONDIR_H
-#define APPLICATIONDIR_H
-
-#include <QObject>
-#include <QString>
-
-#include "libtux4kidsadmin_global.h"
-
-class LIBTUX4KIDSADMINSHARED_EXPORT ApplicationDir : public QObject
-{
- Q_OBJECT
-public:
- ApplicationDir(QObject *parent = 0);
- virtual QString foo();
-};
-
-#endif // APPLICATIONDIR_H
Modified: tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.cpp 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -3,4 +3,5 @@
Libtux4kidsadmin::Libtux4kidsadmin()
{
+
}
Modified: tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro 2009-07-11 23:00:17 UTC (rev 1185)
@@ -3,7 +3,9 @@
TEMPLATE = lib
DEFINES += LIBTUX4KIDSADMIN_LIBRARY
SOURCES += libtux4kidsadmin.cpp \
- applicationDir.cpp
+ profileDir.cpp \
+ profileDirPrivate.cpp
HEADERS += libtux4kidsadmin.h \
libtux4kidsadmin_global.h \
- applicationDir.h
+ profileDir.h \
+ profileDirPrivate.h
Added: tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,13 @@
+#include "profileDir.h"
+#include "profileDirPrivate.h"
+
+ProfileDir::ProfileDir()
+{
+ d = new ProfileDirPrivate();
+}
+
+ProfileDir::~ProfileDir()
+{
+ delete d;
+}
+
Added: tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,18 @@
+#ifndef PROFILEDIR_H
+#define PROFILEDIR_H
+
+#include <QObject>
+
+class ProfileDirPrivate;
+
+class ProfileDir : public QObject
+{
+ Q_OBJECT
+public:
+ ProfileDir();
+ ~ProfileDir();
+private:
+ ProfileDirPrivate *d;
+};
+
+#endif // PROFILEDIR_H
Added: tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,5 @@
+#include "profileDirPrivate.h"
+
+ProfileDirPrivate::ProfileDirPrivate()
+{
+}
Added: tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.h 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,10 @@
+#ifndef PROFILEDIRPRIVATE_H
+#define PROFILEDIRPRIVATE_H
+
+class ProfileDirPrivate
+{
+public:
+ ProfileDirPrivate();
+};
+
+#endif // PROFILEDIRPRIVATE_H
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt 2009-07-11 23:00:17 UTC (rev 1185)
@@ -3,10 +3,11 @@
SET(LIBTUX4KIDSADMIN_TUXMATH_SOURCES
libtux4kidsadmin_tuxmath.cpp
- applicationDirTuxmath.cpp )
+ profileDirTuxmath.cpp
+ profileDirTuxmathPrivate.cpp )
SET(LIBTUX4KIDSADMIN_TUXMATH_MOC_HEADERS
- applicationDirTuxmath.h )
+ profileDirTuxmath.h )
# enable warnings
ADD_DEFINITIONS( -Wall -DLIBTUX4KIDSADMIN_TUXMATH_LIBRARY )
Deleted: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.cpp 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -1,10 +0,0 @@
-#include "applicationDirTuxmath.h"
-
-ApplicationDirTuxmath::ApplicationDirTuxmath()
-{
-}
-
-QString ApplicationDirTuxmath::foo()
-{
- return "tuxmath";
-}
Deleted: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/applicationDirTuxmath.h 2009-07-11 23:00:17 UTC (rev 1185)
@@ -1,17 +0,0 @@
-#ifndef APPLICATIONDIRTUXMATH_H
-#define APPLICATIONDIRTUXMATH_H
-
-#include <QString>
-
-#include "applicationDir.h"
-#include "libtux4kidsadmin_tuxmath_global.h"
-
-class LIBTUX4KIDSADMIN_TUXMATHSHARED_EXPORT ApplicationDirTuxmath : public ApplicationDir
-{
- Q_OBJECT
-public:
- ApplicationDirTuxmath();
- QString foo();
-};
-
-#endif // APPLICATIONDIRTUXMATH_H
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro 2009-07-11 23:00:17 UTC (rev 1185)
@@ -3,9 +3,12 @@
TEMPLATE = lib
DEFINES += LIBTUX4KIDSADMIN_TUXMATH_LIBRARY
SOURCES += libtux4kidsadmin_tuxmath.cpp \
- applicationDirTuxmath.cpp
+ profileDirTuxmathPrivate.cpp \
+ profileDirTuxmath.cpp
HEADERS += libtux4kidsadmin_tuxmath.h \
libtux4kidsadmin_tuxmath_global.h \
- applicationDirTuxmath.h
+ profileDirTuxmathPrivate.h \
+ profileDirTuxmath.h
INCLUDEPATH += ../libtux4kidsadmin
-LIBS += -ltux4kidsadmin -L../libtux4kidsadmin
+LIBS += -ltux4kidsadmin \
+ -L../libtux4kidsadmin
Added: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,11 @@
+#include "profileDirTuxmath.h"
+
+ProfileDirTuxmath::ProfileDirTuxmath()
+{
+ d = new ProfileDirTuxmathPrivate();
+}
+
+ProfileDirTuxmath::~ProfileDirTuxmath()
+{
+ delete d;
+}
Added: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.h 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,17 @@
+#ifndef PROFILEDIRTUXMATH_H
+#define PROFILEDIRTUXMATH_H
+
+#include "profileDir.h"
+#include "profileDirTuxmathPrivate.h"
+
+class ProfileDirTuxmath : public ProfileDir
+{
+ Q_OBJECT
+public:
+ ProfileDirTuxmath();
+ ~ProfileDirTuxmath();
+private:
+ ProfileDirTuxmathPrivate *d;
+};
+
+#endif // PROFILEDIRTUXMATH_H
Added: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,5 @@
+#include "profileDirTuxmathPrivate.h"
+
+ProfileDirTuxmathPrivate::ProfileDirTuxmathPrivate()
+{
+}
Added: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.h 2009-07-11 23:00:17 UTC (rev 1185)
@@ -0,0 +1,12 @@
+#ifndef PROFILEDIRTUXMATHPRIVATE_H
+#define PROFILEDIRTUXMATHPRIVATE_H
+
+#include "profileDirPrivate.h"
+
+class ProfileDirTuxmathPrivate : public ProfileDirPrivate
+{
+public:
+ ProfileDirTuxmathPrivate();
+};
+
+#endif // PROFILEDIRTUXMATHPRIVATE_H
Modified: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-11 20:55:09 UTC (rev 1184)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-11 23:00:17 UTC (rev 1185)
@@ -1,22 +1,15 @@
#include <QDebug>
#include "tuxmathPlugin.h"
-#include "applicationDir.h"
-#include "applicationDirTuxmath.h"
TuxmathPlugin::TuxmathPlugin(QObject *parent) : QObject(parent)
{
- qDebug() << "let's create ApplicationDir object";
- ApplicationDir appdir;
- qDebug() << "it said" << appdir.foo();
-
- qDebug() << "let's create ApplicationDir object";
- ApplicationDirTuxmath appdir2;
- qDebug() << "it said" << appdir2.foo();
+ qDebug() << "tux math plugin constructed";
}
TuxmathPlugin::~TuxmathPlugin()
{
+ qDebug() << "tux math plugin destroyed";
}
QString TuxmathPlugin::name() const
More information about the Tux4kids-commits
mailing list