Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-14 16:18:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Code maintenance for Qt 5:

Browse source 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-10-18 21:10:33 +00:00
parent 69862404d6
commit 135a5e579a
101 changed files with 127 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/settings/AppearancePage.cpp
View file

@ -29,7 +29,7 @@
#include "rsharesettings.h"
/** Constructor */
AppearancePage::AppearancePage(QWidget * parent, Qt::WFlags flags)
AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/AppearancePage.h
View file

@ -31,7 +31,7 @@ class AppearancePage : public ConfigPage
public:
/** Default Constructor */
AppearancePage(QWidget * parent = 0, Qt::WFlags flags = 0);
AppearancePage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
/** Saves the changes on this page */
virtual bool save(QString &errmsg);

2
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -94,7 +94,7 @@ static QString loadStyleInfo(ChatStyle::enumStyleType type, QListWidget *listWid
}
/** Constructor */
ChatPage::ChatPage(QWidget * parent, Qt::WFlags flags)
ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/ChatPage.h
View file

@ -31,7 +31,7 @@ class ChatPage : public ConfigPage
public:
/** Default Constructor */
ChatPage(QWidget * parent = 0, Qt::WFlags flags = 0);
ChatPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
~ChatPage() {}

2
retroshare-gui/src/gui/settings/CryptoPage.cpp
View file

@ -37,7 +37,7 @@
#include <retroshare/rsdisc.h> //for rsPeers variable
/** Constructor */
CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags)
CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/CryptoPage.h
View file

@ -31,7 +31,7 @@ class CryptoPage : public ConfigPage
public:
/** Default Constructor */
CryptoPage(QWidget * parent = 0, Qt::WFlags flags = 0);
CryptoPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
~CryptoPage();

2
retroshare-gui/src/gui/settings/DirectoriesPage.cpp
View file

@ -28,7 +28,7 @@
#include <algorithm>
DirectoriesPage::DirectoriesPage(QWidget * parent, Qt::WFlags flags)
DirectoriesPage::DirectoriesPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
ui.setupUi(this);

2
retroshare-gui/src/gui/settings/DirectoriesPage.h
View file

@ -30,7 +30,7 @@ class DirectoriesPage: public ConfigPage
Q_OBJECT
public:
DirectoriesPage(QWidget * parent = 0, Qt::WFlags flags = 0);
DirectoriesPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
/** Saves the changes on this page */
virtual bool save(QString &errmsg);

2
retroshare-gui/src/gui/settings/FileAssociationsPage.cpp
View file

@ -53,7 +53,7 @@
//============================================================================
FileAssociationsPage::FileAssociationsPage(QWidget * parent, Qt::WFlags flags)
FileAssociationsPage::FileAssociationsPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
//:QFrame()
{

2
retroshare-gui/src/gui/settings/FileAssociationsPage.h
View file

@ -48,7 +48,7 @@ class FileAssociationsPage : public ConfigPage
Q_OBJECT
public:
FileAssociationsPage(QWidget * parent = 0, Qt::WFlags flags = 0);
FileAssociationsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
virtual ~FileAssociationsPage();
virtual void load();

2
retroshare-gui/src/gui/settings/ForumPage.cpp
View file

@ -26,7 +26,7 @@
#include "../MainWindow.h"
#include "../ForumsDialog.h"
ForumPage::ForumPage(QWidget * parent, Qt::WFlags flags)
ForumPage::ForumPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
ui.setupUi(this);

2
retroshare-gui/src/gui/settings/ForumPage.h
View file

@ -30,7 +30,7 @@ class ForumPage : public ConfigPage
Q_OBJECT
public:
ForumPage(QWidget * parent = 0, Qt::WFlags flags = 0);
ForumPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~ForumPage();
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/GeneralPage.cpp
View file

@ -32,7 +32,7 @@
#include <gui/QuickStartWizard.h>
/** Constructor */
GeneralPage::GeneralPage(QWidget * parent, Qt::WFlags flags)
GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/GeneralPage.h
View file

@ -32,7 +32,7 @@ class GeneralPage : public ConfigPage
public:
/** Default Constructor */
GeneralPage(QWidget * parent = 0, Qt::WFlags flags = 0);
GeneralPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
~GeneralPage();

2
retroshare-gui/src/gui/settings/MessagePage.cpp
View file

@ -28,7 +28,7 @@
#include <algorithm>
#include "NewTag.h"
MessagePage::MessagePage(QWidget * parent, Qt::WFlags flags)
MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
ui.setupUi(this);

2
retroshare-gui/src/gui/settings/MessagePage.h
View file

@ -34,7 +34,7 @@ class MessagePage : public ConfigPage
Q_OBJECT
public:
MessagePage(QWidget * parent = 0, Qt::WFlags flags = 0);
MessagePage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~MessagePage();
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/NetworkPage.cpp
View file

@ -22,7 +22,7 @@
#include "NetworkPage.h"
#include "rshare.h"
NetworkPage::NetworkPage(QWidget * parent, Qt::WFlags flags)
NetworkPage::NetworkPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
ui.setupUi(this);

2
retroshare-gui/src/gui/settings/NetworkPage.h
View file

@ -28,7 +28,7 @@
class NetworkPage : public ConfigPage
{
public:
NetworkPage(QWidget * parent = 0, Qt::WFlags flags = 0);
NetworkPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~NetworkPage() {}
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/NewTag.cpp
View file

@ -25,7 +25,7 @@
#include <QColorDialog>
/** Default constructor */
NewTag::NewTag(MsgTagType &Tags, uint32_t nId /* = 0*/, QWidget *parent, Qt::WFlags flags)
NewTag::NewTag(MsgTagType &Tags, uint32_t nId /* = 0*/, QWidget *parent, Qt::WindowFlags flags)
: QDialog(parent, flags), m_Tags(Tags)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/settings/NewTag.h
View file

@ -36,7 +36,7 @@ class NewTag : public QDialog
public:
/** Default constructor */
NewTag(MsgTagType &Tags, uint32_t nId = 0, QWidget *parent = 0, Qt::WFlags flags = 0);
NewTag(MsgTagType &Tags, uint32_t nId = 0, QWidget *parent = 0, Qt::WindowFlags flags = 0);
uint32_t m_nId;

2
retroshare-gui/src/gui/settings/NotifyPage.cpp
View file

@ -33,7 +33,7 @@
#include "gui/NewsFeed.h"
/** Constructor */
NotifyPage::NotifyPage(QWidget * parent, Qt::WFlags flags)
NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/NotifyPage.h
View file

@ -58,7 +58,7 @@ class NotifyPage : public ConfigPage
public:
/** Default Constructor */
NotifyPage(QWidget *parent = 0, Qt::WFlags flags = 0);
NotifyPage(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
~NotifyPage();

2
retroshare-gui/src/gui/settings/PluginsPage.cpp
View file

@ -32,7 +32,7 @@
#include "../MainWindow.h"
PluginsPage::PluginsPage(QWidget * parent, Qt::WFlags flags)
PluginsPage::PluginsPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
ui.setupUi(this);

2
retroshare-gui/src/gui/settings/PluginsPage.h
View file

@ -29,7 +29,7 @@ class PluginsPage : public ConfigPage
Q_OBJECT
public:
PluginsPage(QWidget * parent = 0, Qt::WFlags flags = 0);
PluginsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~PluginsPage();
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/RelayPage.cpp
View file

@ -32,7 +32,7 @@
#include <QTimer>
RelayPage::RelayPage(QWidget * parent, Qt::WFlags flags)
RelayPage::RelayPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

4
retroshare-gui/src/gui/settings/RelayPage.h
View file

@ -22,7 +22,7 @@
#ifndef RELAYPAGE_H
#define RELAYPAGE_H
# include <QtGui/QWidget>
# include <QWidget>
#include <retroshare-gui/configpage.h>
#include "ui_RelayPage.h"
@ -32,7 +32,7 @@ class RelayPage: public ConfigPage
Q_OBJECT
public:
RelayPage(QWidget * parent = 0, Qt::WFlags flags = 0);
RelayPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~RelayPage() {}
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -34,7 +34,7 @@
#include <QTimer>
ServerPage::ServerPage(QWidget * parent, Qt::WFlags flags)
ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/ServerPage.h
View file

@ -32,7 +32,7 @@ class ServerPage: public ConfigPage
Q_OBJECT
public:
ServerPage(QWidget * parent = 0, Qt::WFlags flags = 0);
ServerPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~ServerPage() {}
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/SoundPage.cpp
View file

@ -36,7 +36,7 @@
#define TYPE_ITEM 1
/** Constructor */
SoundPage::SoundPage(QWidget * parent, Qt::WFlags flags)
SoundPage::SoundPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/settings/SoundPage.h
View file

@ -34,7 +34,7 @@ class SoundPage : public ConfigPage
public:
/** Default Constructor */
SoundPage(QWidget * parent = 0, Qt::WFlags flags = 0);
SoundPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
~SoundPage();

2
retroshare-gui/src/gui/settings/TransferPage.cpp
View file

@ -29,7 +29,7 @@
#include <retroshare/rsfiles.h>
#include <retroshare/rspeers.h>
TransferPage::TransferPage(QWidget * parent, Qt::WFlags flags)
TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

4
retroshare-gui/src/gui/settings/TransferPage.h
View file

@ -22,7 +22,7 @@
#ifndef TRANSFERPAGE_H
# define TRANSFERPAGE_H
# include <QtGui/QWidget>
# include <QWidget>
#include <retroshare-gui/configpage.h>
#include "ui_TransferPage.h"
@ -32,7 +32,7 @@ class TransferPage: public ConfigPage
Q_OBJECT
public:
TransferPage(QWidget * parent = 0, Qt::WFlags flags = 0);
TransferPage(QWidget * parent = 0, Qt::WindowFlags flags = 0);
~TransferPage() {}
/** Saves the changes on this page */

2
retroshare-gui/src/gui/settings/rsettingswin.h
View file

@ -22,7 +22,7 @@
#ifndef RSETTINGSWIN_HPP_
#define RSETTINGSWIN_HPP_
#include <QtGui/QDialog>
#include <QDialog>
#include <retroshare-gui/configpage.h>
#include "ui_settings.h"