Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile of the minimal version after a clean.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-02-22 14:51:03 +00:00
parent 827dbd8cf3
commit 3be6ddb8df
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -35,9 +35,9 @@
#endif #endif
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"
#include "MainWindow.h"
#ifndef MINIMAL_RSGUI #ifndef MINIMAL_RSGUI
#include "MainWindow.h"
#include "toaster/OnlineToaster.h" #include "toaster/OnlineToaster.h"
#include "toaster/MessageToaster.h" #include "toaster/MessageToaster.h"
#include "toaster/DownloadToaster.h" #include "toaster/DownloadToaster.h"

6
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -30,7 +30,11 @@
#include <rshare.h> #include <rshare.h>
#include "rsharesettings.h" #include "rsharesettings.h"
#ifdef MINIMAL_RSGUI
#include <QMainWindow>
#else
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
#endif // MINIMAL_RSGUI
#include <retroshare/rsnotify.h> #include <retroshare/rsnotify.h>
@ -525,6 +529,7 @@ void RshareSettings::loadWidgetInformation(QMainWindow *widget, QToolBar *toolBa
loadWidgetInformation(widget); loadWidgetInformation(widget);
} }
#ifndef MINIMAL_RSGUI
/* MainWindow */ /* MainWindow */
int RshareSettings::getLastPageInMainWindow () int RshareSettings::getLastPageInMainWindow ()
{ {
@ -559,6 +564,7 @@ void RshareSettings::setStatusBarFlag(uint flag, bool enable)
setStatusBarFlags(flags); setStatusBarFlags(flags);
} }
#endif // MINIMAL_RSGUI
/* Messages */ /* Messages */
bool RshareSettings::getMsgSetToReadOnActivate () bool RshareSettings::getMsgSetToReadOnActivate ()

2
retroshare-gui/src/gui/settings/rsharesettings.h
View File

@ -192,12 +192,14 @@ public:
//! Method overload. Restore window and toolbar information. //! Method overload. Restore window and toolbar information.
void loadWidgetInformation(QMainWindow *widget, QToolBar *toolBar); void loadWidgetInformation(QMainWindow *widget, QToolBar *toolBar);
#ifndef MINIMAL_RSGUI
/* MainWindow */ /* MainWindow */
int getLastPageInMainWindow (); int getLastPageInMainWindow ();
void setLastPageInMainWindow (int value); void setLastPageInMainWindow (int value);
uint getStatusBarFlags(); uint getStatusBarFlags();
void setStatusBarFlags(uint flags); void setStatusBarFlags(uint flags);
void setStatusBarFlag(uint flag, bool enable); void setStatusBarFlag(uint flag, bool enable);
#endif // MINIMAL_RSGUI
/* Messages */ /* Messages */
bool getMsgSetToReadOnActivate (); bool getMsgSetToReadOnActivate ();

2
retroshare-gui/src/main.cpp
View File

@ -32,6 +32,7 @@
#include "gui/SharedFilesDialog.h" #include "gui/SharedFilesDialog.h"
#include "gui/NetworkDialog.h" #include "gui/NetworkDialog.h"
#include "gui/chat/PopupChatDialog.h" #include "gui/chat/PopupChatDialog.h"
#include "gui/QuickStartWizard.h"
#endif // MINIMAL_RSGUI #endif // MINIMAL_RSGUI
#include "gui/MessengerWindow.h" #include "gui/MessengerWindow.h"
#include "gui/StartDialog.h" #include "gui/StartDialog.h"
@ -41,7 +42,6 @@
#include "gui/connect/ConfCertDialog.h" #include "gui/connect/ConfCertDialog.h"
#include "idle/idle.h" #include "idle/idle.h"
#include "gui/common/Emoticons.h" #include "gui/common/Emoticons.h"
#include "gui/QuickStartWizard.h"
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers. /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
#include <gui/qskinobject/qskinobject.h> #include <gui/qskinobject/qskinobject.h>