Changeset 318:6704a54871cf in SMSSender


Ignore:
Timestamp:
Feb 9, 2014 4:17:26 PM (8 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
separation-frontend-backend
Message:
  • Flattens gateways/Schoolnet/gui/ui/.
Location:
gateways/Schoolnet
Files:
8 edited
17 moved

Legend:

Unmodified
Added
Removed
  • gateways/Schoolnet/business/deepthought/daemon_deepthought.cpp

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "deepthought_daemons.h"
     18#include "daemons.h"
    1919
    20 #include "gateways/Schoolnet/business/deepthought/deepthought_tasks.h"
     20#include "gateways/Schoolnet/business/account.h"
    2121#include "gateways/Schoolnet/business/deepthought/questionmanager.h"
    22 #include "gateways/Schoolnet/business/account.h"
     22#include "gateways/Schoolnet/business/deepthought/tasks.h"
    2323#include "gateways/Schoolnet/business/gateway.h"
    2424
  • gateways/Schoolnet/business/deepthought/daemon_schoolnet.cpp

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #include "deepthought_daemons.h"
     18#include "daemons.h"
    1919
     20#include "gateways/Schoolnet/business/account.h"
    2021#include "gateways/Schoolnet/business/deepthought/datatypes.h"
    2122#include "gateways/Schoolnet/business/deepthought/deepthoughthelper.h"
    22 #include "gateways/Schoolnet/business/deepthought/deepthought_tasks.h"
    2323#include "gateways/Schoolnet/business/deepthought/questionmanager.h"
    24 #include "gateways/Schoolnet/business/account.h"
     24#include "gateways/Schoolnet/business/deepthought/tasks.h"
    2525
    2626namespace Schoolnet {
  • gateways/Schoolnet/business/deepthought/daemons.h

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef DEEPTHOUGHT_DAEMONS_H_
    19 #define DEEPTHOUGHT_DAEMONS_H_
     18#ifndef SCHOOLNET_DEEPTHOUGHT_DAEMONS_H
     19#define SCHOOLNET_DEEPTHOUGHT_DAEMONS_H
    2020
    2121#include <QPointer>
     
    107107} // namespace Schoolnet
    108108
    109 #endif /* DEEPTHOUGHT_DAEMONS_H_ */
     109#endif /* SCHOOLNET_DEEPTHOUGHT_DAEMONS_H */
  • gateways/Schoolnet/business/deepthought/deepthoughthelper.cpp

    r316 r318  
    2323
    2424#include "common/domain/stask.h"
    25 #include "gateways/Schoolnet/business/deepthought/deepthought_daemons.h"
     25#include "gateways/Schoolnet/business/deepthought/daemons.h"
    2626#include "gateways/Schoolnet/business/deepthought/questionmanager.h"
    2727#include "gateways/Schoolnet/business/gateway.h"
  • gateways/Schoolnet/business/deepthought/deepthoughthelper.h

    r316 r318  
    2727#include "gateways/Schoolnet/business/account.h"
    2828#include "gateways/Schoolnet/business/deepthought/datatypes.h"
    29 #include "gateways/Schoolnet/business/deepthought/deepthought_daemons.h"
     29#include "gateways/Schoolnet/business/deepthought/daemons.h"
    3030
    3131class SNetworkHelper;
  • gateways/Schoolnet/business/deepthought/task_answertodeepthougth.cpp

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #include "deepthought_tasks.h"
     18#include "tasks.h"
    1919
    2020#include "common/exceptions/enetworkexception.h"
  • gateways/Schoolnet/business/deepthought/task_answertoschoolnet.cpp

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 #include "deepthought_tasks.h"
     18#include "tasks.h"
    1919
    2020#include <QWebFrame>
  • gateways/Schoolnet/business/deepthought/task_check_questionstatus_at_schoolnet.cpp

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #include "deepthought_tasks.h"
     18#include "tasks.h"
    2019
    2120#include "common/business/iaccount_tasks.h"
  • gateways/Schoolnet/business/deepthought/task_fetchdatafromdeepthought.cpp

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #include "deepthought_tasks.h"
     18#include "tasks.h"
    2019
    2120#include <QDateTime>
  • gateways/Schoolnet/business/deepthought/tasks.h

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717*/
    18 
    19 #ifndef DEEPTHOUGHT_TASKS_H_
    20 #define DEEPTHOUGHT_TASKS_H_
     18#ifndef SCHOOLNET_DEEPTHOUGHT_TASKS_H
     19#define SCHOOLNET_DEEPTHOUGHT_TASKS_H
    2120
    2221class QDomElement;
     
    161160} // namespace Schoolnet
    162161
    163 #endif /* DEEPTHOUGHT_TASKS_H_ */
     162#endif /* SCHOOLNET_DEEPTHOUGHT_TASKS_H */
  • gateways/Schoolnet/gui/business/gateway.cpp

    r316 r318  
    1818#include "gateways/Schoolnet/business/gateway.h"
    1919
    20 #include "gateways/Schoolnet/gui/ui/widgets/settings/settingswidget.h"
     20#include "gateways/Schoolnet/gui/ui/widgets/settingswidget.h"
    2121
    2222namespace Schoolnet {
  • gateways/Schoolnet/gui/schoolnet-gui.pro

    r315 r318  
    1919    ui/models/questionsortmodel.h \
    2020    ui/models/questiontreemodel.h \
    21     ui/questionlist/questionlist.h \
    22     ui/widgets/questionbox/questionbox.h \
    23     ui/widgets/settings/settingswidget.h \
     21    ui/questionlist.h \
     22    ui/widgets/questionbox.h \
     23    ui/widgets/settingswidget.h \
    2424    ui/questionlistintegration.h \
    2525    ui/senddialogintegration.h \
     
    3232    ui/models/questionsortmodel.cpp \
    3333    ui/models/questiontreemodel.cpp \
    34     ui/questionlist/questionlist.cpp \
    35     ui/widgets/questionbox/questionbox.cpp \
    36     ui/widgets/settings/settingswidget.cpp \
     34    ui/questionlist.cpp \
     35    ui/widgets/questionbox.cpp \
     36    ui/widgets/settingswidget.cpp \
    3737    ui/questionlistintegration.cpp \
    3838    ui/senddialogintegration.cpp \
     
    4242
    4343FORMS += \
    44     ui/questionlist/questionlist.ui \
    45     ui/widgets/questionbox/questionbox.ui \
    46     ui/widgets/settings/settingswidget.ui
     44    ui/questionlist.ui \
     45    ui/widgets/questionbox.ui \
     46    ui/widgets/settingswidget.ui
    4747
    4848RESOURCES += lib/schoolnet-gui.qrc
  • gateways/Schoolnet/gui/ui/questionlist.h

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_VCQUESTIONLIST_H
    19 #define SCHOOLNET_VCQUESTIONLIST_H
     18#ifndef SCHOOLNET_GUI_UI_QUESTIONLIST_H
     19#define SCHOOLNET_GUI_UI_QUESTIONLIST_H
    2020
    2121#include "ui_questionlist.h"
     
    6262} // namespace Schoolnet
    6363
    64 #endif // SCHOOLNET_VCQUESTIONLIST_H
     64#endif // SCHOOLNET_GUI_UI_QUESTIONLIST_H
  • gateways/Schoolnet/gui/ui/questionlistintegration.cpp

    r316 r318  
    2222#include "gateways/Schoolnet/business/deepthought/deepthoughthelper.h"
    2323#include "gateways/Schoolnet/business/deepthought/questionmanager.h"
    24 #include "gateways/Schoolnet/gui/ui/questionlist/questionlist.h"
     24#include "gateways/Schoolnet/gui/ui/questionlist.h"
    2525
    2626namespace Schoolnet {
  • gateways/Schoolnet/gui/ui/senddialogintegration.h

    r316 r318  
    2424#include "common/business/iintegration.h"
    2525#include "gateways/Schoolnet/business/deepthought/deepthoughthelper.h"
    26 #include "gateways/Schoolnet/gui/ui/widgets/questionbox/questionbox.h"
     26#include "gateways/Schoolnet/gui/ui/widgets/questionbox.h"
    2727
    2828namespace Schoolnet {
  • gateways/Schoolnet/gui/ui/senddialogintegration_p.h

    r316 r318  
    2525#include "gateways/Schoolnet/business/deepthought/datatypes.h"
    2626#include "gateways/Schoolnet/business/deepthought/deepthoughthelper.h"
    27 #include "gateways/Schoolnet/gui/ui/widgets/questionbox/questionbox.h"
     27#include "gateways/Schoolnet/gui/ui/widgets/questionbox.h"
    2828
    2929namespace Schoolnet {
  • gateways/Schoolnet/gui/ui/widgets/questionbox.h

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_VCQUESTIONBOX_H
    19 #define SCHOOLNET_VCQUESTIONBOX_H
     18#ifndef SCHOOLNET_GUI_UI_WIDGETS_QUESTIONBOX_H
     19#define SCHOOLNET_GUI_UI_WIDGETS_QUESTIONBOX_H
    2020
    2121#include <QDialog>
     
    6767} // namespace Schoolnet
    6868
    69 #endif // SCHOOLNET_VCQUESTIONBOX_H
     69#endif // SCHOOLNET_GUI_UI_WIDGETS_QUESTIONBOX_H
  • gateways/Schoolnet/gui/ui/widgets/settingswidget.h

    r316 r318  
    1616 along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717 */
    18 #ifndef SCHOOLNET_VCSETTINGSWIDGET_H
    19 #define SCHOOLNET_VCSETTINGSWIDGET_H
     18#ifndef SCHOOLNET_GUI_UI_WIDGETS_SETTINGSWIDGET_H
     19#define SCHOOLNET_GUI_UI_WIDGETS_SETTINGSWIDGET_H
    2020
    2121#include "ui_settingswidget.h"
     
    5757} // namespace Schoolnet
    5858
    59 #endif // SCHOOLNET_VCSETTINGSWIDGET_H
     59#endif // SCHOOLNET_GUI_UI_WIDGETS_SETTINGSWIDGET_H
  • gateways/Schoolnet/schoolnet-base.pro

    r315 r318  
    1919    business/deepthought/datatypes.h \
    2020    business/deepthought/deepthoughthelper.h \
    21     business/deepthought/deepthought_daemons.h \
    22     business/deepthought/deepthought_tasks.h \
    2321    business/deepthought/questionmanager.h \
    2422    business/contactimporter/contactimporter_p.h \
     
    2927    persistence/accountstoragehelper.h \
    3028    business/account.h \
    31     business/contactimporter/contactimporter_base.h
     29    business/contactimporter/contactimporter_base.h \
     30    business/deepthought/daemons.h \
     31    business/deepthought/tasks.h
    3232SOURCES += \
    3333    business/deepthought/datatypes.cpp \
    3434    business/deepthought/deepthoughthelper.cpp \
    35     business/deepthought/deepthought_daemon_deepthought.cpp \
    36     business/deepthought/deepthought_daemon_schoolnet.cpp \
    37     business/deepthought/deepthought_task_answertodeepthougth.cpp \
    38     business/deepthought/deepthought_task_answertoschoolnet.cpp \
    39     business/deepthought/deepthought_task_check_questionstatus_at_schoolnet.cpp \
    40     business/deepthought/deepthought_task_fetchdatafromdeepthought.cpp \
    4135    business/deepthought/questionmanager.cpp \
    4236    network/httphelper.cpp \
     
    4842    persistence/accountstoragehelper.cpp \
    4943    business/account.cpp \
    50     business/contactimporter/contactimporter_base.cpp
     44    business/contactimporter/contactimporter_base.cpp \
     45    business/deepthought/daemon_deepthought.cpp \
     46    business/deepthought/daemon_schoolnet.cpp \
     47    business/deepthought/task_answertodeepthougth.cpp \
     48    business/deepthought/task_answertoschoolnet.cpp \
     49    business/deepthought/task_check_questionstatus_at_schoolnet.cpp \
     50    business/deepthought/task_fetchdatafromdeepthought.cpp
    5151RESOURCES += lib/schoolnet.qrc
Note: See TracChangeset for help on using the changeset viewer.