[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [konversation/frameworks] /: Port to QApplication and KDBusService
From: Peter Simonsson <peter.simonsson () gmail ! com>
Date: 2014-10-31 20:21:37
Message-ID: E1XkIhV-0002Ho-Uu () scm ! kde ! org
[Download RAW message or body]
Git commit c4d8e9add22a761c84320d37381c3acdec0a6e41 by Peter Simonsson.
Committed on 31/10/2014 at 16:30.
Pushed by psn into branch 'frameworks'.
Port to QApplication and KDBusService
CCBUG: 337519
M +1 -0 CMakeLists.txt
M +1 -0 src/CMakeLists.txt
M +6 -6 src/application.cpp
M +4 -4 src/application.h
M +2 -2 src/awaymanager.cpp
M +2 -2 src/bookmarkhandler.cpp
M +1 -1 src/config/highlight_config.cpp
M +1 -1 src/config/osd_config.cpp
M +1 -1 src/config/theme_config.cpp
M +3 -3 src/connectionmanager.cpp
M +18 -18 src/dbus.cpp
M +2 -2 src/identitydialog.cpp
M +1 -1 src/irc/channellistpanel.cpp
M +1 -1 src/irc/inputfilter.cpp
M +5 -5 src/irc/nicksonline.cpp
M +3 -2 src/irc/outputfilter.cpp
M +7 -7 src/irc/server.cpp
M +11 -5 src/main.cpp
M +5 -5 src/mainwindow.cpp
M +9 -9 src/notificationhandler.cpp
M +6 -6 src/urlcatcher.cpp
M +2 -2 src/viewer/ircinput.cpp
M +3 -3 src/viewer/ircview.cpp
M +3 -3 src/viewer/searchbar.cpp
M +1 -1 src/viewer/topiclabel.cpp
M +1 -1 src/viewer/viewcontainer.cpp
http://commits.kde.org/konversation/c4d8e9add22a761c84320d37381c3acdec0a6e41
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf065b..838ebdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
Wallet
WidgetsAddons
GlobalAccel
+ DBusAddons
)
find_package(Phonon4Qt5 4.6.60 REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 378c813..9a9243e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -227,6 +227,7 @@ target_link_libraries(konversation
KF5::Wallet
KF5::WidgetsAddons
KF5::GlobalAccel
+ KF5::DBusAddons
Phonon::phonon4qt5)
if (Qca_FOUND)
diff --git a/src/application.cpp b/src/application.cpp
index 57743c2..c72ccb5 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -54,8 +54,8 @@
using namespace Konversation;
-Application::Application()
-: KUniqueApplication(true, true)
+Application::Application(int &argc, char **argv)
+: QApplication(argc, argv)
{
mainWindow = 0;
m_restartScheduled = false;
@@ -145,7 +145,7 @@ void Application::implementRestart()
KProcess::startDetached(QCoreApplication::applicationFilePath(), argumentList);
}
-int Application::newInstance()
+void Application::newInstance()
{
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
QString url;
@@ -279,7 +279,7 @@ int Application::newInstance()
{
restart();
- return KUniqueApplication::newInstance();
+ return;
}
if (!url.isEmpty())
@@ -295,12 +295,12 @@ int Application::newInstance()
args->isSet("ssl"));
}
- return KUniqueApplication::newInstance();
+ return;
}
Application* Application::instance()
{
- return static_cast<Application*>(KApplication::kApplication());
+ return static_cast<Application*>(QApplication::instance());
}
void Application::restart()
diff --git a/src/application.h b/src/application.h
index 6f7ab6a..8509999 100644
--- a/src/application.h
+++ b/src/application.h
@@ -26,7 +26,7 @@
#include "identity.h"
#include "ircqueue.h"
-#include <KUniqueApplication>
+#include <QApplication>
class ConnectionManager;
class AwayManager;
@@ -59,7 +59,7 @@ namespace KWallet
// FIXME KF5 port: See frameworks-qapp branch for start of port to QApplication and \
QCommandLineParser.
-class Application : public KUniqueApplication
+class Application : public QApplication
{
Q_OBJECT
@@ -85,7 +85,7 @@ class Application : public KUniqueApplication
// URL-Catcher
QStandardItemModel* getUrlModel() { return m_urlModel; }
- Application();
+ Application(int &argc, char **argv);
~Application();
static Application* instance();
@@ -126,7 +126,7 @@ class Application : public KUniqueApplication
// inline auto replacement for input lines
void doInlineAutoreplace(KTextEdit* textEdit);
- int newInstance();
+ void newInstance();
static void openUrl(const QString& url);
diff --git a/src/awaymanager.cpp b/src/awaymanager.cpp
index 2161ca8..c68181b 100644
--- a/src/awaymanager.cpp
+++ b/src/awaymanager.cpp
@@ -25,7 +25,7 @@
AwayManager::AwayManager(QObject* parent) : QObject(parent)
{
- m_connectionManager = static_cast<Application*>(kapp)->getConnectionManager();
+ m_connectionManager = Application::instance()->getConnectionManager();
connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()), this, \
SLOT(resumeFromIdle()));
connect(KIdleTime::instance(), SIGNAL(timeoutReached(int)), this, \
SLOT(idleTimeoutReached(int))); @@ -164,7 +164,7 @@ void \
AwayManager::updateGlobalAwayAction(bool away) if (!away)
simulateUserActivity();
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
KToggleAction* awayAction = \
qobject_cast<KToggleAction*>(konvApp->getMainWindow()->actionCollection()->action(QStringLiteral("toggle_away")));
Konversation::TrayIcon* trayIcon = konvApp->getMainWindow()->systemTrayIcon();
diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
index 8cb14c3..5a70591 100644
--- a/src/bookmarkhandler.cpp
+++ b/src/bookmarkhandler.cpp
@@ -53,7 +53,7 @@ void KonviBookmarkHandler::openBookmark(const KBookmark &bm, \
Qt::MouseButtons mb {
Q_UNUSED(mb);
Q_UNUSED(km);
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, \
bm.url().url()); }
@@ -99,7 +99,7 @@ void KonviBookmarkHandler::openFolderinTabs(const KBookmarkGroup \
&group) {
const QList<QUrl> list = group.groupUrlList();
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, \
list); }
diff --git a/src/config/highlight_config.cpp b/src/config/highlight_config.cpp
index 139434a..bf8a05c 100644
--- a/src/config/highlight_config.cpp
+++ b/src/config/highlight_config.cpp
@@ -280,7 +280,7 @@ QStringList Highlight_Config::currentHighlightList()
void Highlight_Config::playSound()
{
- Application *konvApp = static_cast<Application *>(KApplication::kApplication());
+ Application *konvApp = Application::instance();
konvApp->sound()->play(soundURL->url());
}
diff --git a/src/config/osd_config.cpp b/src/config/osd_config.cpp
index a7690f0..a836086 100644
--- a/src/config/osd_config.cpp
+++ b/src/config/osd_config.cpp
@@ -87,7 +87,7 @@ void OSD_Config::restorePageToDefaults()
void OSD_Config::saveSettings()
{
//Update the current OSD.
- Application *konvApp=static_cast<Application *>(KApplication::kApplication());
+ Application *konvApp=Application::instance();
konvApp->osd->setEnabled(kcfg_UseOSD->isChecked());
if (kcfg_UseOSD->isChecked())
diff --git a/src/config/theme_config.cpp b/src/config/theme_config.cpp
index 583f14d..ef26eaf 100644
--- a/src/config/theme_config.cpp
+++ b/src/config/theme_config.cpp
@@ -219,7 +219,7 @@ void Theme_Config::installTheme()
KTar themeArchive(tmpThemeFile);
themeArchive.open(QIODevice::ReadOnly);
- kapp->processEvents();
+ qApp->processEvents();
const KArchiveDirectory* themeDir = themeArchive.directory();;
QStringList allEntries = themeDir->entries();
diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index 4374761..36670b6 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -150,7 +150,7 @@ void ConnectionManager::connectTo(Konversation::ConnectionFlag \
flag, ConnectionS
if (!identity || !validateIdentity(identity)) return;
- Application* konvApp = static_cast<Application *>(kapp);
+ Application* konvApp = Application::instance();
MainWindow* mainWindow = konvApp->getMainWindow();
Server* server = new Server(this, settings);
@@ -486,7 +486,7 @@ bool \
ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo \
ConnectionDupe dupeType; bool doReuse = true;
- Application* konvApp = static_cast<Application *>(kapp);
+ Application* konvApp = Application::instance();
MainWindow* mainWindow = konvApp->getMainWindow();
QMap<int, Server*>::ConstIterator it;
@@ -585,7 +585,7 @@ bool \
ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo
bool ConnectionManager::validateIdentity(IdentityPtr identity, bool interactive)
{
- Application* konvApp = static_cast<Application *>(kapp);
+ Application* konvApp = Application::instance();
MainWindow* mainWindow = konvApp->getMainWindow();
QString errors;
diff --git a/src/dbus.cpp b/src/dbus.cpp
index eedb695..0cc8a6a 100644
--- a/src/dbus.cpp
+++ b/src/dbus.cpp
@@ -43,7 +43,7 @@ void DBus::raw(const QString& server,const QString& command)
QStringList DBus::listConnections()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStringList connections;
const QList<Server*> serverList = \
konvApp->getConnectionManager()->getServerList(); @@ -56,7 +56,7 @@ QStringList \
DBus::listConnections()
QStringList DBus::listServers()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStringList hosts;
const QList<Server*> serverList = \
konvApp->getConnectionManager()->getServerList(); @@ -69,7 +69,7 @@ QStringList \
DBus::listServers()
QStringList DBus::listConnectedServers()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStringList connectedHosts;
const QList<Server*> serverList = \
konvApp->getConnectionManager()->getServerList(); @@ -106,12 +106,12 @@ QStringList \
DBus::listJoinedChannels(const QString& serverName)
void DBus::setAway(const QString& awaymessage)
{
- static_cast<Application*>(kapp)->getAwayManager()->requestAllAway(sterilizeUnicode(awaymessage));
+ Application::instance()->getAwayManager()->requestAllAway(sterilizeUnicode(awaymessage));
}
void DBus::setBack()
{
- static_cast<Application*>(kapp)->getAwayManager()->requestAllUnaway();
+ Application::instance()->getAwayManager()->requestAllUnaway();
}
void DBus::sayToAll(const QString &message)
@@ -195,7 +195,7 @@ QString DBus::getChannelEncoding(const QString& server, const \
QString& channel)
void DBus::changeAwayStatus(bool away)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
if (away)
{
@@ -283,7 +283,7 @@ void IdentDBus::setNickname(const QString &identity, int \
index,const QString& ni {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data();
const_cast<Identity *>(i)->setNickname(index, sterilizeUnicode(nick));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getNickname(const QString &identity, int index)
@@ -295,7 +295,7 @@ void IdentDBus::setBot(const QString &identity, const QString& \
bot) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data();
const_cast<Identity *>(i)->setNickservNickname(sterilizeUnicode(bot));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getBot(const QString &identity)
@@ -307,7 +307,7 @@ void IdentDBus::setPassword(const QString &identity, const \
QString& password) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data();
const_cast<Identity *>(i)->setAuthPassword(sterilizeUnicode(password));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getPassword(const QString &identity)
@@ -319,7 +319,7 @@ void IdentDBus::setNicknameList(const QString &identity, const \
QStringList& newL {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data();
const_cast<Identity *>(i)->setNicknameList(sterilizeUnicode(newList));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QStringList IdentDBus::getNicknameList(const QString &identity)
@@ -331,7 +331,7 @@ void IdentDBus::setQuitReason(const QString &identity, const \
QString& reason) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data(); const_cast<Identity \
*>(i)->setQuitReason(sterilizeUnicode(reason));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getQuitReason(const QString &identity)
@@ -344,7 +344,7 @@ void IdentDBus::setPartReason(const QString &identity, const \
QString& reason) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data(); const_cast<Identity \
*>(i)->setPartReason(sterilizeUnicode(reason));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getPartReason(const QString &identity)
@@ -356,7 +356,7 @@ void IdentDBus::setKickReason(const QString &identity, const \
QString& reason) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data(); const_cast<Identity \
*>(i)->setKickReason(sterilizeUnicode(reason));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getKickReason(const QString &identity)
@@ -368,7 +368,7 @@ void IdentDBus::setRunAwayCommands(const QString &identity, bool \
run) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data(); const_cast<Identity \
*>(i)->setRunAwayCommands(run);
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
bool IdentDBus::getRunAwayCommands(const QString &identity)
@@ -380,7 +380,7 @@ void IdentDBus::setAwayCommand(const QString &identity, const \
QString& command) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data(); const_cast<Identity \
*>(i)->setAwayCommand(sterilizeUnicode(command));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getAwayCommand(const QString &identity)
@@ -392,7 +392,7 @@ void IdentDBus::setReturnCommand(const QString &identity, const \
QString& command {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data();
const_cast<Identity *>(i)->setReturnCommand(sterilizeUnicode(command));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getReturnCommand(const QString &identity)
@@ -404,7 +404,7 @@ void IdentDBus::setAwayMessage(const QString &identity, const \
QString& message) {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data(); const_cast<Identity \
*>(i)->setAwayMessage(sterilizeUnicode(message));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getAwayMessage(const QString &identity)
@@ -416,7 +416,7 @@ void IdentDBus::setAwayNickname(const QString &identity, const \
QString& nickname {
const Identity *i = \
Preferences::identityByName(sterilizeUnicode(identity)).data();
const_cast<Identity *>(i)->setAwayNickname(sterilizeUnicode(nickname));
- static_cast<Application *>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
QString IdentDBus::getAwayNickname(const QString &identity)
diff --git a/src/identitydialog.cpp b/src/identitydialog.cpp
index 37516e6..e5a0f54 100644
--- a/src/identitydialog.cpp
+++ b/src/identitydialog.cpp
@@ -108,7 +108,7 @@ namespace Konversation
KGuiItem::assign(okButton, KGuiItem(i18n("&OK"), \
QStringLiteral("dialog-ok"), i18n("Change identity information")));
KGuiItem::assign(buttonBox->button(QDialogButtonBox::Cancel), \
KGuiItem(i18n("&Cancel"),QStringLiteral("dialog-cancel"), i18n("Discards all changes \
made")));
- AwayManager* awayManager = \
static_cast<Application*>(kapp)->getAwayManager(); + AwayManager* awayManager \
= Application::instance()->getAwayManager();
connect(m_identityCBox, static_cast<void \
(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, \
&IdentityDialog::updateIdentity);
connect(this, &IdentityDialog::identitiesChanged, awayManager, \
&AwayManager::identitiesChanged); }
@@ -210,7 +210,7 @@ namespace Konversation
refreshCurrentIdentity();
Preferences::setIdentityList(m_identityList);
- static_cast<Application*>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
emit identitiesChanged();
QDialog::accept();
}
diff --git a/src/irc/channellistpanel.cpp b/src/irc/channellistpanel.cpp
index 9801bb7..2a2397e 100644
--- a/src/irc/channellistpanel.cpp
+++ b/src/irc/channellistpanel.cpp
@@ -500,7 +500,7 @@ void ChannelListPanel::openURL()
if (action)
{
- Application* konvApp = static_cast<Application *>(kapp);
+ Application* konvApp = Application::instance();
konvApp->openUrl(action->data().toString());
}
}
diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
index 946940d..8a95e91 100644
--- a/src/irc/inputfilter.cpp
+++ b/src/irc/inputfilter.cpp
@@ -2360,7 +2360,7 @@ void InputFilter::parsePrivMsg(const QString& prefix, \
QStringList& parameterList source = prefix;
}
- Application* konv_app = static_cast<Application*>(kapp);
+ Application* konv_app = Application::instance();
message = konv_app->doAutoreplace(message, false).first;
if(isAChannel(parameterList.value(0)))
diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp
index b128481..f7803c0 100644
--- a/src/irc/nicksonline.cpp
+++ b/src/irc/nicksonline.cpp
@@ -410,7 +410,7 @@ void NicksOnline::updateServerOnlineList(Server* servr)
NickInfoPtr NicksOnline::getOnlineNickInfo(QString& networkName, QString& nickname)
{
// Get list of pointers to all servers.
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
const QList<Server*> serverList = \
konvApp->getConnectionManager()->getServerList(); foreach (Server* server, \
serverList) {
@@ -431,7 +431,7 @@ NickInfoPtr NicksOnline::getOnlineNickInfo(QString& networkName, \
QString& nickna
*/
void NicksOnline::requestWhois(QString& networkName, QString& nickname)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
const QList<Server*> serverList = \
konvApp->getConnectionManager()->getServerList(); foreach (Server* server, \
serverList) {
@@ -471,7 +471,7 @@ void NicksOnline::updateNotifyList()
// update notify list
Preferences::setNotifyList(notifyList);
// save notify list
- static_cast<Application*>(kapp)->saveOptions(false);
+ Application::instance()->saveOptions(false);
}
/**
@@ -479,7 +479,7 @@ void NicksOnline::updateNotifyList()
*/
void NicksOnline::refreshAllServerOnlineLists()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
const QList<Server*> serverList = \
konvApp->getConnectionManager()->getServerList(); // Remove servers no longer \
connected.
for (int i = 0; i < m_nickListView->invisibleRootItem()->childCount(); ++i)
@@ -833,7 +833,7 @@ void NicksOnline::slotNickInfoChanged(Server* server, const \
NickInfoPtr nickInfo void NicksOnline::slotAddNickname(int serverGroupId, const \
QString& nickname) {
Preferences::addNotify(serverGroupId, nickname);
- static_cast<Application*>(kapp)->saveOptions(true);
+ Application::instance()->saveOptions(true);
}
/**
diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
index d1e4959..b205ea1 100644
--- a/src/irc/outputfilter.cpp
+++ b/src/irc/outputfilter.cpp
@@ -41,6 +41,7 @@
#include <KMessageBox>
#include <K4AboutData>
#include <KDebug>
+#include <KComponentData>
#include <QTextDocument>
#include <QTextBlock>
@@ -1834,7 +1835,7 @@ namespace Konversation
OutputFilterResult OutputFilter::command_queuetuner(const OutputFilterInput& \
input) {
- Application *konvApp = \
static_cast<Application*>(KApplication::kApplication()); + Application \
*konvApp = Application::instance();
if (input.parameter.isEmpty() || input.parameter == "on")
konvApp->showQueueTuner(true);
@@ -1880,7 +1881,7 @@ namespace Konversation
{
if (isParameter("app", input.parameter))
{
- Application *konvApp = \
static_cast<Application*>(KApplication::kApplication()); + Application \
*konvApp = Application::instance();
konvApp->restart();
}
diff --git a/src/irc/server.cpp b/src/irc/server.cpp
index 905d13a..f8d8353 100644
--- a/src/irc/server.cpp
+++ b/src/irc/server.cpp
@@ -208,7 +208,7 @@ Server::~Server()
qRegisterMetaType<ConnectionSettings>("ConnectionSettings");
qRegisterMetaType<Konversation::ConnectionFlag>("Konversation::ConnectionFlag");
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QMetaObject::invokeMethod(konvApp->getConnectionManager(), "connectTo", \
Qt::QueuedConnection,
Q_ARG(Konversation::ConnectionFlag, Konversation::CreateNewConnection),
@@ -318,7 +318,7 @@ void Server::connectSignals()
connect(getOutputFilter(), SIGNAL(closeRawLog()), this, SLOT(closeRawLog()));
connect(getOutputFilter(), SIGNAL(encodingChanged()), this, \
SLOT(updateEncoding()));
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
connect(getOutputFilter(), \
SIGNAL(connectTo(Konversation::ConnectionFlag,QString,QString,QString,QString,QString,bool)),
konvApp->getConnectionManager(), \
SLOT(connectTo(Konversation::ConnectionFlag,QString,QString,QString,QString,QString,bool)));
connect(konvApp->getDccTransferManager(), \
SIGNAL(newDccTransferQueued(Konversation::DCC::Transfer*)), @@ -828,7 +828,7 @@ void \
Server::broken(KTcpSocket::Error error) }
else
{
- static_cast<Application*>(kapp)->notificationHandler()->connectionFailure(getStatusView(), \
getServerName()); + \
Application::instance()->notificationHandler()->connectionFailure(getStatusView(), \
getServerName());
QString error = i18n("Connection to server %1 (port %2) lost: %3.",
getConnectionSettings().server().host(),
@@ -1876,7 +1876,7 @@ Query* Server::addQuery(const NickInfoPtr & nickInfo, bool \
weinitiated) m_queryNicks.insert(lcNickname, nickInfo);
if (!weinitiated)
- static_cast<Application*>(kapp)->notificationHandler()->query(query, \
nickname); + Application::instance()->notificationHandler()->query(query, \
nickname); }
else if (weinitiated)
{
@@ -3015,7 +3015,7 @@ NickInfoPtr Server::setWatchedNickOnline(const QString& \
nickname)
appendMessageToFrontmost(i18nc("Message type", "Notify"), i18n("%1 is online \
(%2).", nickname, getServerName()), getStatusView());
- static_cast<Application*>(kapp)->notificationHandler()->nickOnline(getStatusView(), \
nickname); + Application::instance()->notificationHandler()->nickOnline(getStatusView(), \
nickname);
nickInfo->setPrintedOnline(true);
return nickInfo;
@@ -3029,7 +3029,7 @@ void Server::setWatchedNickOffline(const QString& nickname, \
const NickInfoPtr ni
appendMessageToFrontmost(i18nc("Message type", "Notify"), i18n("%1 went offline \
(%2).", nickname, getServerName()), getStatusView());
- static_cast<Application*>(kapp)->notificationHandler()->nickOffline(getStatusView(), \
nickname); + Application::instance()->notificationHandler()->nickOffline(getStatusView(), \
nickname);
}
@@ -3843,7 +3843,7 @@ QStringList Server::generateJoinCommand(const \
Konversation::ChannelList &tmpList
ViewContainer* Server::getViewContainer() const
{
- Application* konvApp = static_cast<Application *>(kapp);
+ Application* konvApp = Application::instance();
return konvApp->getMainWindow()->getViewContainer();
}
diff --git a/src/main.cpp b/src/main.cpp
index b5104f7..d90082e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,7 @@
#include <KCmdLineArgs>
#include <K4AboutData>
#include <Kdelibs4ConfigMigrator>
+#include <KDBusAddons/KDBusService>
#define HACKSTR(x) #x
#define STRHACK(x) HACKSTR(x)
@@ -119,7 +120,7 @@ int main(int argc, char* argv[])
KCmdLineArgs::addCmdLineOptions(options);
KCmdLineArgs::addStdCmdLineOptions();
- KUniqueApplication::addCmdLineOptions();
+// KUniqueApplication::addCmdLineOptions(); FIXME QApp porting
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
@@ -137,16 +138,21 @@ int main(int argc, char* argv[])
}
}
- KUniqueApplication::StartFlags startFlags;
+ KDBusService::StartupOptions startOptions = KDBusService::Unique;
#ifndef QT_NO_DEBUG
if (args->isSet("nui"))
- startFlags = KUniqueApplication::NonUniqueInstance;
+ startOptions = KDBusService::Multiple;
#endif
- if (!KUniqueApplication::start(startFlags)) return 0;
+ Application app(args->qtArgc(), args->qtArgv());
+ app.setApplicationName(QStringLiteral("konversation"));
+ app.setOrganizationDomain(QStringLiteral("kde.org"));
+ app.setApplicationDisplayName(i18n("Konversation"));
- Application app;
+ KDBusService dbusService(startOptions);
+
+ app.newInstance();
return app.exec();
}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d17e754..c93410c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -553,7 +553,7 @@ QSize MainWindow::sizeHint() const
int MainWindow::confirmQuit()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
if (konvApp->getConnectionManager()->connectionCount() == 0)
return KMessageBox::Continue;
@@ -601,7 +601,7 @@ void MainWindow::quitProgram()
bool MainWindow::queryClose()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
if (!konvApp->isSavingSession())
{
@@ -666,7 +666,7 @@ bool MainWindow::event(QEvent* e)
{
m_statusBar->clearMainLabelTempText();
- if (kapp->activeModalWidget() == 0)
+ if (qApp->activeModalWidget() == 0)
emit triggerRememberLine();
}
@@ -797,7 +797,7 @@ void MainWindow::openServerList()
if (!m_serverListDialog)
{
m_serverListDialog = new Konversation::ServerListDialog(i18n("Server List"), \
this);
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
connect(m_serverListDialog, \
SIGNAL(serverGroupsChanged(Konversation::ServerGroupSettingsPtr)),
konvApp, \
SIGNAL(serverGroupsChanged(Konversation::ServerGroupSettingsPtr))); @@ -858,7 +858,7 \
@@ void MainWindow::openNotifications()
void MainWindow::notifyAction(int connectionId, const QString& nick)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
Server* server = \
konvApp->getConnectionManager()->getServerByConnectionId(connectionId); if (server) \
server->notifyAction(nick); }
diff --git a/src/notificationhandler.cpp b/src/notificationhandler.cpp
index 16672e5..69d0b6e 100644
--- a/src/notificationhandler.cpp
+++ b/src/notificationhandler.cpp
@@ -56,7 +56,7 @@ namespace Konversation
if (osd)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(QLatin1Char('(') + chatWin->getName() + \
QStringLiteral(") <") + fromNick + QLatin1Char('>')); }
@@ -70,7 +70,7 @@ namespace Konversation
if (osd)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(QLatin1Char('(') + chatWin->getName() + \
QStringLiteral(") <") + fromNick + QStringLiteral("> ") + cleanedMessage); }
@@ -100,7 +100,7 @@ namespace Konversation
if (osd)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(i18n("[HighLight] (%1) <%2>", \
chatWin->getName(), fromNick)); }
@@ -114,7 +114,7 @@ namespace Konversation
if (osd)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(i18n("[HighLight] (%1) <%2> %3", \
chatWin->getName(), fromNick, cleanedMessage)); }
@@ -141,7 +141,7 @@ namespace Konversation
if (osd)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(i18n("[Query] <%1>", fromNick));
}
@@ -155,7 +155,7 @@ namespace Konversation
if (osd)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(i18n("[Query] <%1> %2", fromNick, \
cleanedMessage)); }
@@ -191,7 +191,7 @@ namespace Konversation
if(Preferences::self()->oSDShowChannelEvent() &&
(!m_mainWindow->isActiveWindow() || (chatWin != \
m_mainWindow->getViewContainer()->getFrontView()))) {
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(i18n("%1 joined %2",nick, chatWin->getName()));
}
}
@@ -210,7 +210,7 @@ namespace Konversation
if(Preferences::self()->oSDShowChannelEvent() &&
(!m_mainWindow->isActiveWindow() || (chatWin != \
m_mainWindow->getViewContainer()->getFrontView()))) {
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->osd->show(i18n("%1 parted %2",nick, chatWin->getName()));
}
}
@@ -387,7 +387,7 @@ namespace Konversation
if(Preferences::self()->oSDShowOwnNick() &&
(!m_mainWindow->isActiveWindow() || (chatWin != \
m_mainWindow->getViewContainer()->getFrontView()))) {
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
// if there was no nick associated, this must be a command message, so \
don't try displaying // an empty nick in <>
if(fromNick.isEmpty())
diff --git a/src/urlcatcher.cpp b/src/urlcatcher.cpp
index e5761bd..620a3fa 100644
--- a/src/urlcatcher.cpp
+++ b/src/urlcatcher.cpp
@@ -175,7 +175,7 @@ void UrlCatcher::setupUrlTree()
connect(m_urlTree, &QTreeView::customContextMenuRequested, this, \
&UrlCatcher::openContextMenu);
connect(m_urlTree, &QTreeView::doubleClicked, this, &UrlCatcher::openUrl);
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStandardItemModel* urlModel = konvApp->getUrlModel();
QStandardItem* item = new QStandardItem(i18n("From"));
urlModel->setHorizontalHeaderItem(0, item);
@@ -211,7 +211,7 @@ void UrlCatcher::updateItemActionStates()
void UrlCatcher::updateListActionStates()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
bool enable = konvApp->getUrlModel()->rowCount();
foreach(QAction* action, m_listActions) action->setEnabled(enable);
@@ -330,7 +330,7 @@ void UrlCatcher::deleteSelectedUrls()
foreach(const QPersistentModelIndex& index, \
m_urlTree->selectionModel()->selectedIndexes()) selectedIndices << index;
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
foreach(const QPersistentModelIndex& index, selectedIndices)
if (index.isValid()) konvApp->getUrlModel()->removeRow(index.row());
@@ -343,7 +343,7 @@ void UrlCatcher::saveUrlModel()
if (!target.isEmpty())
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStandardItemModel* urlModel = konvApp->getUrlModel();
int nickColumnWidth = 0;
@@ -384,7 +384,7 @@ void UrlCatcher::saveUrlModel()
void UrlCatcher::clearUrlModel()
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStandardItemModel* urlModel = konvApp->getUrlModel();
urlModel->removeRows(0, urlModel->rowCount());
@@ -395,7 +395,7 @@ void UrlCatcher::checkLocaleChanged(int category)
if (category != KGlobalSettings::SETTINGS_LOCALE)
return;
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QStandardItemModel* urlModel = konvApp->getUrlModel();
m_urlTree->dataChanged(urlModel->index(0, 0), \
urlModel->index(urlModel->rowCount() - 1, 2));
diff --git a/src/viewer/ircinput.cpp b/src/viewer/ircinput.cpp
index 663bb6f..e222c7b 100644
--- a/src/viewer/ircinput.cpp
+++ b/src/viewer/ircinput.cpp
@@ -39,7 +39,7 @@ IRCInput::IRCInput(QWidget* parent) : KTextEdit(parent)
//nor in compensating for it if my guess is incorrect. so, cache it.
m_qtBoxPadding = document()->size().toSize().height() - \
fontMetrics().lineSpacing();
- connect(KApplication::kApplication(), SIGNAL(appearanceChanged()), this, \
SLOT(updateAppearance())); + connect(qApp, SIGNAL(appearanceChanged()), this, \
SLOT(updateAppearance())); m_multiRow = Preferences::self()->useMultiRowInputBox();
// add one empty line to the history (will be overwritten with newest entry)
@@ -314,7 +314,7 @@ void IRCInput::keyPressEvent(QKeyEvent* e)
}
else
{
- \
setText(static_cast<Application*>(kapp)->doAutoreplace(toPlainText(), true).first); + \
setText(Application::instance()->doAutoreplace(toPlainText(), true).first); emit \
submit(); }
}
diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
index e0d0913..c03228f 100644
--- a/src/viewer/ircview.cpp
+++ b/src/viewer/ircview.cpp
@@ -998,7 +998,7 @@ QString IRCView::filter(const QString& line, const QString& \
defaultColor, const
bool doHighlight, bool parseURL, bool self, QChar::Direction* direction)
{
QString filteredLine(line);
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
//Since we can't turn off whitespace simplification withouteliminating text \
wrapping,
// if the line starts with a space turn it into a non-breaking space.
@@ -1019,7 +1019,7 @@ QString IRCView::filter(const QString& line, const QString& \
defaultColor, const {
if (Preferences::self()->beep())
{
- kapp->beep();
+ qApp->beep();
}
//remove char after beep
filteredLine.remove('\x07');
@@ -1950,7 +1950,7 @@ void IRCView::resizeEvent(QResizeEvent *event)
void IRCView::mouseMoveEvent(QMouseEvent* ev)
{
- if (m_mousePressedOnUrl && (m_mousePressPosition - ev->pos()).manhattanLength() \
> KApplication::startDragDistance()) + if (m_mousePressedOnUrl && \
> (m_mousePressPosition - ev->pos()).manhattanLength() > \
> QApplication::startDragDistance())
{
m_mousePressedOnUrl = false;
diff --git a/src/viewer/searchbar.cpp b/src/viewer/searchbar.cpp
index d94278d..a5f0f69 100644
--- a/src/viewer/searchbar.cpp
+++ b/src/viewer/searchbar.cpp
@@ -43,7 +43,7 @@ SearchBar::SearchBar(QWidget* parent)
m_closeButton->setIcon(QIcon::fromTheme("dialog-close"));
m_findNextButton->setIcon(m_goUpSearch);
m_findPreviousButton->setIcon(m_goDownSearch);
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindNext))->setIcon(m_goUpSearch);
konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindPrev))->setIcon(m_goDownSearch);
@@ -103,7 +103,7 @@ bool SearchBar::eventFilter(QObject* object, QEvent* e)
if (focusEvent)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
QAction * action = \
static_cast<QAction*>(konvApp->getMainWindow()->actionCollection()->action("focus_input_box"));
if (action->shortcut().matches(QKeySequence(Qt::Key_Escape)))
@@ -225,7 +225,7 @@ bool SearchBar::fromCursor() const
void SearchBar::toggleSearchFoward(bool value)
{
- Application* konvApp = static_cast<Application*>(kapp);
+ Application* konvApp = Application::instance();
if (value) {
m_findNextButton->setIcon(m_goDownSearch);
m_findPreviousButton->setIcon(m_goUpSearch);
diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp
index 8ee6b75..88a513d 100644
--- a/src/viewer/topiclabel.cpp
+++ b/src/viewer/topiclabel.cpp
@@ -168,7 +168,7 @@ namespace Konversation
void TopicLabel::mouseMoveEvent(QMouseEvent* ev)
{
- if (m_mousePressedOnUrl && (m_mousePressPosition - \
ev->pos()).manhattanLength() > KApplication::startDragDistance()) + if \
(m_mousePressedOnUrl && (m_mousePressPosition - ev->pos()).manhattanLength() > \
QApplication::startDragDistance()) {
setSelection(0, 0);
diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
index 9b3a8c0..16f2b31 100644
--- a/src/viewer/viewcontainer.cpp
+++ b/src/viewer/viewcontainer.cpp
@@ -2132,7 +2132,7 @@ void ViewContainer::addDccChat(DCC::Chat* chat)
{
if (!chat->selfOpened()) // Someone else initiated dcc chat
{
- Application* \
konv_app=static_cast<Application*>(KApplication::kApplication()); + \
Application* konv_app=Application::instance();
konv_app->notificationHandler()->dccChat(m_frontView, chat->partnerNick());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic