mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-20 04:14:27 -04:00
removed not more avaible header
fixed some lines which not more usen git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
cb891ff08a
commit
2f30ee6b1d
3 changed files with 7 additions and 7 deletions
|
@ -34,7 +34,6 @@
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
|
|
||||||
#if defined(Q_WS_WIN)
|
#if defined(Q_WS_WIN)
|
||||||
#include <util/registry.h>
|
|
||||||
#include <util/win32.h>
|
#include <util/win32.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
#include <gui/qskinobject/qskinobject.h>
|
#include <gui/qskinobject/qskinobject.h>
|
||||||
****/
|
****/
|
||||||
|
|
||||||
#include <util/process.h>
|
//#include <util/process.h>
|
||||||
#include <util/string.h>
|
#include <util/stringutil.h>
|
||||||
#include "rsiface/rsiface.h"
|
#include "rsiface/rsiface.h"
|
||||||
|
|
||||||
#include "rsiface/notifyqt.h"
|
#include "rsiface/notifyqt.h"
|
||||||
|
@ -154,7 +154,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
}*/
|
}*/
|
||||||
/* Run Retroshare */
|
/* Run Retroshare */
|
||||||
int ret = rshare.run();
|
//int ret = rshare.run();
|
||||||
|
|
||||||
/* Startup a Timer to keep the gui's updated */
|
/* Startup a Timer to keep the gui's updated */
|
||||||
QTimer *timer = new QTimer(w);
|
QTimer *timer = new QTimer(w);
|
||||||
|
@ -162,7 +162,9 @@ int main(int argc, char *argv[])
|
||||||
timer->start(1000);
|
timer->start(1000);
|
||||||
|
|
||||||
/* dive into the endless loop */
|
/* dive into the endless loop */
|
||||||
return ret;
|
// return ret;
|
||||||
|
return rshare.exec();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -77,8 +77,7 @@ public:
|
||||||
static bool setStyle(QString styleKey = QString());
|
static bool setStyle(QString styleKey = QString());
|
||||||
/** Sets the current GUI stylesheet. */
|
/** Sets the current GUI stylesheet. */
|
||||||
static bool setSheet(QString sheet = QString());
|
static bool setSheet(QString sheet = QString());
|
||||||
/** Shows the specified help topic, or the default if empty. */
|
|
||||||
//static void help(QString topic = QString());
|
|
||||||
|
|
||||||
/** Returns the current language. */
|
/** Returns the current language. */
|
||||||
static QString language() { return _language; }
|
static QString language() { return _language; }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue