Fixing Compilation. Going to feature improvements

7 files changed, 18 insertions, 45 deletions

diff --git a/src/cookiedialog.cpp b/src/cookiedialog.cpp
index 1628a0c6..e9399e51 100644
--- a/src/cookiedialog.cpp
+++ b/src/cookiedialog.cpp
@@ -25,6 +25,9 @@
 // Local Includes
 #include "cookiejar.h"
 
+// KDE Includes
+#include <KLocalizedString>
+
 
 CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent)
         : QAbstractTableModel(parent)
diff --git a/src/cookiedialog.h b/src/cookiedialog.h
index be8b9236..fa78100c 100644
--- a/src/cookiedialog.h
+++ b/src/cookiedialog.h
@@ -22,11 +22,12 @@
 #ifndef COOKIEDIALOG_H
 #define COOKIEDIALOG_H
 
+// Local Includes
+#include "cookiejar.h"
 
 // KDE Includes
 #include <KDialog>
 
-
 // Qt Includes
 #include <QtCore/QStringList>
 #include <QtCore/QAbstractItemModel>
@@ -37,11 +38,6 @@
 #include <QtNetwork/QNetworkCookieJar>
 
 
-// Forward Declarations
-class CookieJar;
-class CookieExceptionsModel;
-
-
 class CookieModel : public QAbstractTableModel
 {
     Q_OBJECT
diff --git a/src/cookieexceptiondialog.cpp b/src/cookieexceptiondialog.cpp
index c349c885..dba47787 100644
--- a/src/cookieexceptiondialog.cpp
+++ b/src/cookieexceptiondialog.cpp
@@ -24,6 +24,8 @@
 
 // Local Includes
 
+// Qt Includes
+#include <QtGui/QSortFilterProxyModel>
 
 
 CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent)
diff --git a/src/cookieexceptiondialog.h b/src/cookieexceptiondialog.h
index f68c119e..43afb58e 100644
--- a/src/cookieexceptiondialog.h
+++ b/src/cookieexceptiondialog.h
@@ -21,11 +21,14 @@
 #ifndef COOKIEEXCEPTIONDIALOG_H
 #define COOKIEEXCEPTIONDIALOG_H
 
+
+// Local Includes
+#include "cookiejar.h"
+
 // Qt Includes
-#include <QtGui/QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 // Forward Declarations
-class CookieJar;
 class QString;
 class QStringList;
 class QModelIndex;
diff --git a/src/cookies.ui b/src/cookies.ui
index 16e0f4ea..6a654a97 100644
--- a/src/cookies.ui
+++ b/src/cookies.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>499</width>
-    <height>400</height>
+    <width>636</width>
+    <height>383</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,22 +17,6 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Minimum</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>252</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
       <widget class="QLabel" name="label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui
index b4ce54a0..0a756f56 100644
--- a/src/cookiesexceptions.ui
+++ b/src/cookiesexceptions.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>377</width>
-    <height>405</height>
+    <width>635</width>
+    <height>416</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -97,22 +97,6 @@
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
          <widget class="QLabel" name="label_2">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
diff --git a/src/settings.cpp b/src/settings.cpp
index 9ec5ad7a..d8de1441 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -30,7 +30,8 @@
 // Local Includes
 #include "application.h"
 #include "mainwindow.h"
-#include "cookiedialogs.h"
+#include "cookiedialog.h"
+#include "cookieexceptiondialog.h"
 #include "history.h"
 #include "networkaccessmanager.h"
 #include "webview.h"