Changeset 90 for trunk/orca/qt

Timestamp:

03/14/06 20:39:22 (3 years ago)

Author:

krobillard

Message:

Qt - Removed DIR_WATCHER code.

Location:

trunk/orca/qt

Files:

• qorca.cpp (modified) (13 diffs)
• qorca.h (modified) (3 diffs)

trunk/orca/qt/qorca.cpp

@@ -31 +31 @@
 #include "cbparse.h"
 
-#ifdef DIR_WATCHER
-#include <DirWatcher.h>
-#endif
-
 
 struct LayoutInfo
@@ -107 +103 @@
 
 
-int WIDPool::add( QWidget* ptr, int type )
+int WIDPool::add( QObject* ptr, int type )
 {
     int index;
@@ -118 +114 @@
 
         rec.type   = type;
-        rec.widget = ptr;
+        rec.object = ptr;
 
         --_freeCount;
@@ -127 +123 @@
         REC rec;
         rec.type   = type;
-        rec.widget = ptr;
+        rec.object = ptr;
         _records.push_back( rec ); 
     }
@@ -142 +138 @@
     rec.type = _freeIndex;
     _freeIndex = id;
-    rec.widget = 0;
+    rec.object = 0;
 
     ++_freeCount;
@@ -153 +149 @@
     {
         REC* rec = &_records[ id ];
-        if( rec->widget )
+        if( rec->object )
             return rec;
     }
@@ -849 +845 @@
     if( rec )
     {
-        delete rec->widget;
+        delete rec->object;
     }
     orResultNONE;
@@ -913 +909 @@
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
     if( rec )
-        rec->widget->setEnabled( true );
+    {
+        QWidget* widget = qobject_cast<QWidget*>( rec->object );
+        if( widget )
+            widget->setEnabled( true );
+    }
 }
 
@@ -921 +921 @@
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
     if( rec )
-        rec->widget->setEnabled( false );
+    {
+        QWidget* widget = qobject_cast<QWidget*>( rec->object );
+        if( widget )
+            widget->setEnabled( false );
+    }
 }
 
@@ -1133 +1137 @@
         QMessageBox::information( 0, cp1, cp2 );
 }
-
-
-//----------------------------------------------------------------------------
-
-
-#ifndef DIR_WATCHER
-void QOrcaApp::fileChanged( DirWatcher* ) {}
-#endif
 
 
@@ -1169 +1165 @@
   "set-widget-value: native [wid [integer!] val]\n"
   "append-text: native [wid [integer!] val]\n"
-  "watch-dir: native [dir [string! file!] handler [block!]]\n"
   "message: native [title [string!] msg [string!] /warn]\n"
   "layout-rules: [\n"
@@ -1239 +1234 @@
     orNative( (void*) appendTextNative,     "append-text" );
     orNative( (void*) messageNative,        "message" );
-#ifdef DIR_WATCHER
-    extern void watchDirNative( OValue* );
-    extern void spawnNative( OValue* );
-    orNative( (void*) watchDirNative,       "watch-dir" );
-    orNative( (void*) spawnNative,          "spawn" );
-#endif
 
     {
@@ -1289 +1278 @@
                 delete (*it).widget;
             }
-#ifdef DIR_WATCHER
-            else if( (*it).type == WT_Watcher )
-            {
-                delete ((DirWatcher*) (*it).widget);
-            }
-#endif
 
             // Assuming all other widgets are deleted from WT_Dialog &

trunk/orca/qt/qorca.h

@@ -61 +61 @@
     {
         int type;
-        QWidget* widget;
+        union
+        {
+            QObject* object;
+            QWidget* widget;
+        };
     };
 
     WIDPool() : _freeCount(0), _freeIndex(-1) {}
 
-    int  add( QWidget*, int type );
+    int  add( QObject*, int type );
     void remove( int id );
     REC* record( int id );
@@ -106 +110 @@
 
 
-class DirWatcher;
-
 class QOrcaApp : public QApplication
 {
@@ -115 +117 @@
 
     QOrcaApp( int argc, char** argv );
-
-protected slots:
-
-    void fileChanged( DirWatcher* );
 };