From efced3781c708fff1ad5c421d66054bd47aac175 Mon Sep 17 00:00:00 2001 From: Xian Nox Date: Mon, 16 Dec 2013 10:34:48 +0100 Subject: [PATCH] Changed folder structure --- {debian => build/debian}/changelog | 0 {debian => build/debian}/compat | 0 {debian => build/debian}/control | 0 {debian => build/debian}/copyright | 0 {debian => build/debian}/docs | 0 {debian => build/debian}/rules | 0 {debian => build/debian}/source/format | 0 {rpmbuild => build/rpmbuild}/VitaMTP.spec | 0 {rpmbuild => build/rpmbuild}/VitaMTP64.spec | 0 {rpmbuild => build/rpmbuild}/qcma.spec | 0 {rpmbuild => build/rpmbuild}/qcma64.spec | 0 filterlineedit.cpp | 2 +- qcma.pro | 109 +++++++++--------- qcmares.qrc | 11 -- .../edit-clear-locationbar-rtl.png | Bin resources/{ => images}/psv_icon.png | Bin resources/{ => images}/psv_icon_16.png | Bin resources/{ => images}/qcma.icns | Bin resources/{ => images}/qcma.ico | Bin resources/{ => images}/qcma.png | Bin qcma.desktop => resources/qcma.desktop | 0 qcma.rc => resources/qcma.rc | 0 resources/qcmares.qrc | 11 ++ resources/{ => xml}/psp2-updatelist.xml | 0 avdecoder.cpp => src/avdecoder.cpp | 0 avdecoder.h => src/avdecoder.h | 0 capability.cpp => src/capability.cpp | 0 capability.h => src/capability.h | 0 clientmanager.cpp => src/clientmanager.cpp | 2 +- clientmanager.h => src/clientmanager.h | 4 +- cmabroadcast.cpp => src/cmabroadcast.cpp | 0 cmabroadcast.h => src/cmabroadcast.h | 0 cmaclient.cpp => src/cmaclient.cpp | 0 cmaclient.h => src/cmaclient.h | 0 cmaevent.cpp => src/cmaevent.cpp | 0 cmaevent.h => src/cmaevent.h | 0 cmaobject.cpp => src/cmaobject.cpp | 0 cmaobject.h => src/cmaobject.h | 0 cmarootobject.cpp => src/cmarootobject.cpp | 0 cmarootobject.h => src/cmarootobject.h | 0 database.cpp => src/database.cpp | 0 database.h => src/database.h | 0 backupitem.cpp => src/forms/backupitem.cpp | 2 +- backupitem.h => src/forms/backupitem.h | 0 backupitem.ui => src/forms/backupitem.ui | 0 .../forms/backupmanagerform.cpp | 6 +- .../forms/backupmanagerform.h | 2 +- .../forms/backupmanagerform.ui | 0 .../forms/configwidget.cpp | 0 configwidget.h => src/forms/configwidget.h | 0 configwidget.ui => src/forms/configwidget.ui | 0 .../forms/confirmdialog.cpp | 0 confirmdialog.h => src/forms/confirmdialog.h | 0 .../forms/confirmdialog.ui | 0 pinform.cpp => src/forms/pinform.cpp | 0 pinform.h => src/forms/pinform.h | 0 pinform.ui => src/forms/pinform.ui | 0 .../forms/progressform.cpp | 0 progressform.h => src/forms/progressform.h | 0 progressform.ui => src/forms/progressform.ui | 0 main.cpp => src/main.cpp | 0 mainwidget.cpp => src/mainwidget.cpp | 6 +- mainwidget.h => src/mainwidget.h | 8 +- sforeader.cpp => src/sforeader.cpp | 0 sforeader.h => src/sforeader.h | 0 .../singleapplication.cpp | 0 .../singleapplication.h | 0 utils.cpp => src/utils.cpp | 0 utils.h => src/utils.h | 0 69 files changed, 83 insertions(+), 80 deletions(-) rename {debian => build/debian}/changelog (100%) rename {debian => build/debian}/compat (100%) rename {debian => build/debian}/control (100%) rename {debian => build/debian}/copyright (100%) rename {debian => build/debian}/docs (100%) rename {debian => build/debian}/rules (100%) rename {debian => build/debian}/source/format (100%) rename {rpmbuild => build/rpmbuild}/VitaMTP.spec (100%) rename {rpmbuild => build/rpmbuild}/VitaMTP64.spec (100%) rename {rpmbuild => build/rpmbuild}/qcma.spec (100%) rename {rpmbuild => build/rpmbuild}/qcma64.spec (100%) delete mode 100644 qcmares.qrc rename resources/{ => images}/edit-clear-locationbar-rtl.png (100%) rename resources/{ => images}/psv_icon.png (100%) rename resources/{ => images}/psv_icon_16.png (100%) rename resources/{ => images}/qcma.icns (100%) rename resources/{ => images}/qcma.ico (100%) rename resources/{ => images}/qcma.png (100%) rename qcma.desktop => resources/qcma.desktop (100%) rename qcma.rc => resources/qcma.rc (100%) create mode 100644 resources/qcmares.qrc rename resources/{ => xml}/psp2-updatelist.xml (100%) rename avdecoder.cpp => src/avdecoder.cpp (100%) rename avdecoder.h => src/avdecoder.h (100%) rename capability.cpp => src/capability.cpp (100%) rename capability.h => src/capability.h (100%) rename clientmanager.cpp => src/clientmanager.cpp (99%) rename clientmanager.h => src/clientmanager.h (96%) rename cmabroadcast.cpp => src/cmabroadcast.cpp (100%) rename cmabroadcast.h => src/cmabroadcast.h (100%) rename cmaclient.cpp => src/cmaclient.cpp (100%) rename cmaclient.h => src/cmaclient.h (100%) rename cmaevent.cpp => src/cmaevent.cpp (100%) rename cmaevent.h => src/cmaevent.h (100%) rename cmaobject.cpp => src/cmaobject.cpp (100%) rename cmaobject.h => src/cmaobject.h (100%) rename cmarootobject.cpp => src/cmarootobject.cpp (100%) rename cmarootobject.h => src/cmarootobject.h (100%) rename database.cpp => src/database.cpp (100%) rename database.h => src/database.h (100%) rename backupitem.cpp => src/forms/backupitem.cpp (99%) rename backupitem.h => src/forms/backupitem.h (100%) rename backupitem.ui => src/forms/backupitem.ui (100%) rename backupmanagerform.cpp => src/forms/backupmanagerform.cpp (98%) rename backupmanagerform.h => src/forms/backupmanagerform.h (98%) rename backupmanagerform.ui => src/forms/backupmanagerform.ui (100%) rename configwidget.cpp => src/forms/configwidget.cpp (100%) rename configwidget.h => src/forms/configwidget.h (100%) rename configwidget.ui => src/forms/configwidget.ui (100%) rename confirmdialog.cpp => src/forms/confirmdialog.cpp (100%) rename confirmdialog.h => src/forms/confirmdialog.h (100%) rename confirmdialog.ui => src/forms/confirmdialog.ui (100%) rename pinform.cpp => src/forms/pinform.cpp (100%) rename pinform.h => src/forms/pinform.h (100%) rename pinform.ui => src/forms/pinform.ui (100%) rename progressform.cpp => src/forms/progressform.cpp (100%) rename progressform.h => src/forms/progressform.h (100%) rename progressform.ui => src/forms/progressform.ui (100%) rename main.cpp => src/main.cpp (100%) rename mainwidget.cpp => src/mainwidget.cpp (96%) rename mainwidget.h => src/mainwidget.h (94%) rename sforeader.cpp => src/sforeader.cpp (100%) rename sforeader.h => src/sforeader.h (100%) rename singleapplication.cpp => src/singleapplication.cpp (100%) rename singleapplication.h => src/singleapplication.h (100%) rename utils.cpp => src/utils.cpp (100%) rename utils.h => src/utils.h (100%) diff --git a/debian/changelog b/build/debian/changelog similarity index 100% rename from debian/changelog rename to build/debian/changelog diff --git a/debian/compat b/build/debian/compat similarity index 100% rename from debian/compat rename to build/debian/compat diff --git a/debian/control b/build/debian/control similarity index 100% rename from debian/control rename to build/debian/control diff --git a/debian/copyright b/build/debian/copyright similarity index 100% rename from debian/copyright rename to build/debian/copyright diff --git a/debian/docs b/build/debian/docs similarity index 100% rename from debian/docs rename to build/debian/docs diff --git a/debian/rules b/build/debian/rules similarity index 100% rename from debian/rules rename to build/debian/rules diff --git a/debian/source/format b/build/debian/source/format similarity index 100% rename from debian/source/format rename to build/debian/source/format diff --git a/rpmbuild/VitaMTP.spec b/build/rpmbuild/VitaMTP.spec similarity index 100% rename from rpmbuild/VitaMTP.spec rename to build/rpmbuild/VitaMTP.spec diff --git a/rpmbuild/VitaMTP64.spec b/build/rpmbuild/VitaMTP64.spec similarity index 100% rename from rpmbuild/VitaMTP64.spec rename to build/rpmbuild/VitaMTP64.spec diff --git a/rpmbuild/qcma.spec b/build/rpmbuild/qcma.spec similarity index 100% rename from rpmbuild/qcma.spec rename to build/rpmbuild/qcma.spec diff --git a/rpmbuild/qcma64.spec b/build/rpmbuild/qcma64.spec similarity index 100% rename from rpmbuild/qcma64.spec rename to build/rpmbuild/qcma64.spec diff --git a/filterlineedit.cpp b/filterlineedit.cpp index 8d23741..62b5e54 100644 --- a/filterlineedit.cpp +++ b/filterlineedit.cpp @@ -26,7 +26,7 @@ FilterLineEdit::FilterLineEdit(QWidget *parent) : QLineEdit(parent) { clearButton = new QToolButton(this); - QIcon clearIcon(":/main/resources/edit-clear-locationbar-rtl.png"); + QIcon clearIcon(":/main/images/edit-clear-locationbar-rtl.png"); clearButton->setIcon(clearIcon); clearButton->setCursor(Qt::ArrowCursor); clearButton->setStyleSheet("border:none;padding:0px"); diff --git a/qcma.pro b/qcma.pro index 34e7ebc..46e95b9 100644 --- a/qcma.pro +++ b/qcma.pro @@ -13,49 +13,51 @@ TARGET = qcma TEMPLATE = app -SOURCES += main.cpp \ - capability.cpp \ - database.cpp \ - cmaobject.cpp \ - cmarootobject.cpp \ - utils.cpp \ - mainwidget.cpp \ - configwidget.cpp \ - singleapplication.cpp \ - sforeader.cpp \ - cmaclient.cpp \ - cmabroadcast.cpp \ - avdecoder.cpp \ - cmaevent.cpp \ - clientmanager.cpp \ - backupmanagerform.cpp \ - backupitem.cpp \ - confirmdialog.cpp \ - progressform.cpp \ - pinform.cpp \ - filterlineedit.cpp +SOURCES += src/main.cpp \ + src/capability.cpp \ + src/database.cpp \ + src/cmaobject.cpp \ + src/cmarootobject.cpp \ + src/utils.cpp \ + src/mainwidget.cpp \ + src/singleapplication.cpp \ + src/sforeader.cpp \ + src/cmaclient.cpp \ + src/cmabroadcast.cpp \ + src/avdecoder.cpp \ + src/cmaevent.cpp \ + src/clientmanager.cpp \ + filterlineedit.cpp \ +# forms + src/forms/backupitem.cpp \ + src/forms/backupmanagerform.cpp \ + src/forms/configwidget.cpp \ + src/forms/confirmdialog.cpp \ + src/forms/pinform.cpp \ + src/forms/progressform.cpp HEADERS += \ - capability.h \ - database.h \ - cmaobject.h \ - cmarootobject.h \ - utils.h \ - mainwidget.h \ - configwidget.h \ - singleapplication.h \ - sforeader.h \ - cmaclient.h \ - cmabroadcast.h \ - avdecoder.h \ - cmaevent.h \ - clientmanager.h \ - backupmanagerform.h \ - backupitem.h \ - confirmdialog.h \ - progressform.h \ - pinform.h \ - filterlineedit.h + src/capability.h \ + src/database.h \ + src/cmaobject.h \ + src/cmarootobject.h \ + src/utils.h \ + src/mainwidget.h \ + src/singleapplication.h \ + src/sforeader.h \ + src/cmaclient.h \ + src/cmabroadcast.h \ + src/avdecoder.h \ + src/cmaevent.h \ + src/clientmanager.h \ + filterlineedit.h \ +# forms + src/forms/backupitem.h \ + src/forms/backupmanagerform.h \ + src/forms/configwidget.h \ + src/forms/confirmdialog.h \ + src/forms/pinform.h \ + src/forms/progressform.h CONFIG += link_pkgconfig PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale @@ -63,24 +65,25 @@ PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale QMAKE_CXXFLAGS += -Wno-write-strings -Wall -D__STDC_CONSTANT_MACROS RESOURCES += \ - qcmares.qrc + resources/qcmares.qrc OTHER_FILES += \ - resources/psp2-updatelist.xml \ - resources/psv_icon.png \ + resources/xml/psp2-updatelist.xml \ + resources/images/psv_icon.png \ README.md \ - qcma.desktop \ - qcma.rc + resources/qcma.desktop \ + resources/qcma.rc FORMS += \ - configwidget.ui \ - backupmanagerform.ui \ - backupitem.ui \ - confirmdialog.ui \ - progressform.ui \ - pinform.ui + src/forms/configwidget.ui \ + src/forms/backupmanagerform.ui \ + src/forms/backupitem.ui \ + src/forms/confirmdialog.ui \ + src/forms/progressform.ui \ + src/forms/pinform.ui -TRANSLATIONS += resources/translations/qcma.es.ts \ +TRANSLATIONS += \ + resources/translations/qcma.es.ts \ resources/translations/qcma.ja.ts VERSION = \\\"'0.2.4'\\\" diff --git a/qcmares.qrc b/qcmares.qrc deleted file mode 100644 index 7e5a977..0000000 --- a/qcmares.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - resources/psp2-updatelist.xml - resources/psv_icon.png - resources/translations/qcma.es.qm - resources/translations/qcma.ja.qm - resources/psv_icon_16.png - resources/qcma.png - resources/edit-clear-locationbar-rtl.png - - diff --git a/resources/edit-clear-locationbar-rtl.png b/resources/images/edit-clear-locationbar-rtl.png similarity index 100% rename from resources/edit-clear-locationbar-rtl.png rename to resources/images/edit-clear-locationbar-rtl.png diff --git a/resources/psv_icon.png b/resources/images/psv_icon.png similarity index 100% rename from resources/psv_icon.png rename to resources/images/psv_icon.png diff --git a/resources/psv_icon_16.png b/resources/images/psv_icon_16.png similarity index 100% rename from resources/psv_icon_16.png rename to resources/images/psv_icon_16.png diff --git a/resources/qcma.icns b/resources/images/qcma.icns similarity index 100% rename from resources/qcma.icns rename to resources/images/qcma.icns diff --git a/resources/qcma.ico b/resources/images/qcma.ico similarity index 100% rename from resources/qcma.ico rename to resources/images/qcma.ico diff --git a/resources/qcma.png b/resources/images/qcma.png similarity index 100% rename from resources/qcma.png rename to resources/images/qcma.png diff --git a/qcma.desktop b/resources/qcma.desktop similarity index 100% rename from qcma.desktop rename to resources/qcma.desktop diff --git a/qcma.rc b/resources/qcma.rc similarity index 100% rename from qcma.rc rename to resources/qcma.rc diff --git a/resources/qcmares.qrc b/resources/qcmares.qrc new file mode 100644 index 0000000..1576176 --- /dev/null +++ b/resources/qcmares.qrc @@ -0,0 +1,11 @@ + + + xml/psp2-updatelist.xml + translations/qcma.es.qm + translations/qcma.ja.qm + images/psv_icon.png + images/psv_icon_16.png + images/qcma.png + images/edit-clear-locationbar-rtl.png + + diff --git a/resources/psp2-updatelist.xml b/resources/xml/psp2-updatelist.xml similarity index 100% rename from resources/psp2-updatelist.xml rename to resources/xml/psp2-updatelist.xml diff --git a/avdecoder.cpp b/src/avdecoder.cpp similarity index 100% rename from avdecoder.cpp rename to src/avdecoder.cpp diff --git a/avdecoder.h b/src/avdecoder.h similarity index 100% rename from avdecoder.h rename to src/avdecoder.h diff --git a/capability.cpp b/src/capability.cpp similarity index 100% rename from capability.cpp rename to src/capability.cpp diff --git a/capability.h b/src/capability.h similarity index 100% rename from capability.h rename to src/capability.h diff --git a/clientmanager.cpp b/src/clientmanager.cpp similarity index 99% rename from clientmanager.cpp rename to src/clientmanager.cpp index 881d20e..e43e7a3 100644 --- a/clientmanager.cpp +++ b/src/clientmanager.cpp @@ -18,9 +18,9 @@ */ #include "clientmanager.h" -#include "progressform.h" #include "cmaclient.h" #include "utils.h" +#include "forms/progressform.h" #include diff --git a/clientmanager.h b/src/clientmanager.h similarity index 96% rename from clientmanager.h rename to src/clientmanager.h index c5cff10..9ff8792 100644 --- a/clientmanager.h +++ b/src/clientmanager.h @@ -20,9 +20,9 @@ #ifndef CLIENTMANAGER_H #define CLIENTMANAGER_H -#include "pinform.h" #include "database.h" -#include "progressform.h" +#include "forms/pinform.h" +#include "forms/progressform.h" #include #include diff --git a/cmabroadcast.cpp b/src/cmabroadcast.cpp similarity index 100% rename from cmabroadcast.cpp rename to src/cmabroadcast.cpp diff --git a/cmabroadcast.h b/src/cmabroadcast.h similarity index 100% rename from cmabroadcast.h rename to src/cmabroadcast.h diff --git a/cmaclient.cpp b/src/cmaclient.cpp similarity index 100% rename from cmaclient.cpp rename to src/cmaclient.cpp diff --git a/cmaclient.h b/src/cmaclient.h similarity index 100% rename from cmaclient.h rename to src/cmaclient.h diff --git a/cmaevent.cpp b/src/cmaevent.cpp similarity index 100% rename from cmaevent.cpp rename to src/cmaevent.cpp diff --git a/cmaevent.h b/src/cmaevent.h similarity index 100% rename from cmaevent.h rename to src/cmaevent.h diff --git a/cmaobject.cpp b/src/cmaobject.cpp similarity index 100% rename from cmaobject.cpp rename to src/cmaobject.cpp diff --git a/cmaobject.h b/src/cmaobject.h similarity index 100% rename from cmaobject.h rename to src/cmaobject.h diff --git a/cmarootobject.cpp b/src/cmarootobject.cpp similarity index 100% rename from cmarootobject.cpp rename to src/cmarootobject.cpp diff --git a/cmarootobject.h b/src/cmarootobject.h similarity index 100% rename from cmarootobject.h rename to src/cmarootobject.h diff --git a/database.cpp b/src/database.cpp similarity index 100% rename from database.cpp rename to src/database.cpp diff --git a/database.h b/src/database.h similarity index 100% rename from database.h rename to src/database.h diff --git a/backupitem.cpp b/src/forms/backupitem.cpp similarity index 99% rename from backupitem.cpp rename to src/forms/backupitem.cpp index 810c92a..901dade 100644 --- a/backupitem.cpp +++ b/src/forms/backupitem.cpp @@ -19,7 +19,7 @@ #include "backupitem.h" #include "ui_backupitem.h" -#include "utils.h" +#include "../utils.h" #include #include diff --git a/backupitem.h b/src/forms/backupitem.h similarity index 100% rename from backupitem.h rename to src/forms/backupitem.h diff --git a/backupitem.ui b/src/forms/backupitem.ui similarity index 100% rename from backupitem.ui rename to src/forms/backupitem.ui diff --git a/backupmanagerform.cpp b/src/forms/backupmanagerform.cpp similarity index 98% rename from backupmanagerform.cpp rename to src/forms/backupmanagerform.cpp index d50f9c5..29bf6a8 100644 --- a/backupmanagerform.cpp +++ b/src/forms/backupmanagerform.cpp @@ -19,10 +19,10 @@ #include "backupmanagerform.h" #include "ui_backupmanagerform.h" -#include "cmaobject.h" -#include "sforeader.h" +#include "../cmaobject.h" +#include "../sforeader.h" #include "confirmdialog.h" -#include "utils.h" +#include "../utils.h" #include "filterlineedit.h" #include diff --git a/backupmanagerform.h b/src/forms/backupmanagerform.h similarity index 98% rename from backupmanagerform.h rename to src/forms/backupmanagerform.h index e09fef7..b78ab77 100644 --- a/backupmanagerform.h +++ b/src/forms/backupmanagerform.h @@ -20,7 +20,7 @@ #ifndef BACKUPMANAGERFORM_H #define BACKUPMANAGERFORM_H -#include "database.h" +#include "../database.h" #include "backupitem.h" #include diff --git a/backupmanagerform.ui b/src/forms/backupmanagerform.ui similarity index 100% rename from backupmanagerform.ui rename to src/forms/backupmanagerform.ui diff --git a/configwidget.cpp b/src/forms/configwidget.cpp similarity index 100% rename from configwidget.cpp rename to src/forms/configwidget.cpp diff --git a/configwidget.h b/src/forms/configwidget.h similarity index 100% rename from configwidget.h rename to src/forms/configwidget.h diff --git a/configwidget.ui b/src/forms/configwidget.ui similarity index 100% rename from configwidget.ui rename to src/forms/configwidget.ui diff --git a/confirmdialog.cpp b/src/forms/confirmdialog.cpp similarity index 100% rename from confirmdialog.cpp rename to src/forms/confirmdialog.cpp diff --git a/confirmdialog.h b/src/forms/confirmdialog.h similarity index 100% rename from confirmdialog.h rename to src/forms/confirmdialog.h diff --git a/confirmdialog.ui b/src/forms/confirmdialog.ui similarity index 100% rename from confirmdialog.ui rename to src/forms/confirmdialog.ui diff --git a/pinform.cpp b/src/forms/pinform.cpp similarity index 100% rename from pinform.cpp rename to src/forms/pinform.cpp diff --git a/pinform.h b/src/forms/pinform.h similarity index 100% rename from pinform.h rename to src/forms/pinform.h diff --git a/pinform.ui b/src/forms/pinform.ui similarity index 100% rename from pinform.ui rename to src/forms/pinform.ui diff --git a/progressform.cpp b/src/forms/progressform.cpp similarity index 100% rename from progressform.cpp rename to src/forms/progressform.cpp diff --git a/progressform.h b/src/forms/progressform.h similarity index 100% rename from progressform.h rename to src/forms/progressform.h diff --git a/progressform.ui b/src/forms/progressform.ui similarity index 100% rename from progressform.ui rename to src/forms/progressform.ui diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/mainwidget.cpp b/src/mainwidget.cpp similarity index 96% rename from mainwidget.cpp rename to src/mainwidget.cpp index efd08b3..af518b6 100644 --- a/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -119,7 +119,7 @@ void MainWidget::showAboutDialog() about.setWindowTitle(tr("About QCMA")); about.setInformativeText(tr("Copyright (C) 2013 Codestation") + "\n"); about.setStandardButtons(QMessageBox::Ok); - about.setIconPixmap(QPixmap(":/main/resources/qcma.png")); + about.setIconPixmap(QPixmap(":/main/images/qcma.png")); about.setDefaultButton(QMessageBox::Ok); // hack to expand the messagebox minimum size @@ -164,9 +164,9 @@ void MainWidget::createTrayIcon() trayIcon = new QSystemTrayIcon(this); trayIcon->setContextMenu(trayIconMenu); #ifndef Q_OS_WIN32 - trayIcon->setIcon(QIcon(":/main/resources/psv_icon.png")); + trayIcon->setIcon(QIcon(":/main/images/psv_icon.png")); #else - trayIcon->setIcon(QIcon(":/main/resources/psv_icon_16.png")); + trayIcon->setIcon(QIcon(":/main/images/psv_icon_16.png")); #endif trayIcon->show(); // try to avoid the iconTray Qt bug diff --git a/mainwidget.h b/src/mainwidget.h similarity index 94% rename from mainwidget.h rename to src/mainwidget.h index 696b250..d877a1e 100644 --- a/mainwidget.h +++ b/src/mainwidget.h @@ -20,11 +20,11 @@ #ifndef MAINWIDGET_H #define MAINWIDGET_H -#include "configwidget.h" -#include "clientmanager.h" -#include "backupmanagerform.h" #include "cmaclient.h" -#include "progressform.h" +#include "clientmanager.h" +#include "forms/configwidget.h" +#include "forms/backupmanagerform.h" +#include "forms/progressform.h" #include #include diff --git a/sforeader.cpp b/src/sforeader.cpp similarity index 100% rename from sforeader.cpp rename to src/sforeader.cpp diff --git a/sforeader.h b/src/sforeader.h similarity index 100% rename from sforeader.h rename to src/sforeader.h diff --git a/singleapplication.cpp b/src/singleapplication.cpp similarity index 100% rename from singleapplication.cpp rename to src/singleapplication.cpp diff --git a/singleapplication.h b/src/singleapplication.h similarity index 100% rename from singleapplication.h rename to src/singleapplication.h diff --git a/utils.cpp b/src/utils.cpp similarity index 100% rename from utils.cpp rename to src/utils.cpp diff --git a/utils.h b/src/utils.h similarity index 100% rename from utils.h rename to src/utils.h