summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-04-08 10:51:29 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-04-08 10:51:29 +0200
commit5a9d9ad3b251ab1ff3c62af465f37bdf5fd0bf6e (patch)
tree30d82bfdc820ec196cbd4ec9cb259ce74e6261fa
parentAdded warning to debug navigation requests.. (diff)
downloadrekonq-5a9d9ad3b251ab1ff3c62af465f37bdf5fd0bf6e.tar.xz
Removed unuseful commented code
-rw-r--r--src/mainwindow.cpp68
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/searchbar.cpp4
-rw-r--r--src/settings.cpp9
4 files changed, 1 insertions, 81 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 54d632d2..20020ca3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -133,9 +133,6 @@ MainWindow::MainWindow()
KToolBar *bmToolbar = toolBar("bookmarksToolBar");
m_bookmarksProvider->provideBmToolbar(bmToolbar);
- // setup Tab Bar
-// setupTabBar();
-
// setting up toolbars to NOT have context menu enabled
setContextMenuPolicy(Qt::DefaultContextMenu);
}
@@ -286,24 +283,6 @@ void MainWindow::setupActions()
}
-// void MainWindow::setupTabBar()
-// {
-// // Left corner button
-// QToolButton *addTabButton = new QToolButton(this);
-// addTabButton->setDefaultAction(actionCollection()->action("new_tab"));
-// addTabButton->setAutoRaise(true);
-// addTabButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
-// m_view->setCornerWidget(addTabButton, Qt::TopLeftCorner);
-//
-// // right corner button
-// QToolButton *closeTabButton = new QToolButton(this);
-// closeTabButton->setDefaultAction(actionCollection()->action("close_tab"));
-// closeTabButton->setAutoRaise(true);
-// closeTabButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
-// m_view->setCornerWidget(closeTabButton, Qt::TopRightCorner);
-// }
-
-
void MainWindow::setupHistoryMenu()
{
HistoryMenu *historyMenu = new HistoryMenu(this);
@@ -333,12 +312,7 @@ void MainWindow::slotUpdateConfiguration()
defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family());
defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fnSize);
-// // =========== Privacy ==============
-// bool arePluginsEnabled = ReKonfig::enablePlugins();
-// bool isJavascriptEnabled = ReKonfig::enableJavascript();
-//
-// defaultSettings->setAttribute(QWebSettings::PluginsEnabled, arePluginsEnabled);
-// defaultSettings->setAttribute(QWebSettings::JavascriptEnabled, isJavascriptEnabled);
+ // =========== Privacy ==============
// ================ WebKit ============================
defaultSettings->setAttribute(QWebSettings::AutoLoadImages, ReKonfig::autoLoadImages());
@@ -492,13 +466,6 @@ void MainWindow::slotUpdateWindowTitle(const QString &title)
}
-// void MainWindow::slotFileNew()
-// {
-// Application::instance()->newWebView();
-// slotHome();
-// }
-
-
void MainWindow::slotFileOpen()
{
QString filePath = KFileDialog::getOpenFileName(KUrl(),
@@ -577,26 +544,6 @@ void MainWindow::slotPrivateBrowsing(bool enable)
}
}
-
-// void MainWindow::closeEvent(QCloseEvent *event)
-// {
-// if (m_view->count() > 1)
-// {
-// int ret = KMessageBox::warningYesNo(this,
-// i18n("Are you sure you want to close the window?" " There are %1 tab open" , m_view->count() ),
-// i18n("Closing")
-// );
-// if (ret == KMessageBox::No)
-// {
-// event->ignore();
-// return;
-// }
-// }
-// event->accept();
-// deleteLater();
-// }
-
-
void MainWindow::slotFind(const QString & search)
{
if (!currentTab())
@@ -713,19 +660,6 @@ void MainWindow::slotToggleInspector(bool enable)
}
-// void MainWindow::slotSwapFocus()
-// {
-// if ( currentTab()->hasFocus() )
-// {
-// m_view->currentLineEdit()->setFocus();
-// }
-// else
-// {
-// currentTab()->setFocus();
-// }
-// }
-
-
MainView *MainWindow::mainView() const
{
return m_view;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c062e86b..0ca76498 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -63,7 +63,6 @@ public:
private:
void setupActions();
void setupHistoryMenu();
-// void setupTabBar();
void setupToolBars();
public slots:
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index d5b68e54..6e391d5c 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -92,10 +92,6 @@ void SearchBar::searchNow()
void SearchBar::focusInEvent(QFocusEvent *event)
{
KLineEdit::focusInEvent(event);
-
-// QPalette p;
-// p.setColor(QPalette::Text , Qt::black);
-// setPalette(p);
clear();
}
diff --git a/src/settings.cpp b/src/settings.cpp
index 5922d786..e5a8b025 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -160,12 +160,7 @@ void SettingsDialog::readConfig()
connect(d->generalUi.downloadDirUrlRequester, SIGNAL(textChanged(QString)), this, SLOT(saveSettings()));
// ======= Fonts
-// QFont stdFont = ReKonfig::standardFont();
-// d->fontsUi.standardFont->setCurrentFont(stdFont);
-//
-// QFont fxFont = ReKonfig::fixedFont();
d->fontsUi.kcfg_fixedFont->setOnlyFixed(true);
-// d->fontsUi.fixedFont->setCurrentFont(fxFont);
// ======= Proxy
bool proxyEnabled = ReKonfig::isProxyEnabled();
@@ -180,10 +175,6 @@ void SettingsDialog::saveSettings()
// General
ReKonfig::setDownloadDir(d->generalUi.downloadDirUrlRequester->url().prettyUrl());
- // Fonts
-// ReKonfig::setStandardFont( d->fontsUi.standardFont->currentFont() );
-// ReKonfig::setFixedFont( d->fontsUi.fixedFont->currentFont() );
-
// Save
ReKonfig::self()->writeConfig();
}