summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-11-11 15:32:59 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-11-13 02:50:37 +0100
commit9fff1383205279a747c09bf07af84cfa37dd3403 (patch)
treee028c29af75cb543a3c02a4c3545a6064c8426e6
parentMoved data dir to src (diff)
downloadrekonq-9fff1383205279a747c09bf07af84cfa37dd3403.tar.xz
cleaning home :)
In Italy we say "Pulizie di Pasqua". Just some changes to reorganize things better
-rw-r--r--src/CMakeLists.txt40
-rw-r--r--src/mainwindow.cpp2
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/rekonqpage/newtabpage.cpp (renamed from src/newtabpage.cpp)0
-rw-r--r--src/rekonqpage/newtabpage.h (renamed from src/newtabpage.h)0
-rw-r--r--src/settings/settings_fonts.ui (renamed from src/settings_fonts.ui)0
-rw-r--r--src/settings/settings_general.ui (renamed from src/settings_general.ui)0
-rw-r--r--src/settings/settings_tabs.ui (renamed from src/settings_tabs.ui)0
-rw-r--r--src/settings/settings_webkit.ui (renamed from src/settings_webkit.ui)0
-rw-r--r--src/settings/settingsdialog.cpp (renamed from src/settings.cpp)4
-rw-r--r--src/settings/settingsdialog.h (renamed from src/settings.h)6
11 files changed, 27 insertions, 26 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e6c5d66..56bc0ebd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,36 +7,36 @@ ADD_SUBDIRECTORY( tests )
### ------- SETTING REKONQ FILES..
SET( rekonq_KDEINIT_SRCS
- newtabpage.cpp
- previewimage.cpp
- websnap.cpp
- autosaver.cpp
application.cpp
- mainwindow.cpp
- mainview.cpp
- tabbar.cpp
+ autosaver.cpp
+ bookmarks.cpp
+ findbar.cpp
history.cpp
historymodels.cpp
- bookmarks.cpp
+ lineedit.cpp
+ mainview.cpp
+ mainwindow.cpp
modelmenu.cpp
- urlbar.cpp
- findbar.cpp
- settings.cpp
- webview.cpp
- sidepanel.cpp
panelhistory.cpp
- lineedit.cpp
- webpage.cpp
+ previewimage.cpp
sessionmanager.cpp
+ sidepanel.cpp
+ tabbar.cpp
+ urlbar.cpp
+ webpage.cpp
webpluginfactory.cpp
+ websnap.cpp
+ webview.cpp
+ rekonqpage/newtabpage.cpp
+ settings/settingsdialog.cpp
)
KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS
- settings_general.ui
- settings_tabs.ui
- settings_fonts.ui
- settings_webkit.ui
+ settings/settings_general.ui
+ settings/settings_tabs.ui
+ settings/settings_fonts.ui
+ settings/settings_webkit.ui
cleardata.ui
)
@@ -46,6 +46,8 @@ KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc )
### ------------- INCLUDING DIRECTORIES...
INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage
+ ${CMAKE_CURRENT_SOURCE_DIR}/settings
${CMAKE_CURRENT_BINARY_DIR}
${KDE4_INCLUDES}
${QT4_INCLUDES}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 43031446..8caa6fbc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -35,7 +35,7 @@
// Local Includes
#include "application.h"
-#include "settings.h"
+#include "settingsdialog.h"
#include "history.h"
#include "bookmarks.h"
#include "webview.h"
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 5071cdb2..0ee1c3c2 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -32,7 +32,6 @@
// Local Includes
#include "bookmarks.h"
-// #include "mainview.h"
#include "webview.h"
// KDE Includes
diff --git a/src/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index b34990fc..b34990fc 100644
--- a/src/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
diff --git a/src/newtabpage.h b/src/rekonqpage/newtabpage.h
index 2d8d50bd..2d8d50bd 100644
--- a/src/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
diff --git a/src/settings_fonts.ui b/src/settings/settings_fonts.ui
index 98efce16..98efce16 100644
--- a/src/settings_fonts.ui
+++ b/src/settings/settings_fonts.ui
diff --git a/src/settings_general.ui b/src/settings/settings_general.ui
index 57d293e6..57d293e6 100644
--- a/src/settings_general.ui
+++ b/src/settings/settings_general.ui
diff --git a/src/settings_tabs.ui b/src/settings/settings_tabs.ui
index ba903ff4..ba903ff4 100644
--- a/src/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
diff --git a/src/settings_webkit.ui b/src/settings/settings_webkit.ui
index 129bcf03..129bcf03 100644
--- a/src/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
diff --git a/src/settings.cpp b/src/settings/settingsdialog.cpp
index 9c95bb9c..1db38b96 100644
--- a/src/settings.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -27,8 +27,8 @@
// Self Includes
-#include "settings.h"
-#include "settings.moc"
+#include "settingsdialog.h"
+#include "settingsdialog.moc"
// Auto Includes
#include "rekonq.h"
diff --git a/src/settings.h b/src/settings/settingsdialog.h
index 3aa943c7..360fe246 100644
--- a/src/settings.h
+++ b/src/settings/settingsdialog.h
@@ -26,8 +26,8 @@
* ============================================================ */
-#ifndef SETTINGS_H
-#define SETTINGS_H
+#ifndef SETTINGS_DIALOG_H
+#define SETTINGS_DIALOG_H
// KDE Includes
@@ -59,4 +59,4 @@ private slots:
void setHomeToCurrentPage();
};
-#endif // SETTINGS_H
+#endif // SETTINGS_DIALOG_H