Refactors directory structure and file naming.

This commit is contained in:
mfreiholz 2016-02-02 15:01:48 +01:00
parent 5a5e4c7c78
commit cb5781cfdc
20 changed files with 61 additions and 59 deletions

View File

@ -8,28 +8,29 @@ TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
INCLUDEPATH += $$PWD/src INCLUDEPATH += $$PWD/src
INCLUDEPATH += $$PWD/include
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
SOURCES += \ SOURCES += \
src/ads/section_content.cpp \ src/API.cpp \
src/ads/ads.cpp \ src/ContainerWidget.cpp \
src/ads/section_widget.cpp \ src/SectionWidget.cpp \
src/ads/section_title_widget.cpp \ src/SectionContent.cpp \
src/ads/container_widget.cpp \ src/SectionTitleWidget.cpp \
src/ads/drop_overlay.cpp \ src/SectionContentWidget.cpp \
src/ads/floating_widget.cpp \ src/DropOverlay.cpp \
src/ads/section_content_widget.cpp src/FloatingWidget.cpp
HEADERS += \ HEADERS += \
src/ads/ads.h \ include/ads/API.h \
src/ads/container_widget.h \ include/ads/ContainerWidget.h \
src/ads/section_widget.h \ include/ads/SectionWidget.h \
src/ads/section_content.h \ include/ads/SectionContent.h \
src/ads/section_title_widget.h \ include/ads/SectionTitleWidget.h \
src/ads/section_content_widget.h \ include/ads/SectionContentWidget.h \
src/ads/drop_overlay.h \ include/ads/DropOverlay.h \
src/ads/floating_widget.h include/ads/FloatingWidget.h
RESOURCES += \ RESOURCES += \
res/ads.qrc res/ads.qrc

View File

@ -8,10 +8,10 @@
class QSplitter; class QSplitter;
class QMenu; class QMenu;
#include "ads.h" #include "ads/API.h"
#include "section_content.h" #include "ads/SectionContent.h"
#include "section_widget.h" #include "ads/SectionWidget.h"
#include "floating_widget.h" #include "ads/FloatingWidget.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -4,7 +4,7 @@
#include <QFrame> #include <QFrame>
#include <QRect> #include <QRect>
#include "ads.h" #include "ads/API.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -4,8 +4,8 @@
#include <QWidget> #include <QWidget>
#include <QFrame> #include <QFrame>
#include "ads.h" #include "ads/API.h"
#include "section_content.h" #include "ads/SectionContent.h"
class QBoxLayout; class QBoxLayout;

View File

@ -6,7 +6,7 @@
#include <QHash> #include <QHash>
#include <QSharedPointer> #include <QSharedPointer>
#include "ads.h" #include "ads/API.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -3,8 +3,8 @@
#include <QFrame> #include <QFrame>
#include "ads.h" #include "ads/API.h"
#include "section_content.h" #include "ads/SectionContent.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -3,8 +3,9 @@
#include <QFrame> #include <QFrame>
#include <QPoint> #include <QPoint>
#include "ads.h"
#include "section_content.h" #include "ads/API.h"
#include "ads/SectionContent.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -6,8 +6,8 @@
#include <QHash> #include <QHash>
#include <QFrame> #include <QFrame>
#include "ads.h" #include "ads/API.h"
#include "section_content.h" #include "ads/SectionContent.h"
class QBoxLayout; class QBoxLayout;
class QStackedLayout; class QStackedLayout;

View File

@ -1,9 +1,9 @@
#include "ads.h" #include "ads/API.h"
#include <QWidget> #include <QWidget>
#include <QSplitter> #include <QSplitter>
#include "container_widget.h" #include "ads/ContainerWidget.h"
const QString DragData::MIMETYPE = QString("qt/ads-dragdata"); const QString DragData::MIMETYPE = QString("qt/ads-dragdata");

View File

@ -1,4 +1,4 @@
#include "container_widget.h" #include "ads/ContainerWidget.h"
#include <QPaintEvent> #include <QPaintEvent>
#include <QPainter> #include <QPainter>

View File

@ -1,4 +1,4 @@
#include "drop_overlay.h" #include "ads/DropOverlay.h"
#include <QDebug> #include <QDebug>
#include <QPointer> #include <QPointer>

View File

@ -1,4 +1,4 @@
#include "floating_widget.h" #include "ads/FloatingWidget.h"
#include <QDebug> #include <QDebug>
#include <QBoxLayout> #include <QBoxLayout>
@ -7,9 +7,9 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QStyle> #include <QStyle>
#include "container_widget.h" #include "ads/ContainerWidget.h"
#include "section_title_widget.h" #include "ads/SectionTitleWidget.h"
#include "section_content_widget.h" #include "ads/SectionContentWidget.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -1,4 +1,4 @@
#include "section_content.h" #include "ads/SectionContent.h"
#include <QLabel> #include <QLabel>

View File

@ -1,4 +1,4 @@
#include "section_content_widget.h" #include "ads/SectionContentWidget.h"
#include <QBoxLayout> #include <QBoxLayout>

View File

@ -1,4 +1,4 @@
#include "section_title_widget.h" #include "ads/SectionTitleWidget.h"
#include <QDebug> #include <QDebug>
#include <QString> #include <QString>
@ -16,11 +16,11 @@
#include <QParallelAnimationGroup> #include <QParallelAnimationGroup>
#endif #endif
#include "drop_overlay.h" #include "ads/DropOverlay.h"
#include "section_content.h" #include "ads/SectionContent.h"
#include "section_widget.h" #include "ads/SectionWidget.h"
#include "floating_widget.h" #include "ads/FloatingWidget.h"
#include "container_widget.h" #include "ads/ContainerWidget.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -1,4 +1,4 @@
#include "section_widget.h" #include "ads/SectionWidget.h"
#include <QApplication> #include <QApplication>
#include <QBoxLayout> #include <QBoxLayout>
@ -14,12 +14,12 @@
#include <QGraphicsDropShadowEffect> #include <QGraphicsDropShadowEffect>
#endif #endif
#include "drop_overlay.h" #include "ads/DropOverlay.h"
#include "section_content.h" #include "ads/SectionContent.h"
#include "section_title_widget.h" #include "ads/SectionTitleWidget.h"
#include "section_content_widget.h" #include "ads/SectionContentWidget.h"
#include "floating_widget.h" #include "ads/FloatingWidget.h"
#include "container_widget.h" #include "ads/ContainerWidget.h"
ADS_NAMESPACE_BEGIN ADS_NAMESPACE_BEGIN

View File

@ -27,8 +27,8 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSyst
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem
else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem
INCLUDEPATH += $$PWD/../AdvancedDockingSystem/src INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include
DEPENDPATH += $$PWD/../AdvancedDockingSystem/src DEPENDPATH += $$PWD/../AdvancedDockingSystem/include
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/libAdvancedDockingSystem.a win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/libAdvancedDockingSystem.a
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/libAdvancedDockingSystem.a else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/libAdvancedDockingSystem.a

View File

@ -9,9 +9,9 @@
#include <QTreeView> #include <QTreeView>
#include <QFileSystemModel> #include <QFileSystemModel>
#include "ads/container_widget.h" #include "ads/ContainerWidget.h"
#include "ads/section_widget.h" #include "ads/SectionWidget.h"
#include "ads/section_content.h" #include "ads/SectionContent.h"
#include "icontitlewidget.h" #include "icontitlewidget.h"

View File

@ -2,7 +2,7 @@
#define MAINWINDOW_H #define MAINWINDOW_H
#include <QMainWindow> #include <QMainWindow>
#include "ads/ads.h" #include "ads/API.h"
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;