summaryrefslogtreecommitdiff
path: root/src/browserapplication.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2008-11-08 12:05:58 +0100
committerAndrea Diamantini <adjam7@gmail.com>2008-11-08 12:05:58 +0100
commitf6af24273de66c1f36dcd6ddcd97d45ed7e6f474 (patch)
treebceeec618f550d67788e1010a3d4f3f5e0816a98 /src/browserapplication.cpp
parentSetting right license (diff)
downloadrekonq-f6af24273de66c1f36dcd6ddcd97d45ed7e6f474.tar.xz
Ported menubar to KDE
Diffstat (limited to 'src/browserapplication.cpp')
-rw-r--r--src/browserapplication.cpp69
1 files changed, 5 insertions, 64 deletions
diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp
index 71da13eb..2a487143 100644
--- a/src/browserapplication.cpp
+++ b/src/browserapplication.cpp
@@ -74,18 +74,15 @@ BrowserApplication::BrowserApplication(KCmdLineArgs *args, const QString &server
return;
}
-#if defined(Q_WS_MAC)
- KApplication::setQuitOnLastWindowClosed(false);
-#else
KApplication::setQuitOnLastWindowClosed(true);
-#endif
m_localServer = new QLocalServer(this);
- connect(m_localServer, SIGNAL(newConnection()),
- this, SLOT(newLocalSocketConnection()));
- if (!m_localServer->listen(serverName)) {
+ connect(m_localServer, SIGNAL(newConnection()), this, SLOT(newLocalSocketConnection()));
+ if (!m_localServer->listen(serverName))
+ {
if (m_localServer->serverError() == QAbstractSocket::AddressInUseError
- && QFile::exists(m_localServer->serverName())) {
+ && QFile::exists(m_localServer->serverName()))
+ {
QFile::remove(m_localServer->serverName());
m_localServer->listen(serverName);
}
@@ -101,11 +98,6 @@ BrowserApplication::BrowserApplication(KCmdLineArgs *args, const QString &server
m_lastSession = settings.value(QLatin1String("lastSession")).toByteArray();
settings.endGroup();
-#if defined(Q_WS_MAC)
- connect(this, SIGNAL(lastWindowClosed()),
- this, SLOT(lastWindowClosed()));
-#endif
-
QTimer::singleShot(0, this, SLOT(postLaunch()));
}
@@ -141,31 +133,6 @@ BrowserApplication *BrowserApplication::instance()
-#if defined(Q_WS_MAC)
-#include <QtGui/QMessageBox>
-void BrowserApplication::quitBrowser()
-{
- clean();
- int tabCount = 0;
- for (int i = 0; i < m_mainWindows.count(); ++i) {
- tabCount =+ m_mainWindows.at(i)->tabWidget()->count();
- }
-
- if (tabCount > 1) {
- int ret = QMessageBox::warning(mainWindow(), QString(),
- i18n("There are ") + QString( m_mainWindows.count() ) + i18n(" windows and ") + QString(tabCount) + i18n("tabs open\n"),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No);
- if (ret == QMessageBox::No)
- return;
- }
-
- exit(0);
-}
-#endif
-
-
-
/*!
Any actions that can be delayed until the window is visible
@@ -326,32 +293,6 @@ void BrowserApplication::installTranslator(const QString &name)
KApplication::installTranslator(translator);
}
-#if defined(Q_WS_MAC)
-bool BrowserApplication::event(QEvent* event)
-{
- switch (event->type()) {
- case QEvent::ApplicationActivate: {
- clean();
- if (!m_mainWindows.isEmpty()) {
- BrowserMainWindow *mw = mainWindow();
- if (mw && !mw->isMinimized()) {
- mainWindow()->show();
- }
- return true;
- }
- }
- case QEvent::FileOpen:
- if (!m_mainWindows.isEmpty()) {
- mainWindow()->loadPage(static_cast<QFileOpenEvent *>(event)->file());
- return true;
- }
- default:
- break;
- }
- return KApplication::event(event);
-}
-#endif
-
void BrowserApplication::openUrl(const QUrl &url)