summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp2
-rw-r--r--src/application.h1
-rw-r--r--src/download.cpp1
-rw-r--r--src/main.cpp1
-rw-r--r--src/mainwindow.cpp19
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/panelhistory.cpp1
-rw-r--r--src/searchbar.cpp2
-rw-r--r--src/settings.h1
-rw-r--r--src/sidepanel.cpp3
10 files changed, 6 insertions, 26 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 5b296333..7c726877 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -57,7 +57,6 @@ QPointer<BookmarkProvider> Application::s_bookmarkProvider;
Application::Application()
: KUniqueApplication()
- , m_mainWindow(0)
{
}
@@ -210,4 +209,3 @@ KIcon Application::icon(const KUrl &url) const
}
return icon;
}
-
diff --git a/src/application.h b/src/application.h
index 5c0ee3cb..d351e95d 100644
--- a/src/application.h
+++ b/src/application.h
@@ -97,4 +97,3 @@ private:
};
#endif // APPLICATION_H
-
diff --git a/src/download.cpp b/src/download.cpp
index dba7f98f..f950a37f 100644
--- a/src/download.cpp
+++ b/src/download.cpp
@@ -220,4 +220,3 @@ void Download::slotResult(KJob *job)
// inform the world
emit downloadFinished(job->error());
}
-
diff --git a/src/main.cpp b/src/main.cpp
index 630c38d7..ec9b2bea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,4 +75,3 @@ int main(int argc, char **argv)
Application app;
return app.exec();
}
-
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 82b15ebf..7ada3cb2 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -119,22 +119,16 @@ MainWindow::MainWindow()
// then, setup our actions
setupActions();
- // add a status bar
- statusBar()->show();
-
// setting up toolbars: this has to be done BEFORE setupGUI!!
setupToolBars();
- // ----- BOOKMARKS MENU: this has to be done BEFORE setupGUI!!
-// KAction *a = new KActionMenu(i18n("B&ookmarks"), this);
-// actionCollection()->addAction(QLatin1String("bookmarks"), a);
-// KActionMenu *bmMenu = Application::bookmarkProvider()->bookmarkActionMenu();
-// a->setMenu(bmMenu);
-
+ // Bookmark Menu
KActionMenu *bmMenu = Application::bookmarkProvider()->bookmarkActionMenu();
actionCollection()->addAction(QLatin1String("bookmarks"), bmMenu);
+ // Side Panel: this has to be done BEFORE setupGUI!!
setupSidePanel();
+
// a call to KXmlGuiWindow::setupGUI() populates the GUI
// with actions, using KXMLGUI.
// It also applies the saved mainwindow settings, if any, and ask the
@@ -145,14 +139,11 @@ MainWindow::MainWindow()
// setup history menu: this has to be done AFTER setupGUI!!
setupHistoryMenu();
- // bookmarks bar: this has to be done AFTER setupGUI!!
-// KToolBar *bmToolbar = toolBar("bookmarksToolBar");
-// m_bookmarkProvider->provideBmToolbar(bmToolbar);
+ // add a status bar
+ statusBar()->show();
// setting up toolbars to NOT have context menu enabled
setContextMenuPolicy(Qt::DefaultContextMenu);
-
-
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 74fee529..249360c2 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -146,4 +146,3 @@ private:
};
#endif // MAINWINDOW_H
-
diff --git a/src/panelhistory.cpp b/src/panelhistory.cpp
index 4b71cefa..20c9c311 100644
--- a/src/panelhistory.cpp
+++ b/src/panelhistory.cpp
@@ -91,4 +91,3 @@ void PanelHistory::open()
return;
emit openUrl(index.data(HistoryModel::UrlRole).toUrl());
}
-
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index 6e391d5c..bf037b9a 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -128,4 +128,4 @@ void SearchBar::handleNetworkData(QNetworkReply *networkReply)
}
networkReply->deleteLater();
-} \ No newline at end of file
+}
diff --git a/src/settings.h b/src/settings.h
index f1b6fa29..c2288b0c 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -53,4 +53,3 @@ private slots:
};
#endif // SETTINGS_H
-
diff --git a/src/sidepanel.cpp b/src/sidepanel.cpp
index 2197a603..761c3474 100644
--- a/src/sidepanel.cpp
+++ b/src/sidepanel.cpp
@@ -49,6 +49,3 @@ SidePanel::~SidePanel()
delete m_panelHistory;
}
-
-
-