KDE4 port

[kwingrid.git] / kwingrid.h

diff --git a/kwingrid.h b/kwingrid.h
index 78d0733..66047e4 100644 (file)
--- a/kwingrid.h
+++ b/kwingrid.h
@@ -3,22 +3,23 @@
 #ifndef __kwingrid_h
 #define __kwingrid_h 1
 
-#include <qobject.h>
-#include <qdatetime.h>
-#include <kwinmodule.h>
-#include <kwingrid_iface.h>
+#include <Xlib.h>
+#include <Xutil.h>
 
-class KWinGrid 
-    : public QObject, public virtual KWinGrid_Iface
+#include <QtCore/QObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QRect>
+
+class KWinGrid : public QObject
 {
     Q_OBJECT
 
 public:
-    KWinGrid(int hgap__, int vgap__, int hsplit__, int vsplit__, int split__=0);
-    
+    KWinGrid(int hgap__, int vgap__, int hsplit__, int vsplit__, int split__=0, int ignorestruts__=-1);
+
     virtual void move(int __xslot, int __yslot);
     virtual void resize(int __xsize, int __ysize);
-    virtual void moveResize(int __xslot, int __yslot, 
+    virtual void moveResize(int __xslot, int __yslot,
                            int __xsize, int __ysize);
     virtual void moveRelative(int __xdiff, int __ydiff);
     virtual void resizeRelative(int __xdiff, int __ydiff);
@@ -33,7 +34,7 @@ public slots:
     void move_TR();
     void move_BL();
     void move_BR();
-    
+
     void resize_Q();
     void resize_H();
     void resize_V();
@@ -43,7 +44,7 @@ public slots:
     void move_R();
     void move_U();
     void move_D();
-    
+
     void resize_IH();
     void resize_DH();
     void resize_IV();
@@ -56,21 +57,20 @@ private:
     void initGeometry(int __forceScreens=-1);
     void updateGeometry(QRect& __new);
     void applyGeometry();
-    QRect doMoveResize(int __xslot, int __yslot, 
+    QRect doMoveResize(int __xslot, int __yslot,
                       int __xsize, int __ysize);
 
     void updateTimestamp(void);
-    
-    KWinModule* module_;
-    DCOPClient* client_;
 
     int split_;
+    int ignorestruts_;
 
     int activeWindow_;
     QRect inner_;
     QRect outer_;
     QRect orig_;
     QRect region_;
+    XSizeHints hints_;
     int screen_;
     int numScreens_;