Browse files

Minor cleanup tasks.

  • Loading branch information...
1 parent cd4b907 commit 07a5982ea8f25faa430bc3b5ad73cf3084607d31 @till213 till213 committed Jan 3, 2011
View
2 .gitignore
@@ -6,7 +6,7 @@ Makefile*
*.qm
*.dll
*.so
-./doc
+Doxydoc
# Qt build
ui_*.h
View
2 Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NUMBER = 0.1
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = doc/Doxydoc
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
View
18 src/Common.pri
@@ -23,3 +23,21 @@ CONFIG(debug, debug|release) {
UI_DIR = GeneratedFiles/release
INCLUDEPATH += GeneratedFiles/release
}
+
+unix:linux* {
+ QMAKE_CXXFLAGS += -Wall -Woverloaded-virtual -Wno-deprecated -Wuninitialized -O
+ QMAKE_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
+
+ QMAKE_LFLAGS += -Wl,--rpath=\'\$\$ORIGIN\'
+}
+
+win32-g++ {
+ QMAKE_CXXFLAGS += -Wall -Woverloaded-virtual -Wno-deprecated -Wuninitialized -O
+ QMAKE_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
+}
+
+macx {
+ QMAKE_CXXFLAGS += -Wall -Woverloaded-virtual -Wno-deprecated -Wuninitialized -O
+ QMAKE_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
+}
+
View
1 src/Kernel/Kernel.pro
@@ -1,5 +1,4 @@
include(../CommonLibrary.pri)
-include(../Platforms.pri)
include(../External.pri)
include(Sources.pri)
View
4 src/Model/Model.pro
@@ -1,5 +1,4 @@
include(../CommonLibrary.pri)
-include(../Platforms.pri)
include(../External.pri)
include(Sources.pri)
@@ -9,6 +8,3 @@ DEFINES += MODEL_EXPORT
LIBS += -L$${DESTDIR} \
-lUtils
-HEADERS +=
-
-SOURCES +=
View
30 src/Model/src/Dao/ScreenieSceneDao.cpp
@@ -1,30 +0,0 @@
-/* This file is part of the Screenie project.
- Screenie is a fancy screenshot composer.
-
- Copyright (C) 2008 Ariya Hidayat <ariya.hidayat@gmail.com>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "ScreenieSceneIO.h"
-
-// public
-
-ScreenieSceneIO::ScreenieSceneIO(ScreenieScene &screenieScene)
-{
- d = new ScreenieScenePrivate();
-}
-
-
View
4 src/Model/src/Dao/ScreenieTemplateModelDao.h
@@ -31,8 +31,8 @@ class ScreenieTemplateModelDao
/*!
* Writes the \p screeniePixmapModel.
*
- * \param screeniePixmapModel
- * the ScreeniePixmapModel to be written
+ * \param screenieTemplateModel
+ * the ScreenieTemplateModel to be written
* \return \c true if written succesfully; \c false else (no file permission, disk full, write error)
*/
virtual bool write(const ScreenieTemplateModel &screenieTemplateModel) = 0;
View
17 src/Platforms.pri
@@ -1,17 +0,0 @@
-unix:linux* {
- QMAKE_CXXFLAGS += -Wall -Woverloaded-virtual -Wno-deprecated -Wuninitialized -O
- QMAKE_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
-
- QMAKE_LFLAGS += -Wl,--rpath=\'\$\$ORIGIN\'
-}
-
-win32-g++ {
- QMAKE_CXXFLAGS += -Wall -Woverloaded-virtual -Wno-deprecated -Wuninitialized -O
- QMAKE_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
-}
-
-macx {
- QMAKE_CXXFLAGS += -Wall -Woverloaded-virtual -Wno-deprecated -Wuninitialized -O
- QMAKE_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
-}
-
View
10 src/Resources/Resources.pro
@@ -1,11 +1,13 @@
-TEMPLATE = lib
-DESTDIR = $$PWD/../../bin/
-
include(../CommonLibrary.pri)
-include(../Platforms.pri)
include(../External.pri)
include(Sources.pri)
+TEMPLATE = lib
+DEFINES += RESOURCES_EXPORT
+
+DESTDIR = $$PWD/../../bin/
+
+
View
4 src/Resources/misc/Icons.txt
@@ -1,4 +0,0 @@
-Icons
-=====
-
-oxygen-icons-4.5.85: http://www.oxygen-icons.org/
View
1 src/Screenie/Screenie.pro
@@ -1,5 +1,4 @@
include(../Common.pri)
-include(../Platforms.pri)
include(../External.pri)
include(Sources.pri)
View
1 src/Utils/Utils.pro
@@ -1,5 +1,4 @@
include(../CommonLibrary.pri)
-include(../Platforms.pri)
include(../External.pri)
include(Sources.pri)

0 comments on commit 07a5982

Please sign in to comment.