[Tux4kids-commits] r1201 - in tux4kids-admin/trunk: libtux4kidsadmin libtux4kidsadmin_tuxmath
Michał Świtakowski
swistakers-guest at alioth.debian.org
Tue Jul 14 12:51:26 UTC 2009
Author: swistakers-guest
Date: 2009-07-14 12:51:25 +0000 (Tue, 14 Jul 2009)
New Revision: 1201
Added:
tux4kids-admin/trunk/libtux4kidsadmin/profileDir_p.h
tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath_p.h
Removed:
tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp
tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate_p.h
tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate.cpp
tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate_p.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate_p.h
Modified:
tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp
Log:
fixed build on windows, merged public and private cpp files
Modified: tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/CMakeLists.txt 2009-07-14 12:51:25 UTC (rev 1201)
@@ -4,7 +4,6 @@
SET(LIBTUX4KIDSADMIN_SOURCES
libtux4kidsadmin.cpp
profileDir.cpp
- profileDirPrivate.cpp
schoolData.cpp )
SET(LIBTUX4KIDSADMIN_MOC_HEADERS
Modified: tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,6 +1,42 @@
#include "profileDir.h"
-#include "profileDirPrivate_p.h"
+#include "profileDir_p.h"
+#include <QString>
+
+/****************** ProfileDirPrivate *******************/
+
+ProfileDirPrivate::ProfileDirPrivate(QString path)
+{
+ mainDir.setPath(path);
+ if (!mainDir.exists()) {
+ if (!QDir::root().mkpath(path)) {
+ status = ProfileDir::InitializationError;
+ return;
+ }
+ }
+ mainDir.setPath(path);
+
+ if (!mainDir.mkdir("data")) {
+ status = ProfileDir::InitializationError;
+ return;
+ }
+ dataDir = QDir(mainDir.absolutePath() + "/data");
+
+ attributes = new QSettings(path + "/attributes.ini", QSettings::IniFormat);
+ if (!attributes->status() != QSettings::NoError) {
+ status = ProfileDir::InitializationError;
+ return;
+ }
+
+}
+
+ProfileDirPrivate::~ProfileDirPrivate()
+{
+ delete attributes;
+}
+
+/****************** ProfileDir *******************/
+
ProfileDir::ProfileDir(QString path, QObject *parent) :
QObject(parent), d_ptr(new ProfileDirPrivate(path))
{
Deleted: tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate.cpp 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,34 +0,0 @@
-#include "profileDirPrivate_p.h"
-
-#include <QString>
-
-ProfileDirPrivate::ProfileDirPrivate(QString path)
-{
- mainDir.setPath(path);
- if (!mainDir.exists()) {
- if (!QDir::root().mkpath(path)) {
- status = ProfileDir::InitializationError;
- return;
- }
- }
- mainDir.setPath(path);
-
- if (!mainDir.mkdir("data")) {
- status = ProfileDir::InitializationError;
- return;
- }
- dataDir = QDir(mainDir.absolutePath() + "/data");
-
- attributes = new QSettings(path + "/attributes.ini", QSettings::IniFormat);
- if (!attributes->status() != QSettings::NoError) {
- status = ProfileDir::InitializationError;
- return;
- }
-
-}
-
-ProfileDirPrivate::~ProfileDirPrivate()
-{
- delete attributes;
-}
-
Deleted: tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate_p.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate_p.h 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate_p.h 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,26 +0,0 @@
-#ifndef PROFILEDIRPRIVATE_H
-#define PROFILEDIRPRIVATE_H
-
-#include <QtGlobal>
-#include <QDir>
-#include <QSettings>
-#include "profileDir.h"
-
-class QString;
-
-class ProfileDirPrivate
-{
-public:
- Q_DECLARE_PUBLIC(ProfileDir)
-
- ProfileDirPrivate(QString path);
- virtual ~ProfileDirPrivate();
-
- ProfileDir *q_ptr;
-
- ProfileDir::Status status;
- QSettings *attributes;
- QDir mainDir, dataDir;
-};
-
-#endif // PROFILEDIRPRIVATE_H
Copied: tux4kids-admin/trunk/libtux4kidsadmin/profileDir_p.h (from rev 1200, tux4kids-admin/trunk/libtux4kidsadmin/profileDirPrivate_p.h)
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir_p.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir_p.h 2009-07-14 12:51:25 UTC (rev 1201)
@@ -0,0 +1,26 @@
+#ifndef PROFILEDIRPRIVATE_H
+#define PROFILEDIRPRIVATE_H
+
+#include <QtGlobal>
+#include <QDir>
+#include <QSettings>
+#include "libtux4kidsadmin_global.h"
+
+class QString;
+
+class LIBTUX4KIDSADMINSHARED_EXPORT ProfileDirPrivate
+{
+public:
+ Q_DECLARE_PUBLIC(ProfileDir)
+
+ ProfileDirPrivate(QString path);
+ virtual ~ProfileDirPrivate();
+
+ ProfileDir *q_ptr;
+
+ ProfileDir::Status status;
+ QSettings *attributes;
+ QDir mainDir, dataDir;
+};
+
+#endif // PROFILEDIRPRIVATE_H
Modified: tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,6 +1,29 @@
#include "schoolData.h"
-#include "schoolDataPrivate_p.h"
+#include "schoolData_p.h"
+#include <QString>
+
+/****************** SchoolDataPrivate *******************/
+
+SchoolDataPrivate::SchoolDataPrivate(QString path)
+{
+ mainDir.setPath(path);
+ if (!mainDir.exists()) {
+ if (!QDir::root().mkpath(path)) {
+ status = SchoolData::InitializationError;
+ }
+ }
+ mainDir.setPath(path);
+}
+
+
+
+SchoolDataPrivate::~SchoolDataPrivate()
+{
+}
+
+/****************** SchoolData *******************/
+
SchoolData::SchoolData(QString path, QObject *parent)
: QObject(parent), d_ptr(new SchoolDataPrivate(path))
{
Deleted: tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate.cpp 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate.cpp 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,21 +0,0 @@
-#include "schoolDataPrivate_p.h"
-
-#include <QString>
-
-SchoolDataPrivate::SchoolDataPrivate(QString path)
-{
- mainDir.setPath(path);
- if (!mainDir.exists()) {
- if (!QDir::root().mkpath(path)) {
- status = SchoolData::InitializationError;
- }
- }
- mainDir.setPath(path);
-}
-
-
-
-SchoolDataPrivate::~SchoolDataPrivate()
-{
-}
-
Deleted: tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate_p.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate_p.h 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate_p.h 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,24 +0,0 @@
-#ifndef SCHOOLDATAPRIVATE_P_H
-#define SCHOOLDATAPRIVATE_P_H
-
-#include <QtGlobal>
-#include <QDir>
-#include "schoolData.h"
-class QString;
-
-class SchoolDataPrivate
-{
-public:
- Q_DECLARE_PUBLIC(SchoolData)
-
- SchoolDataPrivate(QString path);
- virtual ~SchoolDataPrivate();
-
- SchoolData *q_ptr;
-
- QDir mainDir;
-
- SchoolData::Status status;
-};
-
-#endif // SCHOOLDATAPRIVATE_P_H
Copied: tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h (from rev 1200, tux4kids-admin/trunk/libtux4kidsadmin/schoolDataPrivate_p.h)
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h 2009-07-14 12:51:25 UTC (rev 1201)
@@ -0,0 +1,24 @@
+#ifndef SCHOOLDATAPRIVATE_P_H
+#define SCHOOLDATAPRIVATE_P_H
+
+#include <QtGlobal>
+#include <QDir>
+#include "schoolData.h"
+class QString;
+
+class SchoolDataPrivate
+{
+public:
+ Q_DECLARE_PUBLIC(SchoolData)
+
+ SchoolDataPrivate(QString path);
+ virtual ~SchoolDataPrivate();
+
+ SchoolData *q_ptr;
+
+ QDir mainDir;
+
+ SchoolData::Status status;
+};
+
+#endif // SCHOOLDATAPRIVATE_P_H
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/CMakeLists.txt 2009-07-14 12:51:25 UTC (rev 1201)
@@ -3,8 +3,7 @@
SET(LIBTUX4KIDSADMIN_TUXMATH_SOURCES
libtux4kidsadmin_tuxmath.cpp
- profileDirTuxmath.cpp
- profileDirTuxmathPrivate.cpp )
+ profileDirTuxmath.cpp )
SET(LIBTUX4KIDSADMIN_TUXMATH_MOC_HEADERS
profileDirTuxmath.h )
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath.cpp 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,8 +1,21 @@
#include "profileDirTuxmath.h"
+#include "profileDirTuxmath_p.h"
-#include "profileDirTuxmathPrivate_p.h"
+#include <QString>
+/************** ProfileDirTuxmathPrivate ****************/
+ProfileDirTuxmathPrivate::ProfileDirTuxmathPrivate(QString path)
+ : ProfileDirPrivate(path)
+{
+}
+
+ProfileDirTuxmathPrivate::~ProfileDirTuxmathPrivate()
+{
+}
+
+/************** ProfileDirTuxmath ****************/
+
ProfileDirTuxmath::ProfileDirTuxmath(QString path, QObject *parent)
: ProfileDir(*new ProfileDirTuxmathPrivate(path), parent)
{
Deleted: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate.cpp 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,13 +0,0 @@
-#include "profileDirTuxmathPrivate_p.h"
-
-#include <QString>
-
-ProfileDirTuxmathPrivate::ProfileDirTuxmathPrivate(QString path)
- : ProfileDirPrivate(path)
-{
-}
-
-ProfileDirTuxmathPrivate::~ProfileDirTuxmathPrivate()
-{
-}
-
Deleted: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate_p.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate_p.h 2009-07-14 08:10:10 UTC (rev 1200)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate_p.h 2009-07-14 12:51:25 UTC (rev 1201)
@@ -1,15 +0,0 @@
-#ifndef PROFILEDIRTUXMATHPRIVATE_H
-#define PROFILEDIRTUXMATHPRIVATE_H
-
-#include "profileDirPrivate_p.h"
-
-class ProfileDirTuxmathPrivate : public ProfileDirPrivate
-{
-public:
- Q_DECLARE_PUBLIC(ProfileDir)
-
- ProfileDirTuxmathPrivate(QString path);
- virtual ~ProfileDirTuxmathPrivate();
-};
-
-#endif // PROFILEDIRTUXMATHPRIVATE_H
Copied: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath_p.h (from rev 1200, tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmathPrivate_p.h)
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath_p.h (rev 0)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/profileDirTuxmath_p.h 2009-07-14 12:51:25 UTC (rev 1201)
@@ -0,0 +1,15 @@
+#ifndef PROFILEDIRTUXMATHPRIVATE_H
+#define PROFILEDIRTUXMATHPRIVATE_H
+
+#include "profileDir_p.h"
+
+class ProfileDirTuxmathPrivate : public ProfileDirPrivate
+{
+public:
+ Q_DECLARE_PUBLIC(ProfileDir)
+
+ ProfileDirTuxmathPrivate(QString path);
+ virtual ~ProfileDirTuxmathPrivate();
+};
+
+#endif // PROFILEDIRTUXMATHPRIVATE_H
More information about the Tux4kids-commits
mailing list