sagi/jce-manager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

headers fix

Browse source
This commit is contained in:
Liran BN 2014-10-15 11:55:12 +03:00
parent dd237a8093
commit 85e2ea645f
9 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main/CalendarTab/CalendarManager.h
View file

@ -1,13 +1,13 @@
#ifndef CALENDARMANAGER_H #ifndef CALENDARMANAGER_H
#define CALENDARMANAGER_H #define CALENDARMANAGER_H
#include "./src/jceData/Calendar/coursesSchedule/calendarPage.h" #include "../../src/jceData/Calendar/coursesSchedule/calendarPage.h"
#include "./src/jceData/Calendar/coursesSchedule/calendarSchedule.h" #include "../../src/jceData/Calendar/coursesSchedule/calendarSchedule.h"
#include "./src/jceData/Calendar/coursesSchedule/calendarDialog.h" #include "../../src/jceData/Calendar/coursesSchedule/calendarDialog.h"
#include "./src/jceData/CSV/csv_exporter.h" #include "../../src/jceData/CSV/csv_exporter.h"
#include "./src/jceData/Calendar/Exams/calendarExam.h" #include "../../src/jceData/Calendar/Exams/calendarExam.h"
#include "./src/jceData/Calendar/Exams/examDialog.h" #include "../../src/jceData/Calendar/Exams/examDialog.h"
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>

6
main/CourseTab/coursestablemanager.h
View file

@ -9,9 +9,9 @@
#include <QString> #include <QString>
#include <QMessageBox> #include <QMessageBox>
#include "./src/jceData/Grades/graph/gradegraph.h" #include "../../src/jceData/Grades/graph/gradegraph.h"
#include "./src/jceData/Grades/gradePage.h" #include "../../src/jceData/Grades/gradePage.h"
#include "./src/jceSettings/user.h" #include "../../src/jceSettings/user.h"
class coursesTableManager class coursesTableManager
{ {

6
main/LoginTab/loginhandler.h
View file

@ -8,9 +8,9 @@
#include <QPixmap> #include <QPixmap>
#include <QPushButton> #include <QPushButton>
#include "./src/jceSettings/jcelogin.h" #include "../../src/jceSettings/jcelogin.h"
#include "./src/appDatabase/savedata.h" #include "../../src/appDatabase/savedata.h"
#include "./main/jceWidgets/jcestatusbar.h" #include "../../main/jceWidgets/jcestatusbar.h"
class loginHandler : public QObject class loginHandler : public QObject

2
src/jceConnection/jcesslclient.h
View file

@ -11,7 +11,7 @@
#include <QNetworkConfigurationManager> #include <QNetworkConfigurationManager>
#include <QtNetwork/QNetworkInterface> #include <QtNetwork/QNetworkInterface>
#include "./main/jceWidgets/jcestatusbar.h" #include "../../main/jceWidgets/jcestatusbar.h"
#define packetSize 4096 //4k #define packetSize 4096 //4k
#define milisTimeOut 5000 //4 seconds #define milisTimeOut 5000 //4 seconds

3
src/jceData/Grades/graph/gradegraph.h
View file

@ -1,8 +1,7 @@
#ifndef GRADEGRAPH_H #ifndef GRADEGRAPH_H
#define GRADEGRAPH_H #define GRADEGRAPH_H
#include "./src/jceData/Grades/gradePage.h" #include "../gradePage.h"
#include "qcustomplot.h"
#include <QDialog> #include <QDialog>
namespace Ui { namespace Ui {

2
src/jceData/Grades/graph/gradegraph.ui
View file

@ -82,7 +82,7 @@
<customwidget> <customwidget>
<class>QCustomPlot</class> <class>QCustomPlot</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>src/jceData/Grades/graph/qcustomplot.h</header> <header>qcustomplot.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

2
src/jceSettings/jceLoginHtmlScripts.h
View file

@ -1,7 +1,7 @@
#ifndef JCELOGINHTMLSCRIPTS_H #ifndef JCELOGINHTMLSCRIPTS_H
#define JCELOGINHTMLSCRIPTS_H #define JCELOGINHTMLSCRIPTS_H
#include "./src/jceSettings/user.h" #include "../../src/jceSettings/user.h"
#define dst_host "yedion.jce.ac.il" #define dst_host "yedion.jce.ac.il"
#define dst_port 443 #define dst_port 443

14
src/jceSettings/jcelogin.cpp
View file

@ -38,7 +38,7 @@ int jceLogin::makeConnection()
returnMode = checkConnection(); //checking socket status. is connected? returnMode = checkConnection(); //checking socket status. is connected?
if (returnMode == false) if (returnMode == (int)false)
{ {
statusBar->setIconConnectionStatus(jceStatusBar::Connecting); statusBar->setIconConnectionStatus(jceStatusBar::Connecting);
if (JceConnector->makeConnect(dst_host,dst_port) == false) //couldnt make a connection if (JceConnector->makeConnect(dst_host,dst_port) == false) //couldnt make a connection
@ -47,19 +47,19 @@ int jceLogin::makeConnection()
returnMode = true; returnMode = true;
} }
if (returnMode == true) //connected to host if (returnMode == (int)true) //connected to host
{ {
statusBar->setIconConnectionStatus(jceStatusBar::Connected); statusBar->setIconConnectionStatus(jceStatusBar::Connected);
returnMode = makeFirstVisit(); returnMode = makeFirstVisit();
if (returnMode == true) //requst and send first validation if (returnMode == (int)true) //requst and send first validation
{ {
status = jceStatus::JCE_START_VALIDATING_PROGRESS; status = jceStatus::JCE_START_VALIDATING_PROGRESS;
returnMode = checkValidation(); returnMode = checkValidation();
if (returnMode == true) //check if username and password are matching if (returnMode == (int)true) //check if username and password are matching
{ {
status = jceStatus::JCE_VALIDATION_PASSED; status = jceStatus::JCE_VALIDATION_PASSED;
returnMode = makeSecondVisit(); returnMode = makeSecondVisit();
if (returnMode == true) //siging in the website if (returnMode == (int)true) //siging in the website
{ {
qDebug() << Q_FUNC_INFO << "Signed in succeesfully"; qDebug() << Q_FUNC_INFO << "Signed in succeesfully";
status = jceStatus::JCE_YOU_ARE_IN; status = jceStatus::JCE_YOU_ARE_IN;
@ -317,11 +317,11 @@ void jceLogin::reValidation()
{ {
qDebug() << Q_FUNC_INFO << "Revalidating user"; qDebug() << Q_FUNC_INFO << "Revalidating user";
if (makeFirstVisit() == true) if (makeFirstVisit() == (int)true)
{ {
if (checkValidation()) if (checkValidation())
{ {
if (makeSecondVisit() == true) if (makeSecondVisit() == (int)true)
{ {
statusBar->setIconConnectionStatus(jceStatusBar::LoggedIn); statusBar->setIconConnectionStatus(jceStatusBar::LoggedIn);
qDebug() << Q_FUNC_INFO << "Validated"; qDebug() << Q_FUNC_INFO << "Validated";

4
src/jceSettings/jcelogin.h
View file

@ -2,8 +2,8 @@
#define JCELOGIN_H #define JCELOGIN_H
#include "./src/jceConnection/jcesslclient.h" #include "../../src/jceConnection/jcesslclient.h"
#include "./src/jceSettings/user.h" #include "../../src/jceSettings/user.h"
#include "jceLoginHtmlScripts.h" #include "jceLoginHtmlScripts.h"