generic: remove now redundant QT_KATIE guards

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kdewebkit/kwebkitpart/src/webview.cpp

@@ -45,9 +45,7 @@
 #include <QNetworkRequest>
 #include <QWebFrame>
 #include <QWebElement>
-#ifndef QT_KATIE
 #include <QWebInspector>
-#endif
 #include <QToolTip>
 #include <QCoreApplication>
 
@@ -60,9 +58,7 @@ WebView::WebView(KWebKitPart* part, QWidget* parent)
         :KWebView(parent, false),
          m_actionCollection(new KActionCollection(this)),
          m_part(part),
-#ifndef QT_KATIE
          m_webInspector(0),
-#endif
          m_autoScrollTimerId(-1),
          m_verticalAutoScrollSpeed(0),
          m_horizontalAutoScrollSpeed(0),
@@ -483,7 +479,6 @@ void WebView::editableContentActionPopupMenu(KParts::BrowserExtension::ActionGro
         editableContentActions.append(action);
     }
 
-#ifndef QT_KATIE
     if (settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)) {
         if (!m_webInspector) {
             m_webInspector = new QWebInspector;
@@ -495,7 +490,6 @@ void WebView::editableContentActionPopupMenu(KParts::BrowserExtension::ActionGro
         editableContentActions.append(action);
         editableContentActions.append(pageAction(QWebPage::InspectElement));
     }
-#endif
 
     partGroupMap.insert("editactions" , editableContentActions);
 }
@@ -611,11 +605,7 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
     const bool showDocSourceAction = (!m_result.linkUrl().isValid() &&
                                       !m_result.imageUrl().isValid() &&
                                       !m_result.isContentSelected());
-#ifndef QT_KATIE
     const bool showInspectorAction = settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled);
-#else
-    const bool showInspectorAction = false;
-#endif
 
     if (showDocSourceAction || showInspectorAction) {
         KAction *separatorAction = new KAction(m_actionCollection);
@@ -626,7 +616,6 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
     if (showDocSourceAction)
         partActions.append(m_part->actionCollection()->action("viewDocumentSource"));
 
-#ifndef QT_KATIE
     if (showInspectorAction) {
         if (!m_webInspector) {
             m_webInspector = new QWebInspector;
@@ -640,7 +629,6 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
             m_webInspector = 0;
         }
     }
-#endif
 
     partGroupMap.insert("partactions", partActions);
 }

kdewebkit/kwebkitpart/src/webview.h

@@ -31,9 +31,7 @@
 class KUrl;
 class KWebKitPart;
 class QWebHitTestResult;
-#ifndef QT_KATIE
 class QWebInspector;
-#endif
 class QLabel;
 
 class WebView : public KWebView
@@ -132,9 +130,7 @@ private:
     KActionCollection* m_actionCollection;
     QWebHitTestResult m_result;
     QPointer<KWebKitPart> m_part;
-#ifndef QT_KATIE
     QWebInspector* m_webInspector;
-#endif
 
     qint32 m_autoScrollTimerId;
     qint32 m_verticalAutoScrollSpeed;

kdewebkit/kwebpage.cpp

@@ -254,9 +254,7 @@ KWebPage::KWebPage(QObject *parent, Integration flags)
     setActionIcon(action(Undo), KIcon("edit-undo"));
     setActionIcon(action(Redo), KIcon("edit-redo"));
     setActionIcon(action(SelectAll), KIcon("edit-select-all"));
-#ifndef QT_KATIE
     setActionIcon(action(InspectElement), KIcon("view-process-all"));
-#endif
     setActionIcon(action(OpenLinkInNewWindow), KIcon("window-new"));
     setActionIcon(action(OpenFrameInNewWindow), KIcon("window-new"));
     setActionIcon(action(OpenImageInNewWindow), KIcon("window-new"));

kdewidgets/makekdewidgets.cpp

@@ -21,11 +21,7 @@ static const char classHeader[] = 	"/**\n"
                                                 "*/\n"
                                 "#include <QtGui/qicon.h>\n"
                                 "#include <QtDesigner/container.h>\n"
-                                "#ifdef QT_KATIE\n"
-                                "#include <QtUiTools/customwidget.h>\n"
-                                "#else\n"
                                 "#include <QtDesigner/customwidget.h>\n"
-                                "#endif\n"
                                 "#include <QtCore/qplugin.h>\n"
                                 "#include <QtCore/qdebug.h>\n";
 

kutils/kmediaplayer/kmediaplayer.cpp

@@ -20,9 +20,7 @@
 #include <klocale.h>
 #include <QCoreApplication>
 #include <QUrl>
-#ifndef QT_KATIE
 #include <QDragEnterEvent>
-#endif
 #include "kmediaplayer.h"
 
 #ifdef HAVE_MPV

kutils/kmediaplayer/kmediawidget.cpp

@@ -25,9 +25,7 @@
 #include <QInputDialog>
 #include <QMessageBox>
 #include <QTimer>
-#ifndef QT_KATIE
 #include <QMouseEvent>
-#endif
 
 #include "kmediaplayer.h"
 #include "kmediawidget.h"