diff --git a/kdewebkit/kwebkitpart/src/webview.cpp b/kdewebkit/kwebkitpart/src/webview.cpp index b519b1f8..975deb6a 100644 --- a/kdewebkit/kwebkitpart/src/webview.cpp +++ b/kdewebkit/kwebkitpart/src/webview.cpp @@ -45,9 +45,7 @@ #include #include #include -#ifndef QT_KATIE #include -#endif #include #include @@ -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); } diff --git a/kdewebkit/kwebkitpart/src/webview.h b/kdewebkit/kwebkitpart/src/webview.h index 28451840..db284923 100644 --- a/kdewebkit/kwebkitpart/src/webview.h +++ b/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 m_part; -#ifndef QT_KATIE QWebInspector* m_webInspector; -#endif qint32 m_autoScrollTimerId; qint32 m_verticalAutoScrollSpeed; diff --git a/kdewebkit/kwebpage.cpp b/kdewebkit/kwebpage.cpp index 23e0b286..583df204 100644 --- a/kdewebkit/kwebpage.cpp +++ b/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")); diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index ce29f26c..3b46f7fe 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -21,11 +21,7 @@ static const char classHeader[] = "/**\n" "*/\n" "#include \n" "#include \n" - "#ifdef QT_KATIE\n" - "#include \n" - "#else\n" "#include \n" - "#endif\n" "#include \n" "#include \n"; diff --git a/kutils/kmediaplayer/kmediaplayer.cpp b/kutils/kmediaplayer/kmediaplayer.cpp index 49856c13..5c4e43f8 100644 --- a/kutils/kmediaplayer/kmediaplayer.cpp +++ b/kutils/kmediaplayer/kmediaplayer.cpp @@ -20,9 +20,7 @@ #include #include #include -#ifndef QT_KATIE #include -#endif #include "kmediaplayer.h" #ifdef HAVE_MPV diff --git a/kutils/kmediaplayer/kmediawidget.cpp b/kutils/kmediaplayer/kmediawidget.cpp index 72b4c542..8a6665dd 100644 --- a/kutils/kmediaplayer/kmediawidget.cpp +++ b/kutils/kmediaplayer/kmediawidget.cpp @@ -25,9 +25,7 @@ #include #include #include -#ifndef QT_KATIE #include -#endif #include "kmediaplayer.h" #include "kmediawidget.h"