projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development/route_load_save'
[speedfreak]
/
Client
/
mainwindow.cpp
diff --git
a/Client/mainwindow.cpp
b/Client/mainwindow.cpp
index
6eb8757
..
04aeb97
100644
(file)
--- a/
Client/mainwindow.cpp
+++ b/
Client/mainwindow.cpp
@@
-180,7
+180,6
@@
MainWindow::~MainWindow()
delete customButtonHelp;
}
delete customButtonHelp;
}
-
/**
*
*/
/**
*
*/
@@
-220,7
+219,7
@@
void MainWindow::clientRequestTopList(int index)
}
/**
}
/**
- *This function is used to set items to category combobox. Top-tab view.
+ *This function is used to set items to category combobox.
*@param
*/
void MainWindow::setCategoryCompoBox()
*@param
*/
void MainWindow::setCategoryCompoBox()
@@
-284,11
+283,14
@@
void MainWindow::clientUserLogin()
/**
* This function send route data to server.
/**
* This function send route data to server.
+ * @param QString oldName, old file name
+ * @param QString newName, new file name
+ * @param int i
*/
*/
-void MainWindow::clientSendRoute()
+void MainWindow::clientSendRoute(QString oldName, QString newName, int i)
{
if(httpClient)
{
if(httpClient)
- httpClient->sendRouteXml();
+ httpClient->sendRouteXml(oldName, newName, i);
}
/**
}
/**
@@
-375,7
+377,7
@@
void MainWindow::OpenRouteDialog()
if(!routeSaveDialog)
routeSaveDialog = new RouteSaveDialog;
if(!routeSaveDialog)
routeSaveDialog = new RouteSaveDialog;
- connect(routeSaveDialog, SIGNAL(sendroute()), this, SLOT(clientSendRoute()));
+ connect(routeSaveDialog, SIGNAL(sendroute(QString,QString,int)), this, SLOT(clientSendRoute(QString,QString,int)));
connect(routeSaveDialog, SIGNAL(rejected()), this, SLOT(killDialog()));
routeSaveDialog->show();
}
connect(routeSaveDialog, SIGNAL(rejected()), this, SLOT(killDialog()));
routeSaveDialog->show();
}