From bc901b1e79acf8c49fb76c3aeabbf59a49fc8276 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 28 Nov 2008 10:58:12 +0100 Subject: Various adjustments. Nothing really important.Various adjustments. Nothing really important... --- src/browsermainwindow.cpp | 3 --- src/browsermainwindow.h | 1 - src/findbar.cpp | 18 +++++++++--------- src/findbar.h | 3 --- src/tabwidget.cpp | 11 +---------- src/tabwidget.h | 5 ++++- src/urlbar.cpp | 14 +++++++------- src/webview.cpp | 20 ++++++++++---------- src/webview.h | 6 +++--- 9 files changed, 34 insertions(+), 47 deletions(-) diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp index 528beb13..cbf7eb54 100644 --- a/src/browsermainwindow.cpp +++ b/src/browsermainwindow.cpp @@ -398,9 +398,6 @@ void BrowserMainWindow::setupToolBar() m_searchBar = new SearchBar(m_navigationBar); m_navigationBar->addWidget(m_searchBar); connect(m_searchBar, SIGNAL(search(const QUrl&)), this, SLOT(loadUrl(const QUrl&))); -// m_toolbarSearch = new ToolbarSearch(m_navigationBar); -// m_navigationBar->addWidget(m_toolbarSearch); -// connect(m_toolbarSearch, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&))); } diff --git a/src/browsermainwindow.h b/src/browsermainwindow.h index fc57c6b9..349d2384 100644 --- a/src/browsermainwindow.h +++ b/src/browsermainwindow.h @@ -127,7 +127,6 @@ private: private: KToolBar *m_navigationBar; -// ToolbarSearch *m_toolbarSearch; SearchBar *m_searchBar; TabWidget *m_tabWidget; AutoSaver *m_autoSaver; diff --git a/src/findbar.cpp b/src/findbar.cpp index 45de4246..a0e1948d 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -90,15 +90,15 @@ void FindBar::showFind() -void FindBar::frameChanged(int frame) -{ -/* if (!m_widget) - return; - m_widget->move(0, frame); - int height = qMax(0, m_widget->y() + m_widget->height()); - setMinimumHeight(height); - setMaximumHeight(height);*/ -} +// void FindBar::frameChanged(int frame) +// { +// /* if (!m_widget) +// return; +// m_widget->move(0, frame); +// int height = qMax(0, m_widget->y() + m_widget->height()); +// setMinimumHeight(height); +// setMaximumHeight(height);*/ +// } void FindBar::slotFindNext() diff --git a/src/findbar.h b/src/findbar.h index 05dbf820..bd3c5960 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -40,9 +40,6 @@ public slots: void slotFindNext(); void slotFindPrevious(); -private slots: - void frameChanged(int frame); - private: void initializeFindWidget(); diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp index ef3dc4ea..9ce8aa59 100644 --- a/src/tabwidget.cpp +++ b/src/tabwidget.cpp @@ -25,20 +25,11 @@ #include "browserapplication.h" #include "browsermainwindow.h" #include "history.h" -// #include "urllineedit.h" #include "urlbar.h" #include "webview.h" // Qt Includes -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include diff --git a/src/tabwidget.h b/src/tabwidget.h index 63cd4e48..8e6d16b4 100644 --- a/src/tabwidget.h +++ b/src/tabwidget.h @@ -69,6 +69,9 @@ private: }; +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + + #include @@ -103,7 +106,7 @@ private: }; - +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ #include #include diff --git a/src/urlbar.cpp b/src/urlbar.cpp index 16783313..01675c3f 100644 --- a/src/urlbar.cpp +++ b/src/urlbar.cpp @@ -24,13 +24,13 @@ #include "browserapplication.h" // Qt Includes -#include -#include -#include -#include -#include -#include - +// #include +// #include +// #include +// #include +// #include +// #include +#include UrlBar::UrlBar(QWidget *parent) diff --git a/src/webview.cpp b/src/webview.cpp index 612a8a34..7cae61cf 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -108,16 +108,16 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType type) return mainWindow->currentTab()->page(); } -#if !defined(QT_NO_UITOOLS) -QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues) -{ - Q_UNUSED(url); - Q_UNUSED(paramNames); - Q_UNUSED(paramValues); - QUiLoader loader; - return loader.createWidget(classId, view()); -} -#endif // !defined(QT_NO_UITOOLS) +// #if !defined(QT_NO_UITOOLS) +// QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues) +// { +// Q_UNUSED(url); +// Q_UNUSED(paramNames); +// Q_UNUSED(paramValues); +// QUiLoader loader; +// return loader.createWidget(classId, view()); +// } +// #endif // !defined(QT_NO_UITOOLS) void WebPage::handleUnsupportedContent(QNetworkReply *reply) { diff --git a/src/webview.h b/src/webview.h index 14fbc8aa..ccd44a6f 100644 --- a/src/webview.h +++ b/src/webview.h @@ -45,9 +45,9 @@ public: protected: bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type); QWebPage *createWindow(QWebPage::WebWindowType type); -#if !defined(QT_NO_UITOOLS) - QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues); -#endif +// #if !defined(QT_NO_UITOOLS) +// QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues); +// #endif private slots: void handleUnsupportedContent(QNetworkReply *reply); -- cgit v1.2.1