Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-26 16:48:15 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/FeedReader/gui/FeedReaderConfig.cpp
View File

@ -25,7 +25,7 @@
#include "interface/rsFeedReader.h"
/** Constructor */
FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WFlags flags)
FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags), ui(new Ui::FeedReaderConfig)
{
/* Invoke the Qt Designer generated object setup routine */

2
plugins/FeedReader/gui/FeedReaderConfig.h
View File

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

2
plugins/VOIP/gui/AudioInputConfig.cpp
View File

@ -50,7 +50,7 @@ void AudioInputDialog::showEvent(QShowEvent *) {
}*/
/** Constructor */
AudioInputConfig::AudioInputConfig(QWidget * parent, Qt::WFlags flags)
AudioInputConfig::AudioInputConfig(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
plugins/VOIP/gui/AudioInputConfig.h
View File

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

4
plugins/VOIP/gui/AudioStats.h
View File

@ -31,8 +31,8 @@
#ifndef _AUDIOSTATS_H
#define _AUDIOSTATS_H
#include <QtCore/QtCore>
#include <QtGui/QtGui>
#include <QtCore>
#include <QtGui>
//#include "mumble_pch.hpp"

10
retroshare-gui/src/gui/AboutDialog.cpp
View File

@ -27,11 +27,11 @@
#include <retroshare/rspeers.h>
#include "settings/rsharesettings.h"
#include <QtGui/QHBoxLayout>
#include <QtGui/QPainter>
#include <QtGui/QBrush>
#include <QtGui/QMessageBox>
#include <QtGui/QStyle>
#include <QHBoxLayout>
#include <QPainter>
#include <QBrush>
#include <QMessageBox>
#include <QStyle>
#include <assert.h>
AboutDialog::AboutDialog(QWidget* parent)

14
retroshare-gui/src/gui/AboutDialog.h
View File

@ -25,14 +25,14 @@
#include "ui_AboutDialog.h"
#include <QtCore/QBasicTimer>
#include <QtCore/QPointer>
#include <QBasicTimer>
#include <QPointer>
#include <QtGui/QDialog>
#include <QtGui/QLabel>
#include <QtGui/QPaintEvent>
#include <QtGui/QKeyEvent>
#include <QtGui/QMouseEvent>
#include <QDialog>
#include <QLabel>
#include <QPaintEvent>
#include <QKeyEvent>
#include <QMouseEvent>
class AWidget;

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

@ -45,7 +45,7 @@
#define IMAGE_MESSAGE ":images/chat.png"
#define IMAGE_AUTOSUBSCRIBE ":images/accepted16.png"
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WFlags flags)
ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
: RsAutoUpdatePage(5000, parent, flags)
{
setupUi(this);

2
retroshare-gui/src/gui/ChatLobbyWidget.h
View File

@ -23,7 +23,7 @@ class ChatLobbyWidget : public RsAutoUpdatePage, Ui::ChatLobbyWidget
public:
/** Default constructor */
ChatLobbyWidget(QWidget *parent = 0, Qt::WFlags flags = 0);
ChatLobbyWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
~ChatLobbyWidget();

2
retroshare-gui/src/gui/FileTransfer/DetailsDialog.cpp
View File

@ -31,7 +31,7 @@
#include "gui/RetroShareLink.h"
/** Default constructor */
DetailsDialog::DetailsDialog(QWidget *parent, Qt::WFlags flags)
DetailsDialog::DetailsDialog(QWidget *parent, Qt::WindowFlags flags)
: QDialog(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/FileTransfer/DetailsDialog.h
View File

@ -33,7 +33,7 @@ class DetailsDialog : public QDialog
public:
/** Default constructor */
DetailsDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
DetailsDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
~DetailsDialog() {}

2
retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp
View File

@ -40,7 +40,7 @@ static const int availability_map_size_X = 400 ;// length of availability bar
static const int availability_map_size_Y = 20 ; // height of availability bar
static const int tab_size = 200 ;// size between tabulated entries
FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WFlags /*f*/ )
FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WindowFlags /*f*/ )
{
QRect TaskGraphRect = geometry();
maxWidth = TaskGraphRect.width();

2
retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h
View File

@ -34,7 +34,7 @@ class FileTransferInfoWidget : public RsAutoUpdatePage
Q_OBJECT
public:
FileTransferInfoWidget(QWidget * parent = 0, Qt::WFlags f = 0 );
FileTransferInfoWidget(QWidget * parent = 0, Qt::WindowFlags f = 0 );
void setFileHash(const std::string& hash) { _file_hash = hash ; }

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

@ -394,7 +394,7 @@ void FriendsDialog::updateStatusString(const QString& peer_id, const QString& st
std::cerr << "FriendsDialog: received group chat typing info. updating gui." << std::endl ;
#endif
QString status = QString::fromUtf8(rsPeers->getPeerName(peer_id.toStdString()).c_str()) + " " + tr(status_string.toAscii());
QString status = QString::fromUtf8(rsPeers->getPeerName(peer_id.toStdString()).c_str()) + " " + tr(status_string.toLatin1());
ui.statusStringLabel->setText(status) ; // displays info for 5 secs.
QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ;

4
retroshare-gui/src/gui/HelpDialog.cpp
View File

@ -26,8 +26,8 @@
#include <iostream>
#include <QtCore/QFile>
#include <QtCore/QTextStream>
#include <QFile>
#include <QTextStream>
/* Images for context menu icons */
#define IMAGE_DOWNLOAD ":/images/start.png"

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

@ -25,7 +25,7 @@
#include <util/MouseEventFilter.h>
#include <QtGui/QtGui>
#include <QtGui>
LogoBar::LogoBar(QWidget * parent)
: QFrame(parent) {

2
retroshare-gui/src/gui/LogoBar.h
View File

@ -22,7 +22,7 @@
#ifndef LOGOBAR_H
#define LOGOBAR_H
#include <QtGui/QFrame>
#include <QFrame>
#include <string>

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

@ -176,7 +176,7 @@
}
/** Constructor */
MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
: RWindow("MainWindow", parent, flags), ui(new Ui::MainWindow)
{
/* Invoke the Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/MainWindow.h
View File

@ -166,7 +166,7 @@ public slots:
protected:
/** Default Constructor */
MainWindow(QWidget *parent = 0, Qt::WFlags flags = 0);
MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
void closeEvent(QCloseEvent *);

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

@ -92,7 +92,7 @@ void MessengerWindow::releaseInstance()
}
/** Constructor */
MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags)
: RWindow("MessengerWindow", parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/MessengerWindow.h
View File

@ -40,7 +40,7 @@ public slots:
protected:
/** Default Constructor */
MessengerWindow(QWidget *parent = 0, Qt::WFlags flags = 0);
MessengerWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
~MessengerWindow();

4
retroshare-gui/src/gui/QuickStartWizard.h
View File

@ -22,8 +22,8 @@
#ifndef _QUICKSTARTWIZARD_H
#define _QUICKSTARTWIZARD_H
#include <QtGui/QDialog>
#include <QtGui/QWizard>
#include <QDialog>
#include <QWizard>
#include "ui_QuickStartWizard.h"

8
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -959,7 +959,7 @@ bool RetroShareLink::checkSSLId(const QString& ssl_id)
if(ssl_id.length() != 32)
return false ;
QByteArray qb(ssl_id.toAscii()) ;
QByteArray qb(ssl_id.toLatin1()) ;
for(int i=0;i<qb.length();++i)
{
@ -976,7 +976,7 @@ bool RetroShareLink::checkPGPId(const QString& pgp_id)
if(pgp_id.length() != 16)
return false ;
QByteArray qb(pgp_id.toAscii()) ;
QByteArray qb(pgp_id.toLatin1()) ;
for(int i=0;i<qb.length();++i)
{
@ -990,7 +990,7 @@ bool RetroShareLink::checkPGPId(const QString& pgp_id)
}
bool RetroShareLink::checkRadix64(const QString& s)
{
QByteArray qb(s.toAscii()) ;
QByteArray qb(s.toLatin1()) ;
for(int i=0;i<qb.length();++i)
{
@ -1011,7 +1011,7 @@ bool RetroShareLink::checkHash(const QString& hash)
if(hash.length() != 40)
return false ;
QByteArray qb(hash.toAscii()) ;
QByteArray qb(hash.toLatin1()) ;
for(int i=0;i<qb.length();++i)
{

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

@ -52,7 +52,7 @@
/** Default constructor */
BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WindowFlags flags)
: RWindow("BandwidthGraph", parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/bwgraph/bwgraph.h
View File

@ -42,7 +42,7 @@ class BandwidthGraph : public RWindow
public:
/** Default constructor */
BandwidthGraph(QWidget *parent = 0, Qt::WFlags flags = 0);
BandwidthGraph(QWidget *parent = 0, Qt::WindowFlags flags = 0);
public slots:
/** Overloaded QWidget.show */

2
retroshare-gui/src/gui/chat/ChatDialog.cpp
View File

@ -39,7 +39,7 @@
static std::map<std::string, ChatDialog*> chatDialogs;
ChatDialog::ChatDialog(QWidget *parent, Qt::WFlags flags) :
ChatDialog::ChatDialog(QWidget *parent, Qt::WindowFlags flags) :
QWidget(parent, flags)
{
setAttribute(Qt::WA_DeleteOnClose, true);

2
retroshare-gui/src/gui/chat/ChatDialog.h
View File

@ -74,7 +74,7 @@ private slots:
void chatNewMessage(ChatWidget*);
protected:
explicit ChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
explicit ChatDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
virtual ~ChatDialog();
void closeEvent(QCloseEvent *event);

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -46,7 +46,7 @@
#define COLUMN_COUNT 3
/** Default constructor */
ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::WFlags flags)
ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::WindowFlags flags)
: ChatDialog(parent, flags), lobbyId(lid)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.h
View File

@ -60,7 +60,7 @@ signals:
protected:
/** Default constructor */
ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent = 0, Qt::WFlags flags = 0);
ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
virtual ~ChatLobbyDialog();

4
retroshare-gui/src/gui/chat/ChatStyle.cpp
View File

@ -310,12 +310,12 @@ QString ChatStyle::formatMessage(enumFormatMessage type, const QString &name, co
// Calculate color from the name
// uint hash = 0x73ffe23a;
// for (int i = 0; i < name.length(); ++i) {
// hash = (hash ^ 0x28594888) + ((uint32_t) name[i].toAscii() << (i % 4));
// hash = (hash ^ 0x28594888) + ((uint32_t) name[i].toLatin1() << (i % 4));
// }
uint hash = 0;
for (int i = 0; i < name.length(); ++i) {
hash = (((hash << 1) + (hash >> 14)) ^ ((int) name[i].toAscii())) & 0x3fff;
hash = (((hash << 1) + (hash >> 14)) ^ ((int) name[i].toLatin1())) & 0x3fff;
}
color.setHsv(hash, 255, 150);

2
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -1027,7 +1027,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr
void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString)
{
ui->statusLabel->setText(QString(statusMask).arg(tr(statusString.toAscii()))); // displays info for 5 secs.
ui->statusLabel->setText(QString(statusMask).arg(tr(statusString.toLatin1()))); // displays info for 5 secs.
ui->typingpixmapLabel->setPixmap(QPixmap(":images/typing.png") );
if (statusString == "is typing...") {

2
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -38,7 +38,7 @@
#define WINDOW(This) dynamic_cast<PopupChatWindow*>(This->window())
/** Default constructor */
PopupChatDialog::PopupChatDialog(QWidget *parent, Qt::WFlags flags)
PopupChatDialog::PopupChatDialog(QWidget *parent, Qt::WindowFlags flags)
: ChatDialog(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/chat/PopupChatDialog.h
View File

@ -42,7 +42,7 @@ private slots:
protected:
/** Default constructor */
PopupChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
PopupChatDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
virtual ~PopupChatDialog();

2
retroshare-gui/src/gui/chat/PopupChatWindow.cpp
View File

@ -63,7 +63,7 @@ static PopupChatWindow *instance = NULL;
}
/** Default constructor */
PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags)
PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);

2
retroshare-gui/src/gui/chat/PopupChatWindow.h
View File

@ -45,7 +45,7 @@ public:
protected:
/** Default constructor */
PopupChatWindow(bool tabbed, QWidget *parent = 0, Qt::WFlags flags = 0);
PopupChatWindow(bool tabbed, QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
~PopupChatWindow();

2
retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
View File

@ -39,7 +39,7 @@ PopupDistantChatDialog::~PopupDistantChatDialog()
delete _update_timer ;
}
PopupDistantChatDialog::PopupDistantChatDialog(QWidget *parent, Qt::WFlags flags)
PopupDistantChatDialog::PopupDistantChatDialog(QWidget *parent, Qt::WindowFlags flags)
: PopupChatDialog(parent,flags)
{
_status_label = new QLabel ;

2
retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
View File

@ -35,7 +35,7 @@ class PopupDistantChatDialog: public PopupChatDialog
protected:
/** Default constructor */
PopupDistantChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
PopupDistantChatDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
virtual ~PopupDistantChatDialog();

2
retroshare-gui/src/gui/common/rwindow.cpp
View File

@ -32,7 +32,7 @@
/** Default constructor. */
RWindow::RWindow(QString name, QWidget *parent, Qt::WFlags flags)
RWindow::RWindow(QString name, QWidget *parent, Qt::WindowFlags flags)
: QMainWindow(parent, flags)
{
_name = name;

2
retroshare-gui/src/gui/common/rwindow.h
View File

@ -37,7 +37,7 @@ class RWindow : public QMainWindow
public:
/** Default constructor. */
RWindow(QString name, QWidget *parent = 0, Qt::WFlags flags = 0);
RWindow(QString name, QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Destructor. */
~RWindow();

2
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -59,7 +59,7 @@ ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id)
}
/** Default constructor */
ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlags flags)
ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WindowFlags flags)
: QDialog(parent, flags), mId(id)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/connect/ConfCertDialog.h
View File

@ -42,7 +42,7 @@ signals:
private:
/** Default constructor */
ConfCertDialog(const std::string& id, QWidget *parent = 0, Qt::WFlags flags = 0);
ConfCertDialog(const std::string& id, QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
~ConfCertDialog();

2
retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp
View File

@ -54,7 +54,7 @@ ConnectProgressDialog *ConnectProgressDialog::instance(const std::string& peer_i
return d;
}
ConnectProgressDialog::ConnectProgressDialog(const std::string& id, QWidget *parent, Qt::WFlags flags)
ConnectProgressDialog::ConnectProgressDialog(const std::string& id, QWidget *parent, Qt::WindowFlags flags)
:QDialog(parent, flags), mId(id), ui(new Ui::ConnectProgressDialog)
{
ui->setupUi(this);

2
retroshare-gui/src/gui/connect/ConnectProgressDialog.h
View File

@ -38,7 +38,7 @@ public:
static void showProgress(const std::string& id);
private:
ConnectProgressDialog(const std::string& id, QWidget *parent = 0, Qt::WFlags flags = 0);
ConnectProgressDialog(const std::string& id, QWidget *parent = 0, Qt::WindowFlags flags = 0);
~ConnectProgressDialog();
static ConnectProgressDialog *instance(const std::string& peer_id);

2
retroshare-gui/src/gui/elastic/graphwidget.h
View File

@ -43,7 +43,7 @@
#define GRAPHWIDGET_H
#include <map>
#include <QtGui/QGraphicsView>
#include <QGraphicsView>
#include <stdint.h>
class Node;

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -111,7 +111,7 @@ public:
};
/** Constructor */
MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
: QMainWindow(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/msgs/MessageComposer.h
View File

@ -45,7 +45,7 @@ public:
public:
/** Default Constructor */
MessageComposer(QWidget *parent = 0, Qt::WFlags flags = 0);
MessageComposer(QWidget *parent = 0, Qt::WindowFlags flags = 0);
~MessageComposer();
static void msgFriend(const std::string &id, bool group);

2
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View File

@ -117,7 +117,7 @@ MessageWidget *MessageWidget::openMsg(const std::string &msgId, bool window)
}
/** Constructor */
MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WFlags flags)
MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags flags)
: QWidget(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/msgs/MessageWidget.h
View File

@ -45,7 +45,7 @@ public:
};
public:
MessageWidget(bool controlled, QWidget *parent = 0, Qt::WFlags flags = 0);
MessageWidget(bool controlled, QWidget *parent = 0, Qt::WindowFlags flags = 0);
~MessageWidget();
static MessageWidget *openMsg(const std::string &msgId, bool window);

2
retroshare-gui/src/gui/msgs/MessageWindow.cpp
View File

@ -28,7 +28,7 @@
#include <retroshare/rsmsgs.h>
/** Constructor */
MessageWindow::MessageWindow(QWidget *parent, Qt::WFlags flags)
MessageWindow::MessageWindow(QWidget *parent, Qt::WindowFlags flags)
: RWindow("MessageWindow", parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/msgs/MessageWindow.h
View File

@ -34,7 +34,7 @@ class MessageWindow : public RWindow
public:
/** Default Constructor */
MessageWindow(QWidget *parent = 0, Qt::WFlags flags = 0);
MessageWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
~MessageWindow();
void addWidget(MessageWidget *widget);

2
retroshare-gui/src/gui/profile/ProfileWidget.cpp
View File

@ -35,7 +35,7 @@
#include <QDateTime>
/** Default constructor */
ProfileWidget::ProfileWidget(QWidget *parent, Qt::WFlags flags)
ProfileWidget::ProfileWidget(QWidget *parent, Qt::WindowFlags flags)
: QWidget(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/profile/ProfileWidget.h
View File

@ -33,7 +33,7 @@ class ProfileWidget : public QWidget
public:
/** Default constructor */
ProfileWidget(QWidget *parent = 0, Qt::WFlags flags = 0);
ProfileWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0);
private slots:
void showEvent ( QShowEvent * event );

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"

2
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -68,7 +68,7 @@
/** Constructor */
ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
: QMainWindow(parent, flags)
{
/* Invoke the Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/unfinished/ApplicationWindow.h
View File

@ -33,7 +33,7 @@ class ApplicationWindow : public QMainWindow
public:
/** Default Constructor */
ApplicationWindow(QWidget *parent = 0, Qt::WFlags flags = 0);
ApplicationWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Destructor. */
~ApplicationWindow();

2
retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp
View File

@ -34,7 +34,7 @@
/** Default constructor */
BlogDetails::BlogDetails(QWidget *parent, Qt::WFlags flags)
BlogDetails::BlogDetails(QWidget *parent, Qt::WindowFlags flags)
: QDialog(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/unfinished/blogs/BlogDetails.h
View File

@ -33,7 +33,7 @@ class BlogDetails : public QDialog
public:
/** Default constructor */
BlogDetails(QWidget *parent = 0, Qt::WFlags flags = 0);
BlogDetails(QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default destructor */
void showDetails(std::string mChannelId);

2
retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp
View File

@ -40,7 +40,7 @@
#include <retroshare/rsblogs.h>
/** Constructor */
CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WFlags flags)
CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WindowFlags flags)
: mBlogId(cId), QMainWindow (parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */

2
retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.h
View File

@ -43,7 +43,7 @@ class CreateBlogMsg : public QMainWindow
public:
/** Default Constructor */
CreateBlogMsg(std::string cId, QWidget *parent = 0, Qt::WFlags flags = 0);
CreateBlogMsg(std::string cId, QWidget *parent = 0, Qt::WindowFlags flags = 0);
/** Default Destructor */
void addAttachment(std::string path);

2
retroshare-gui/src/retroshare-gui/configpage.h
View File

@ -29,7 +29,7 @@ class ConfigPage : public QWidget
{
public:
/** Default Constructor */
ConfigPage(QWidget *parent = 0, Qt::WFlags flags = 0) : QWidget(parent, flags), loaded(false) {}
ConfigPage(QWidget *parent = 0, Qt::WindowFlags flags = 0) : QWidget(parent, flags), loaded(false) {}
/** Pure virtual method. Subclassed pages load their config settings here. */
virtual void load() = 0;

2
retroshare-gui/src/util/EventFilter.cpp
View File

@ -21,7 +21,7 @@
#include <util/EventFilter.h>
#include <QtCore/QEvent>
#include <QEvent>
EventFilter::EventFilter(QObject * receiver, const char * member)
: QObject() {

2
retroshare-gui/src/util/EventFilter.h
View File

@ -26,7 +26,7 @@
#include <util/NonCopyable.h>
#include <QtCore/QObject>
#include <QObject>
class QEvent;

2
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -740,7 +740,7 @@ bool RsHtml::makeEmbeddedImage(const QString &fileName, QString &embeddedImage,
QImage image;
if (image.load (fileName) == false) {
fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load", fileName.toAscii().constData());
fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load", fileName.toLatin1().constData());
return false;
}
return RsHtml::makeEmbeddedImage(image, embeddedImage, maxPixels);

4
retroshare-gui/src/util/MouseEventFilter.cpp
View File

@ -21,8 +21,8 @@
#include <util/MouseEventFilter.h>
#include <QtCore/QEvent>
#include <QtGui/QMouseEvent>
#include <QEvent>
#include <QMouseEvent>
#include <exception>
#include <typeinfo>

2
retroshare-gui/src/util/RetroStyleLabel.cpp
View File

@ -21,7 +21,7 @@
#include <util/RetroStyleLabel.h>
#include <QtGui/QtGui>
#include <QtGui>
RetroStyleLabel::RetroStyleLabel(QWidget * parent, Mode mode, Qt::AlignmentFlag hAlign)
: QLabel(parent), _mode(mode) {

6
retroshare-gui/src/util/RetroStyleLabel.h
View File

@ -24,9 +24,9 @@
#include <util/rsqtutildll.h>
#include <QtGui/QLabel>
#include <QtGui/QPixmap>
#include <QtGui/QColor>
#include <QLabel>
#include <QPixmap>
#include <QColor>
class RSQTUTIL_API RetroStyleLabel : public QLabel {

2
retroshare-gui/src/util/Widget.cpp
View File

@ -21,7 +21,7 @@
#include <util/Widget.h>
#include <QtGui/QtGui>
#include <QtGui>
QGridLayout * Widget::createLayout(QWidget * parent) {
QGridLayout * layout = new QGridLayout(parent);

10
retroshare-gui/src/util/WidgetBackgroundImage.cpp
View File

@ -21,11 +21,11 @@
#include <util/WidgetBackgroundImage.h>
#include <QtCore/QString>
#include <QtGui/QWidget>
#include <QtGui/QPixmap>
#include <QtGui/QPalette>
#include <QtGui/QBrush>
#include <QString>
#include <QWidget>
#include <QPixmap>
#include <QPalette>
#include <QBrush>
void WidgetBackgroundImage::setBackgroundImage(QWidget * widget, const char * imageFile, WidgetBackgroundImage::AdjustMode adjustMode) {
widget->setAutoFillBackground(true);

Some files were not shown because too many files have changed in this diff Show More