diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/cookiejar.cpp | 25 | ||||
| -rw-r--r-- | src/cookiejar.h | 35 | ||||
| -rw-r--r-- | src/cookies.ui | 7 | ||||
| -rw-r--r-- | src/cookiesexceptions.ui | 9 | ||||
| -rw-r--r-- | src/history.ui | 7 |
6 files changed, 59 insertions, 28 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index edcfd561..b9d6a600 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,13 +9,13 @@ SET( rekonq_SRCS history.cpp modelmenu.cpp networkaccessmanager.cpp - searchlineedit.cpp + searchlineedit.cpp # ready to be removed.. findbar.cpp searchbar.cpp settings.cpp squeezelabel.cpp tabwidget.cpp - urllineedit.cpp + urllineedit.cpp # ready to be removed.. webview.cpp main.cpp ) diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp index 8e985abc..9a6d8577 100644 --- a/src/cookiejar.cpp +++ b/src/cookiejar.cpp @@ -349,6 +349,12 @@ void CookieJar::setAllowForSessionCookies(const QStringList &list) m_saveTimer->changeOccurred(); } + + +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + + + CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent) : QAbstractTableModel(parent) , m_cookieJar(cookieJar) @@ -459,7 +465,14 @@ void CookieModel::cookiesChanged() reset(); } -CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent) : QDialog(parent) + + +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + +CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent) + : QDialog(parent) { setupUi(this); setWindowFlags(Qt::Sheet); @@ -505,6 +518,10 @@ CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent) : QDialog(pa +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent) : QAbstractTableModel(parent) , m_cookieJar(cookiejar) @@ -622,6 +639,12 @@ bool CookieExceptionsModel::removeRows(int row, int count, const QModelIndex &pa return true; } + + +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + CookiesExceptionsDialog::CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent) : QDialog(parent) , m_cookieJar(cookieJar) diff --git a/src/cookiejar.h b/src/cookiejar.h index fbc89946..d3843c51 100644 --- a/src/cookiejar.h +++ b/src/cookiejar.h @@ -21,13 +21,16 @@ #ifndef COOKIEJAR_H #define COOKIEJAR_H -#include <QtNetwork/QNetworkCookieJar> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QStringList> +// KDE Includes +#include <QDialog> -#include <QtGui/QDialog> -#include <QtGui/QTableView> + +// Qt Includes +#include <QNetworkCookieJar> +#include <QAbstractItemModel> +#include <QStringList> +#include <QTableView> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; @@ -105,6 +108,12 @@ private: QStringList m_exceptions_allowForSession; }; + + + // ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + + + class CookieModel : public QAbstractTableModel { Q_OBJECT @@ -124,8 +133,13 @@ private: CookieJar *m_cookieJar; }; + + +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + + + #include "ui_cookies.h" -#include "ui_cookiesexceptions.h" class CookiesDialog : public QDialog, public Ui_CookiesDialog { @@ -160,6 +174,15 @@ private: QStringList m_sessionCookies; }; + + + +// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + + + +#include "ui_cookiesexceptions.h" + class CookiesExceptionsDialog : public QDialog, public Ui_CookiesExceptionsDialog { Q_OBJECT diff --git a/src/cookies.ui b/src/cookies.ui index c4bccc54..384b31b0 100644 --- a/src/cookies.ui +++ b/src/cookies.ui @@ -27,7 +27,7 @@ </spacer> </item> <item row="0" column="1" > - <widget class="SearchLineEdit" name="search" /> + <widget class="KLineEdit" name="search" /> </item> <item row="1" column="0" colspan="2" > <widget class="EditTableView" name="cookiesTable" /> @@ -74,11 +74,6 @@ </widget> <customwidgets> <customwidget> - <class>SearchLineEdit</class> - <extends>QLineEdit</extends> - <header>searchlineedit.h</header> - </customwidget> - <customwidget> <class>EditTableView</class> <extends>QTableView</extends> <header>edittableview.h</header> diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui index 3d9ef624..de59eee0 100644 --- a/src/cookiesexceptions.ui +++ b/src/cookiesexceptions.ui @@ -29,7 +29,7 @@ </widget> </item> <item> - <widget class="QLineEdit" name="domainLineEdit" /> + <widget class="KLineEdit" name="domainLineEdit" /> </item> </layout> </item> @@ -103,7 +103,7 @@ </spacer> </item> <item row="0" column="3" > - <widget class="SearchLineEdit" name="search" /> + <widget class="KLineEdit" name="search" /> </item> <item row="1" column="0" colspan="4" > <widget class="EditTableView" name="exceptionTable" /> @@ -152,11 +152,6 @@ </widget> <customwidgets> <customwidget> - <class>SearchLineEdit</class> - <extends>QLineEdit</extends> - <header>searchlineedit.h</header> - </customwidget> - <customwidget> <class>EditTableView</class> <extends>QTableView</extends> <header>edittableview.h</header> diff --git a/src/history.ui b/src/history.ui index 0944940e..806bc9ad 100644 --- a/src/history.ui +++ b/src/history.ui @@ -27,7 +27,7 @@ </spacer> </item> <item row="0" column="1" > - <widget class="SearchLineEdit" name="search" /> + <widget class="KLineEdit" name="search" /> </item> <item row="1" column="0" colspan="2" > <widget class="EditTreeView" name="tree" /> @@ -74,11 +74,6 @@ </widget> <customwidgets> <customwidget> - <class>SearchLineEdit</class> - <extends>QLineEdit</extends> - <header>searchlineedit.h</header> - </customwidget> - <customwidget> <class>EditTreeView</class> <extends>QTreeView</extends> <header>edittreeview.h</header> |