Moved top-level source files into separate directories for easier mai…

…ntenance
OSSystems · Dec 8, 2011 · a326d23 · a326d23
1 parent 7c451e3
commit a326d23
Show file tree

Hide file tree

Showing 57 changed files with 82 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.ui
+.moc
+.obj
diff --git a/agent.xml → introspection/agent.xml b/agent.xml → introspection/agent.xml
diff --git a/manager.xml → introspection/manager.xml b/manager.xml → introspection/manager.xml
diff --git a/service.xml → introspection/service.xml b/service.xml → introspection/service.xml
diff --git a/technology.xml → introspection/technology.xml b/technology.xml → introspection/technology.xml
diff --git a/qconnman.pro b/qconnman.pro
@@ -1,9 +1,14 @@
 QT += dbus
 TEMPLATE = app
 
-RESOURCES += qconnman.qrc
+UI_DIR = .ui
+MOC_DIR = .moc
+OBJECTS_DIR = .obj
+
+INCLUDEPATH += $$PWD/.ui $$PWD/src/
 
-FORMS += mainwindow.ui technologyitemwidget.ui wirelesspage.ui wiredpage.ui networkitemwidget.ui authdialog.ui hiddennetworkdialog.ui ipv4widget.ui
-SOURCES += connman/connmanmanager.cpp connman.cpp mainwindow.cpp technologylistwidget.cpp main.cpp technologyitemwidget.cpp wirelesspage.cpp wiredpage.cpp networkitemwidget.cpp networklistwidget.cpp connman/connmanservice.cpp service.cpp connman/connmantechnology.cpp technology.cpp authdialog.cpp hiddennetworkdialog.cpp ipv4widget.cpp connman/connmanagent.cpp agent.cpp
+RESOURCES += qconnman.qrc
 
-HEADERS += connman/connmanmanager.h connman.h mainwindow.h technologylistwidget.h technologyitemwidget.h wirelesspage.h wiredpage.h networkitemwidget.h networklistwidget.h connman/connmanservice.h service.h connman/connmantechnology.h technology.h authdialog.h hiddennetworkdialog.h ipv4widget.h connman/connmanagent.h agent.h
+include(ui/ui.pri)
+include(src/dbus/dbus.pri)
+include(src/src.pri)
diff --git a/agent.cpp → src/agent.cpp b/agent.cpp → src/agent.cpp
@@ -3,7 +3,7 @@
 #include "authdialog.h"
 #include "service.h"
 
-#include <connman/connmanagent.h>
+#include <dbus/connmanagent.h>
 
 #include <QMessageBox>
 #include <QDebug>

diff --git a/agent.h → src/agent.h b/agent.h → src/agent.h
diff --git a/authdialog.cpp → src/authdialog.cpp b/authdialog.cpp → src/authdialog.cpp
diff --git a/authdialog.h → src/authdialog.h b/authdialog.h → src/authdialog.h
diff --git a/connman.cpp → src/connman.cpp b/connman.cpp → src/connman.cpp
@@ -1,7 +1,7 @@
 #include "connman.h"
 
-#include <connman/connmanmanager.h>
-#include <connman/connmanservice.h>
+#include <dbus/connmanmanager.h>
+#include <dbus/connmanservice.h>
 
 static Connman *self = NULL;
 

diff --git a/connman.h → src/connman.h b/connman.h → src/connman.h
diff --git a/connman/connmanagent.cpp → src/dbus/connmanagent.cpp b/connman/connmanagent.cpp → src/dbus/connmanagent.cpp
@@ -1,14 +1,14 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a connman/connmanagent -c ConnmanAgent agent.xml
+ * Command line was: qdbusxml2cpp -a dbus/connmanagent -c ConnmanAgent agent.xml
  *
  * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#include "connman/connmanagent.h"
+#include "dbus/connmanagent.h"
 #include <QtCore/QMetaObject>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>

diff --git a/connman/connmanagent.h → src/dbus/connmanagent.h b/connman/connmanagent.h → src/dbus/connmanagent.h
diff --git a/connman/connmanmanager.cpp → src/dbus/connmanmanager.cpp b/connman/connmanmanager.cpp → src/dbus/connmanmanager.cpp
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ConnmanManager -p connman/connmanmanager -N manager.xml
+ * Command line was: qdbusxml2cpp -c ConnmanManager -p dbus/connmanmanager -N manager.xml
  *
  * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -9,7 +9,7 @@
  * before re-generating it.
  */
 
-#include "connman/connmanmanager.h"
+#include "dbus/connmanmanager.h"
 
 /*
  * Implementation of interface class ConnmanManager

diff --git a/connman/connmanmanager.h → src/dbus/connmanmanager.h b/connman/connmanmanager.h → src/dbus/connmanmanager.h
diff --git a/connman/connmanservice.cpp → src/dbus/connmanservice.cpp b/connman/connmanservice.cpp → src/dbus/connmanservice.cpp
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ConnmanService -p connman/connmanservice -N service.xml
+ * Command line was: qdbusxml2cpp -c ConnmanService -p dbus/connmanservice -N service.xml
  *
  * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -9,7 +9,7 @@
  * before re-generating it.
  */
 
-#include "connman/connmanservice.h"
+#include "dbus/connmanservice.h"
 
 /*
  * Implementation of interface class ConnmanService

diff --git a/connman/connmanservice.h → src/dbus/connmanservice.h b/connman/connmanservice.h → src/dbus/connmanservice.h
diff --git a/connman/connmantechnology.cpp → src/dbus/connmantechnology.cpp b/connman/connmantechnology.cpp → src/dbus/connmantechnology.cpp
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ConnmanTechnology -p connman/connmantechnology -N technology.xml
+ * Command line was: qdbusxml2cpp -c ConnmanTechnology -p dbus/connmantechnology -N technology.xml
  *
  * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -9,7 +9,7 @@
  * before re-generating it.
  */
 
-#include "connman/connmantechnology.h"
+#include "dbus/connmantechnology.h"
 
 /*
  * Implementation of interface class ConnmanTechnology

diff --git a/connman/connmantechnology.h → src/dbus/connmantechnology.h b/connman/connmantechnology.h → src/dbus/connmantechnology.h
diff --git a/src/dbus/dbus.pri b/src/dbus/dbus.pri
@@ -0,0 +1,9 @@
+HEADERS += $$PWD/connmanmanager.h \
+  $$PWD/connmanservice.h \
+  $$PWD/connmantechnology.h \
+  $$PWD/connmanagent.h
+
+SOURCES += $$PWD/connmanmanager.cpp \
+  $$PWD/connmanservice.cpp \
+  $$PWD/connmantechnology.cpp \
+  $$PWD/connmanagent.cpp
diff --git a/hiddennetworkdialog.cpp → src/hiddennetworkdialog.cpp b/hiddennetworkdialog.cpp → src/hiddennetworkdialog.cpp
diff --git a/hiddennetworkdialog.h → src/hiddennetworkdialog.h b/hiddennetworkdialog.h → src/hiddennetworkdialog.h
diff --git a/ipv4widget.cpp → src/ipv4widget.cpp b/ipv4widget.cpp → src/ipv4widget.cpp
diff --git a/ipv4widget.h → src/ipv4widget.h b/ipv4widget.h → src/ipv4widget.h
diff --git a/main.cpp → src/main.cpp b/main.cpp → src/main.cpp
diff --git a/mainwindow.cpp → src/mainwindow.cpp b/mainwindow.cpp → src/mainwindow.cpp
diff --git a/mainwindow.h → src/mainwindow.h b/mainwindow.h → src/mainwindow.h
diff --git a/manager.cpp → src/manager.cpp b/manager.cpp → src/manager.cpp
diff --git a/manager.h → src/manager.h b/manager.h → src/manager.h
diff --git a/networkitemwidget.cpp → src/networkitemwidget.cpp b/networkitemwidget.cpp → src/networkitemwidget.cpp
diff --git a/networkitemwidget.h → src/networkitemwidget.h b/networkitemwidget.h → src/networkitemwidget.h
diff --git a/networklistwidget.cpp → src/networklistwidget.cpp b/networklistwidget.cpp → src/networklistwidget.cpp
diff --git a/networklistwidget.h → src/networklistwidget.h b/networklistwidget.h → src/networklistwidget.h
diff --git a/service.cpp → src/service.cpp b/service.cpp → src/service.cpp
@@ -1,6 +1,6 @@
 #include "service.h"
 
-#include <connman/connmanservice.h>
+#include <dbus/connmanservice.h>
 
 #include <QDebug>
 

diff --git a/service.h → src/service.h b/service.h → src/service.h
diff --git a/src/src.pri b/src/src.pri
@@ -0,0 +1,30 @@
+SOURCES += $$PWD/main.cpp \
+  $$PWD/mainwindow.cpp \
+  $$PWD/technologylistwidget.cpp \
+  $$PWD/technologyitemwidget.cpp \
+  $$PWD/wirelesspage.cpp \
+  $$PWD/wiredpage.cpp \
+  $$PWD/networkitemwidget.cpp \
+  $$PWD/networklistwidget.cpp \
+  $$PWD/ipv4widget.cpp \
+  $$PWD/authdialog.cpp \
+  $$PWD/hiddennetworkdialog.cpp \
+  $$PWD/connman.cpp \
+  $$PWD/service.cpp \
+  $$PWD/technology.cpp \
+  $$PWD/agent.cpp
+
+HEADERS += $$PWD/mainwindow.h \
+  $$PWD/technologylistwidget.h \
+  $$PWD/technologyitemwidget.h \
+  $$PWD/wirelesspage.h \
+  $$PWD/wiredpage.h \
+  $$PWD/networkitemwidget.h \
+  $$PWD/networklistwidget.h \
+  $$PWD/ipv4widget.h \
+  $$PWD/authdialog.h \
+  $$PWD/hiddennetworkdialog.h \
+  $$PWD/connman.h \
+  $$PWD/service.h \
+  $$PWD/technology.h \
+  $$PWD/agent.h
diff --git a/src/src.pro b/src/src.pro
@@ -0,0 +1,9 @@
+QT += dbus
+TEMPLATE = app
+
+RESOURCES += qconnman.qrc
+
+FORMS += mainwindow.ui technologyitemwidget.ui wirelesspage.ui wiredpage.ui networkitemwidget.ui authdialog.ui hiddennetworkdialog.ui ipv4widget.ui
+SOURCES += connman/connmanmanager.cpp connman.cpp mainwindow.cpp technologylistwidget.cpp main.cpp technologyitemwidget.cpp wirelesspage.cpp wiredpage.cpp networkitemwidget.cpp networklistwidget.cpp connman/connmanservice.cpp service.cpp connman/connmantechnology.cpp technology.cpp authdialog.cpp hiddennetworkdialog.cpp ipv4widget.cpp connman/connmanagent.cpp agent.cpp
+
+HEADERS += connman/connmanmanager.h connman.h mainwindow.h technologylistwidget.h technologyitemwidget.h wirelesspage.h wiredpage.h networkitemwidget.h networklistwidget.h connman/connmanservice.h service.h connman/connmantechnology.h technology.h authdialog.h hiddennetworkdialog.h ipv4widget.h connman/connmanagent.h agent.h
diff --git a/technology.cpp → src/technology.cpp b/technology.cpp → src/technology.cpp
@@ -1,6 +1,6 @@
 #include "technology.h"
 
-#include <connman/connmantechnology.h>
+#include <dbus/connmantechnology.h>
 
 Technology::Technology(const QString &path, QObject *parent):
     QObject(parent)

diff --git a/technology.h → src/technology.h b/technology.h → src/technology.h
diff --git a/technologyitemwidget.cpp → src/technologyitemwidget.cpp b/technologyitemwidget.cpp → src/technologyitemwidget.cpp
diff --git a/technologyitemwidget.h → src/technologyitemwidget.h b/technologyitemwidget.h → src/technologyitemwidget.h
diff --git a/technologylistwidget.cpp → src/technologylistwidget.cpp b/technologylistwidget.cpp → src/technologylistwidget.cpp
diff --git a/technologylistwidget.h → src/technologylistwidget.h b/technologylistwidget.h → src/technologylistwidget.h
diff --git a/wiredpage.cpp → src/wiredpage.cpp b/wiredpage.cpp → src/wiredpage.cpp
diff --git a/wiredpage.h → src/wiredpage.h b/wiredpage.h → src/wiredpage.h
diff --git a/wirelesspage.cpp → src/wirelesspage.cpp b/wirelesspage.cpp → src/wirelesspage.cpp
@@ -5,7 +5,7 @@
 #include "technology.h"
 #include "hiddennetworkdialog.h"
 
-#include <connman/connmanservice.h>
+#include <dbus/connmanservice.h>
 
 #include <QDebug>
 

diff --git a/wirelesspage.h → src/wirelesspage.h b/wirelesspage.h → src/wirelesspage.h
diff --git a/authdialog.ui → ui/authdialog.ui b/authdialog.ui → ui/authdialog.ui
diff --git a/hiddennetworkdialog.ui → ui/hiddennetworkdialog.ui b/hiddennetworkdialog.ui → ui/hiddennetworkdialog.ui
diff --git a/ipv4widget.ui → ui/ipv4widget.ui b/ipv4widget.ui → ui/ipv4widget.ui
diff --git a/mainwindow.ui → ui/mainwindow.ui b/mainwindow.ui → ui/mainwindow.ui
diff --git a/networkitemwidget.ui → ui/networkitemwidget.ui b/networkitemwidget.ui → ui/networkitemwidget.ui
diff --git a/technologyitemwidget.ui → ui/technologyitemwidget.ui b/technologyitemwidget.ui → ui/technologyitemwidget.ui
diff --git a/ui/ui.pri b/ui/ui.pri
@@ -0,0 +1,8 @@
+FORMS += $$PWD/mainwindow.ui \
+  $$PWD/technologyitemwidget.ui \
+  $$PWD/wirelesspage.ui \
+  $$PWD/wiredpage.ui \
+  $$PWD/networkitemwidget.ui \
+  $$PWD/ipv4widget.ui \
+  $$PWD/authdialog.ui \
+  $$PWD/hiddennetworkdialog.ui
diff --git a/wiredpage.ui → ui/wiredpage.ui b/wiredpage.ui → ui/wiredpage.ui
diff --git a/wirelesspage.ui → ui/wirelesspage.ui b/wirelesspage.ui → ui/wirelesspage.ui