From 9cb78eaa3b7a588fea60830752689ecf8db5b16e Mon Sep 17 00:00:00 2001
From: Mathias Gumz <akira at fluxbox dot org>
Date: Mon, 28 Jan 2008 08:41:42 +0100
Subject: reordering

---
 src/FbTk/Shape.cc | 13 +++++++++++--
 src/FbTk/Shape.hh | 11 -----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index c8cfb46..251d4d4 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -43,6 +43,7 @@
 #endif // SHAPE
 
 #include <algorithm>
+#include <vector>
 
 using std::min;
 
@@ -92,9 +93,17 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
     return pm.release();
 }
 
+struct CornerPixmaps {
+    FbPixmap topleft;
+    FbPixmap topright;
+    FbPixmap botleft;
+    FbPixmap botright;
 };
 
-std::vector<Shape::CornerPixmaps> Shape::s_corners;
+// unfortunately, we need a separate pixmap per screen
+std::vector<CornerPixmaps> s_corners;
+
+}; // end of anonymous namespace
 
 Shape::Shape(FbWindow &win, int shapeplaces):
     m_win(&win),
@@ -134,7 +143,7 @@ Shape::~Shape() {
 void Shape::initCorners(int screen_num) {
     if (s_corners.size() == 0)
         s_corners.resize(ScreenCount(App::instance()->display()));
- 
+
     static const unsigned char left_bits[] = { 0xc0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff };
     static const unsigned char right_bits[] = { 0x03, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff};
     static const unsigned char bottom_left_bits[] = { 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xc0 };
diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh
index 04382cf..3539959 100644
--- a/src/FbTk/Shape.hh
+++ b/src/FbTk/Shape.hh
@@ -24,8 +24,6 @@
 
 #include "FbPixmap.hh"
 
-#include <vector>
-
 namespace FbTk {
 class FbWindow;
 
@@ -67,17 +65,8 @@ private:
 
     void initCorners(int screen_num);
 
-    struct CornerPixmaps {
-        FbPixmap topleft;
-        FbPixmap topright;
-        FbPixmap botleft;
-        FbPixmap botright;
-    };
 
-    // unfortunately, we need a separate pixmap per screen
-    static std::vector<CornerPixmaps> s_corners;
     int m_shapeplaces; ///< places to shape
-
 };
 
 }; // end namespace FbTk
-- 
cgit v0.11.2