[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita] krita: Remove unneeded includes of kis_opengl.h
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-11-30 13:21:14
Message-ID: E1a3OOI-0007K9-7h () scm ! kde ! org
[Download RAW message or body]

Git commit 6861a601eed65681a61e09e50108e5e3c1d931f8 by Friedrich W. H. Koss=
ebau.
Committed on 30/11/2015 at 13:15.
Pushed by kossebau into branch 'master'.

Remove unneeded includes of kis_opengl.h

M  +0    -2    krita/gemini/MainWindow.cpp
M  +0    -1    krita/main.cc
M  +0    -10   krita/plugins/paintops/chalk/kis_chalk_paintop_settings.h
M  +1    -12   krita/plugins/paintops/sketch/kis_sketch_paintop_settings.h
M  +0    -1    krita/sketch/SketchDeclarativeView.cpp
M  +0    -1    krita/ui/kis_zoom_manager.cc

http://commits.kde.org/krita/6861a601eed65681a61e09e50108e5e3c1d931f8

diff --git a/krita/gemini/MainWindow.cpp b/krita/gemini/MainWindow.cpp
index c581b5c..a2df690 100644
--- a/krita/gemini/MainWindow.cpp
+++ b/krita/gemini/MainWindow.cpp
@@ -23,8 +23,6 @@
 #include "desktopviewproxy.h"
 #include "ViewModeSwitchEvent.h"
 =

-#include "opengl/kis_opengl.h"
-
 #include <QApplication>
 #include <QResizeEvent>
 #include <QDeclarativeView>
diff --git a/krita/main.cc b/krita/main.cc
index 1d37f64..0067163 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -38,7 +38,6 @@
 #include "ui/KisDocument.h"
 #include "kis_splash_screen.h"
 #include "KisPart.h"
-#include "opengl/kis_opengl.h"
 #include "KisApplicationArguments.h"
 =

 #if defined Q_OS_WIN
diff --git a/krita/plugins/paintops/chalk/kis_chalk_paintop_settings.h b/kr=
ita/plugins/paintops/chalk/kis_chalk_paintop_settings.h
index 0f6d18c..74e66c6 100644
--- a/krita/plugins/paintops/chalk/kis_chalk_paintop_settings.h
+++ b/krita/plugins/paintops/chalk/kis_chalk_paintop_settings.h
@@ -26,16 +26,6 @@
 =

 #include <kis_pressure_opacity_option.h>
 =

-#include <opengl/kis_opengl.h>
-
-#if defined(_WIN32) || defined(_WIN64)
-#ifndef __MINGW32__
-# include <windows.h>
-#endif
-#endif
-
-
-
 =

 class KisChalkPaintOpSettings : public KisPaintOpSettings
 {
diff --git a/krita/plugins/paintops/sketch/kis_sketch_paintop_settings.h b/=
krita/plugins/paintops/sketch/kis_sketch_paintop_settings.h
index 1441805..914d8a4 100644
--- a/krita/plugins/paintops/sketch/kis_sketch_paintop_settings.h
+++ b/krita/plugins/paintops/sketch/kis_sketch_paintop_settings.h
@@ -19,24 +19,13 @@
 #ifndef KIS_SKETCH_PAINTOP_SETTINGS_H_
 #define KIS_SKETCH_PAINTOP_SETTINGS_H_
 =

-#include <kis_paintop_settings.h>
+#include <kis_brush_based_paintop_settings.h>
 #include <kis_types.h>
 =

 #include "kis_sketch_paintop_settings_widget.h"
 =

 #include <kis_pressure_opacity_option.h>
 =

-#include <opengl/kis_opengl.h>
-
-#if defined(_WIN32) || defined(_WIN64)
-#ifndef __MINGW32__
-# include <windows.h>
-#endif
-#endif
-#include <kis_brush_based_paintop_settings.h>
-
-
-
 =

 class KisSketchPaintOpSettings : public KisBrushBasedPaintOpSettings
 {
diff --git a/krita/sketch/SketchDeclarativeView.cpp b/krita/sketch/SketchDe=
clarativeView.cpp
index 7ed31f2..0dddc69 100644
--- a/krita/sketch/SketchDeclarativeView.cpp
+++ b/krita/sketch/SketchDeclarativeView.cpp
@@ -17,7 +17,6 @@
  */
 #include "SketchDeclarativeView.h"
 =

-#include <opengl/kis_opengl.h>
 #include <QWidget>
 #include <QGLWidget>
 #include <QGLFramebufferObject>
diff --git a/krita/ui/kis_zoom_manager.cc b/krita/ui/kis_zoom_manager.cc
index e319eab..545cb34 100644
--- a/krita/ui/kis_zoom_manager.cc
+++ b/krita/ui/kis_zoom_manager.cc
@@ -46,7 +46,6 @@
 #include "kis_config.h"
 #include "krita_utils.h"
 #include "kis_canvas_resource_provider.h"
-#include "opengl/kis_opengl.h"
 #include "kis_lod_transform.h"
 =

 =


[prev in list] [next in list] [prev in thread] [next in thread]