summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Lieuthier <[email protected]>2017-10-05 01:41:03 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:31 +0100
commit7d5f860d398269fb236aa090732af82bfa5a7751 (patch)
treee4d9c46ad0bee75149a4676efb33fab661543a43
parentd0ba2cca7e652de4ed30be35d67c473704ab06ee (diff)
Fix build failure in Gadu protocol
-rw-r--r--protocols/gadu/gaduaccount.cpp29
-rw-r--r--protocols/gadu/gaducontact.h1
-rw-r--r--protocols/gadu/gaduprotocol.cpp2
3 files changed, 13 insertions, 19 deletions
diff --git a/protocols/gadu/gaduaccount.cpp b/protocols/gadu/gaduaccount.cpp
index 830016e..465d47c 100644
--- a/protocols/gadu/gaduaccount.cpp
+++ b/protocols/gadu/gaduaccount.cpp
@@ -43,6 +43,7 @@
#include <kmessagebox.h>
#include <knotification.h>
#include <ktemporaryfile.h>
+#include <KFileDialog>
#include <kactionmenu.h>
#include <ktoggleaction.h>
#include <kio/netaccess.h>
@@ -282,10 +283,8 @@ GaduAccount::fillActionMenu(KActionMenu *actionMenu)
kDebug(14100);
actionMenu->setIcon(myself()->onlineStatus().iconFor(this));
- actionMenu->menu()->addTitle(myself()->onlineStatus().iconFor(myself()), i18n("%1 <%2> ",
- myself()->
- displayName(),
- accountId()));
+ actionMenu->menu()->setIcon(myself()->onlineStatus().iconFor(myself()));
+ actionMenu->menu()->setTitle(i18n("%1 <%2> ", myself()->displayName(), accountId()));
if (p->session_->isConnected()) {
p->searchAction->setEnabled(true);
@@ -321,32 +320,28 @@ GaduAccount::fillActionMenu(KActionMenu *actionMenu)
}
QAction *action = new QAction(
- QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus(GG_STATUS_AVAIL).iconFor(
- this))),
+ GaduProtocol::protocol()->convertStatus(GG_STATUS_AVAIL).iconFor(this),
i18n("Go O&nline"), this);
//, "actionGaduConnect" );
QObject::connect(action, SIGNAL(triggered(bool)), this, SLOT(slotGoOnline()));
actionMenu->addAction(action);
action = new QAction(
- QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus(GG_STATUS_BUSY).iconFor(
- this))),
+ GaduProtocol::protocol()->convertStatus(GG_STATUS_BUSY).iconFor(this),
i18n("Set &Busy"), this);
//, "actionGaduConnect" );
QObject::connect(action, SIGNAL(triggered(bool)), this, SLOT(slotGoBusy()));
actionMenu->addAction(action);
action = new QAction(
- QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus(GG_STATUS_INVISIBLE).iconFor(
- this))),
+ GaduProtocol::protocol()->convertStatus(GG_STATUS_INVISIBLE).iconFor(this),
i18n("Set &Invisible"), this);
//, "actionGaduConnect" );
QObject::connect(action, SIGNAL(triggered(bool)), this, SLOT(slotGoInvisible()));
actionMenu->addAction(action);
action = new QAction(
- QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus(GG_STATUS_NOT_AVAIL).iconFor(
- this))),
+ GaduProtocol::protocol()->convertStatus(GG_STATUS_NOT_AVAIL).iconFor(this),
i18n("Go &Offline"), this);
//, "actionGaduConnect" );
QObject::connect(action, SIGNAL(triggered(bool)), this, SLOT(slotGoOffline()));
@@ -1038,9 +1033,8 @@ GaduAccount::slotExportContactsListToFile()
p->saveListDialog = new KFileDialog(QString("::kopete-gadu" + accountId()), QString(),
Kopete::UI::Global::mainWidget());
- p->saveListDialog->setCaption(
- i18n("Save Contacts List for Account %1 As",
- myself()->displayName()));
+ p->saveListDialog->setWindowTitle(
+ i18n("Save Contacts List for Account %1 As", myself()->displayName()));
if (p->saveListDialog->exec() == QDialog::Accepted) {
QByteArray list = p->textcodec_->fromUnicode(userlist()->asString());
@@ -1082,9 +1076,8 @@ GaduAccount::slotImportContactsFromFile()
p->loadListDialog = new KFileDialog(QString("::kopete-gadu" + accountId()), QString(),
Kopete::UI::Global::mainWidget());
- p->loadListDialog->setCaption(
- i18n("Load Contacts List for Account %1 As",
- myself()->displayName()));
+ p->loadListDialog->setWindowTitle(
+ i18n("Load Contacts List for Account %1 As", myself()->displayName()));
if (p->loadListDialog->exec() == QDialog::Accepted) {
url = p->loadListDialog->selectedUrl();
diff --git a/protocols/gadu/gaducontact.h b/protocols/gadu/gaducontact.h
index cacc598..4e2c768 100644
--- a/protocols/gadu/gaducontact.h
+++ b/protocols/gadu/gaducontact.h
@@ -25,6 +25,7 @@
#include <qpoint.h>
#include <qhostaddress.h>
#include <qlist.h>
+#include <KUrl>
#include "gaducontactlist.h"
diff --git a/protocols/gadu/gaduprotocol.cpp b/protocols/gadu/gaduprotocol.cpp
index 4c102f6..64b1e75 100644
--- a/protocols/gadu/gaduprotocol.cpp
+++ b/protocols/gadu/gaduprotocol.cpp
@@ -45,7 +45,7 @@ K_EXPORT_PLUGIN(GaduProtocolFactory("kopete_gadu"))
GaduProtocol* GaduProtocol::protocolStatic_ = 0L;
GaduProtocol::GaduProtocol(QObject *parent, const QVariantList &)
- : Kopete::Protocol(GaduProtocolFactory::componentData(), parent)
+ : Kopete::Protocol(parent)
, propFirstName(Kopete::Global::Properties::self()->firstName())
, propLastName(Kopete::Global::Properties::self()->lastName())
, propEmail(Kopete::Global::Properties::self()->emailAddress())