Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-09 09:35:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

reverted previous change on MainWindow that caused compilation issues for plugins

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-05-01 11:46:25 +00:00
parent c1d7f514e9
commit 6e4fa142d1
2 changed files with 53 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/MainWindow.h
View file

@ -26,7 +26,6 @@
#include <set>
#include "gui/common/rwindow.h"
#include "ui_MainWindow.h"
namespace Ui {
class MainWindow;
@ -73,7 +72,7 @@ class BlogsDialog;
class ApplicationWindow;
#endif
class MainWindow : public RWindow, public Ui::MainWindow
class MainWindow : public RWindow
{
Q_OBJECT
@ -258,6 +257,8 @@ private:
// idle function
void setIdle(bool Idle);
bool isIdle;
Ui::MainWindow *ui ;
};
#endif