Re-enable the restore on crash message bar :)

8 files changed, 26 insertions, 26 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b8dd0c06..3ba7c641 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -86,7 +86,7 @@ set(rekonq_KDEINIT_SRCS
     useragent/useragentwidget.cpp
     #----------------------------------------
     webtab/clicktoflash.cpp
-    webtab/messagebar.cpp
+    webtab/crashmessagebar.cpp
     webtab/networkaccessmanager.cpp
     webtab/previewselectorbar.cpp
     webtab/protocolhandler.cpp
diff --git a/src/application.cpp b/src/application.cpp
index 1ac66188..bd48a748 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -63,15 +63,6 @@
 #include <KStartupInfo>
 
 #include <KMessageBox>
-// #include <KIcon>
-// #include <KStandardDirs>
-// #include <KAction>
-
-// #include <KGlobal>
-// #include <KCharsets>
-// #include <KPushButton>
-// #include <KMimeType>
-//
 
 // Qt Includes
 #include <QDBusInterface>
@@ -243,7 +234,7 @@ int Application::newInstance()
     {
         if (hasToBeRecoveredFromCrash)
         {
-            QTimer::singleShot(1000, tabWindow()->currentWebWindow(), SLOT(showMessageBar()));
+            QTimer::singleShot(1000, tabWindow()->currentWebWindow(), SLOT(showCrashMessageBar()));
         }
         else
         {
diff --git a/src/webtab/messagebar.cpp b/src/webtab/crashmessagebar.cpp
index 0e89ac56..11eefa41 100644
--- a/src/webtab/messagebar.cpp
+++ b/src/webtab/crashmessagebar.cpp
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2010-2011 by Pierre Rossi <pierre dot rossi at gmail dot com>
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -26,8 +26,8 @@
 
 
 // Self Includes
-#include "messagebar.h"
-#include "messagebar.moc"
+#include "crashmessagebar.h"
+#include "crashmessagebar.moc"
 
 // KDE Includes
 #include <KIcon>
@@ -38,7 +38,7 @@
 #include <QAction>
 
 
-MessageBar::MessageBar(const QString &message, QWidget *parent)
+CrashMessageBar::CrashMessageBar(const QString &message, QWidget *parent)
     : KMessageWidget(parent)
 {
     connect(this, SIGNAL(accepted()), this, SLOT(hideAndDelete()));
@@ -64,7 +64,7 @@ MessageBar::MessageBar(const QString &message, QWidget *parent)
 }
 
 
-void MessageBar::hideAndDelete()
+void CrashMessageBar::hideAndDelete()
 {
     animatedHide();
     deleteLater();
diff --git a/src/webtab/messagebar.h b/src/webtab/crashmessagebar.h
index bbf5d5d4..3bbc12ab 100644
--- a/src/webtab/messagebar.h
+++ b/src/webtab/crashmessagebar.h
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2010-2011 by Pierre Rossi <pierre dot rossi at gmail dot com>
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -25,8 +25,8 @@
 * ============================================================ */
 
 
-#ifndef MESSAGEBAR_H
-#define MESSAGEBAR_H
+#ifndef CRASH_MESSAGE_BAR_H
+#define CRASH_MESSAGE_BAR_H
 
 // Rekonq Includes
 #include "rekonq_defines.h"
@@ -35,12 +35,12 @@
 #include <KMessageWidget>
 
 
-class REKONQ_TESTS_EXPORT MessageBar : public KMessageWidget
+class REKONQ_TESTS_EXPORT CrashMessageBar : public KMessageWidget
 {
     Q_OBJECT
 
 public:
-    explicit MessageBar(const QString & message, QWidget *parent);
+    explicit CrashMessageBar(const QString & message, QWidget *parent);
 
 private Q_SLOTS:
     void hideAndDelete();
@@ -51,4 +51,4 @@ Q_SIGNALS:
 };
 
 
-#endif // MESSAGEBAR_H
+#endif // CRASH_MESSAGE_BAR_H
diff --git a/src/webtab/webtab.cpp b/src/webtab/webtab.cpp
index 1a4c0fe2..549fa285 100644
--- a/src/webtab/webtab.cpp
+++ b/src/webtab/webtab.cpp
@@ -37,7 +37,7 @@
 #include "sessionmanager.h"
 #include "syncmanager.h"
 
-#include "messagebar.h"
+#include "crashmessagebar.h"
 #include "previewselectorbar.h"
 #include "searchenginebar.h"
 #include "walletbar.h"
@@ -279,9 +279,9 @@ void WebTab::setPart(KParts::ReadOnlyPart *p, const KUrl &u)
 }
 
 
-void WebTab::showMessageBar()
+void WebTab::showCrashMessageBar()
 {
-    MessageBar *msgBar = new MessageBar(i18n("It seems rekonq was not closed properly. Do you want "
+    CrashMessageBar *msgBar = new CrashMessageBar(i18n("It seems rekonq was not closed properly. Do you want "
                                         "to restore the last saved session?"), this);
 
     qobject_cast<QVBoxLayout *>(layout())->insertWidget(0, msgBar);
diff --git a/src/webtab/webtab.h b/src/webtab/webtab.h
index a0e6890d..2773dc12 100644
--- a/src/webtab/webtab.h
+++ b/src/webtab/webtab.h
@@ -75,6 +75,8 @@ public:
     void createPreviewSelectorBar(int index);
     void hideSelectorBar();
 
+    void showCrashMessageBar();
+
     bool isPageLoading();
 
     KParts::ReadOnlyPart *part();
@@ -86,7 +88,6 @@ private Q_SLOTS:
 
     void createWalletBar(const QString &, const QUrl &);
 
-    void showMessageBar();
     void loadFinished();
 
     void showSearchEngineBar();
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index f7adb1b6..0c635800 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -866,3 +866,9 @@ void WebWindow::setPrivateBrowsing(bool on)
     _tab->page()->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, on);
     _isPrivateBrowsing = on;
 }
+
+
+void WebWindow::showCrashMessageBar()
+{
+    _tab->showCrashMessageBar();
+}
diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h
index a333f310..b39df0ab 100644
--- a/src/webwindow/webwindow.h
+++ b/src/webwindow/webwindow.h
@@ -97,6 +97,8 @@ private Q_SLOTS:
     void webLoadStarted();
     void webLoadFinished(bool);
 
+    void showCrashMessageBar();
+
     void urlbarFocused();
 
     // history related