From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Fri, 27 Aug 2010 08:13:31 +0000 (+0200)
Subject: Small changes in building system
X-Git-Tag: 0.4~2^2~1
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=2cb6e4630c43b456334cdf525e528eb3a2f527cb;p=mdictionary

Small changes in building system
---

diff --git a/trunk/src/base/backbone/ConfigGenerator.cpp b/trunk/src/base/backbone/ConfigGenerator.cpp
index 6781903..0c36b9b 100644
--- a/trunk/src/base/backbone/ConfigGenerator.cpp
+++ b/trunk/src/base/backbone/ConfigGenerator.cpp
@@ -27,9 +27,6 @@
 
 #include "ConfigGenerator.h"
 
-ConfigGenerator::ConfigGenerator() {}
-
-
 bool ConfigGenerator::generateCss(QString file) {
     QFile _file(file);
     if(_file.exists())
@@ -41,5 +38,4 @@ bool ConfigGenerator::generateCss(QString file) {
         return true;
     }
     return false;
-
 }
diff --git a/trunk/src/base/backbone/ConfigGenerator.h b/trunk/src/base/backbone/ConfigGenerator.h
index f624c71..1b43115 100644
--- a/trunk/src/base/backbone/ConfigGenerator.h
+++ b/trunk/src/base/backbone/ConfigGenerator.h
@@ -28,9 +28,8 @@
 #ifndef CONFIGGENERATOR_H
 #define CONFIGGENERATOR_H
 
-#include <QFileInfo>
 #include <QFile>
-#include <QDir>
+#include <QString>
 
 /*! ConfigGenerator generatesconfiguration files (with default values),
 if given file dosent exists.
@@ -41,9 +40,6 @@ configuration files to work that way.
 class ConfigGenerator {
 
 public:
-    ConfigGenerator();
-
-
     /*! Generates default css stylesheet for xslt transformations
         \param file file to be generated
         \return if file was generated - returns true; if file alredy exists
diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index 9262aa0..ed209ff 100644
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -26,6 +26,8 @@
 */
 
 #include "backbone.h"
+#include "ConfigGenerator.h"
+class ConfigGenerator;
 #include <QDebug>
 
 int Backbone::_searchLimit;
@@ -80,7 +82,8 @@ void Backbone::init() {
    _searchLimit = 15;
 
    //Install default config files
-   ConfigGenerator().generateCss(_dir + "style.css");
+   ConfigGenerator confGen;
+   confGen.generateCss(_dir + "style.css");
 
 
 
diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index 5a53384..b43f9e0 100644
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -6,6 +6,7 @@ QT += core \
     sql \
     xml \
     xmlpatterns
+
 maemo5:QT += maemo5
 TARGET = mdictionary
 TEMPLATE = app
@@ -13,6 +14,7 @@ MDICT_BINDIR = $$[MDICT_BINDIR]
 isEmpty(MDICT_BINDIR):MDICT_BINDIR = .
 DESTDIR = $${MDICT_BINDIR}
 SOURCES += gui/main.cpp \
+    backbone/ConfigGenerator.cpp \
     gui/MainWindow.cpp \
     gui/SearchBarWidget.cpp \
     gui/WordListWidget.cpp \
@@ -30,9 +32,9 @@ SOURCES += gui/main.cpp \
     gui/BookmarksWidget.cpp \
     gui/WelcomeScreenWidget.cpp \
     gui/AboutWidget.cpp \
-    gui/TranslationTextEdit.cpp \
-    backbone/ConfigGenerator.cpp
+    gui/TranslationTextEdit.cpp
 HEADERS += gui/MainWindow.h \
+    backbone/ConfigGenerator.h \
     gui/AboutWidget.h \
     gui/SearchBarWidget.h \
     gui/WordListWidget.h \
@@ -58,9 +60,7 @@ HEADERS += gui/MainWindow.h \
     ../includes/Notify.h \
     gui/TranslationTextEdit.h \
     ../includes/AccentsNormalizer.h \
-    ../includes/DictDialog.h \
-    backbone/ConfigGenerator.h
-FORMS += 
+    ../includes/DictDialog.h
 RESOURCES += ../../../data/icons/gui.qrc
 unix { 
     # VARIABLES
diff --git a/trunk/trunk.pro b/trunk/trunk.pro
index 7235070..2f269c6 100644
--- a/trunk/trunk.pro
+++ b/trunk/trunk.pro
@@ -1,5 +1,5 @@
 TEMPLATE=subdirs
-SUBDIRS = tests src 
+SUBDIRS = src 
 
 check.target = check
 check.CONFIG = recursive