patch for compilation under qt4

diff --git a/orte/contrib/shape/FMainIcon.png b/orte/contrib/shape/FMainIcon.png
new file mode 100644 (file)
index 0000000..4e6438b
Binary files /dev/null and b/orte/contrib/shape/FMainIcon.png differ

diff --git a/orte/contrib/shape/FPublisher.ui.h b/orte/contrib/shape/FPublisher.ui.h
index 035ff80e0e3b36d8626fc9829af38e377b37eaa5..471c587793fff8da2da02391bf8bc9eb6b57fe2c 100644 (file)
--- a/orte/contrib/shape/FPublisher.ui.h
+++ b/orte/contrib/shape/FPublisher.ui.h
@@ -9,6 +9,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <qtimer.h> 
+#include <qapplication.h>
+#if (QT_VERSION-0 >= 0x040000)
+#include <QCloseEvent>
+#endif
+
+extern QApplication *a;
 
 void FPublisher::init()
 {
@@ -73,6 +79,7 @@ void FPublisher::destroy()
 
 void FPublisher::Timer()
 {
+    a->lock();
     if(rect.left()<=0) incx=stepx;
     if(rect.top()<=0) incy=stepy;
     if((rect.right())>=view->width()) incx=-stepx;
@@ -91,6 +98,7 @@ void FPublisher::Timer()
     boxType.rectangle.bottom_right_x=rect.right();
     boxType.rectangle.bottom_right_y=rect.bottom();
     ORTEPublicationSend(publisher);    
+    a->unlock();
 }
 
 
@@ -99,7 +107,9 @@ void FPublisher::strengthChanged()
     ORTEPublProp  pp;
     
     if (!publisher) return;
+    a->lock();
     ORTEPublicationPropertiesGet(publisher,&pp);
     pp.strength=slider->value();
     ORTEPublicationPropertiesSet(publisher,&pp);
+    a->unlock();
 }

diff --git a/orte/contrib/shape/FPublisherIcon.png b/orte/contrib/shape/FPublisherIcon.png
new file mode 100644 (file)
index 0000000..4e6438b
Binary files /dev/null and b/orte/contrib/shape/FPublisherIcon.png differ

diff --git a/orte/contrib/shape/FSubscriber.ui b/orte/contrib/shape/FSubscriber.ui
index cba85a51f1aff7ee2fb98f2259e03956dd3b863c..c3c5f87710da5e710798fdd1ff388217281a624e 100644 (file)
--- a/orte/contrib/shape/FSubscriber.ui
+++ b/orte/contrib/shape/FSubscriber.ui
@@ -200,7 +200,6 @@
 </connections>
 <includes>
     <include location="global" impldecl="in declaration">orte.h</include>
-    <include location="global" impldecl="in declaration">pthread.h</include>
     <include location="local" impldecl="in declaration">BoxType.h</include>
     <include location="local" impldecl="in implementation">FSubscriber.ui.h</include>
 </includes>
@@ -221,7 +220,6 @@
     <variable>NtpTime msRed;</variable>
     <variable>NtpTime msBlack;</variable>
     <variable>NtpTime msYellow;</variable>
-    <variable access="public">pthread_mutex_t mutex;</variable>
 </variables>
 <slots>
     <slot access="protected">init()</slot>

diff --git a/orte/contrib/shape/FSubscriber.ui.h b/orte/contrib/shape/FSubscriber.ui.h
index 5adf6812ab4efd11fbfb1cba67018e6480751fd5..ce5c3858d3e4679a6a40e68e905f242df7497bd5 100644 (file)
--- a/orte/contrib/shape/FSubscriber.ui.h
+++ b/orte/contrib/shape/FSubscriber.ui.h
@@ -9,6 +9,9 @@
 #include <stdio.h>
 #include <qtimer.h> 
 #include <qapplication.h>
+#if (QT_VERSION-0 >= 0x040000)
+#include <QCloseEvent>
+#endif
 
 extern QApplication *a;
 
@@ -32,7 +35,6 @@ void FSubscriber::destroy()
     if (domain) {
       ORTEDomainAppDestroy(domain);
       domain=NULL;
-      pthread_mutex_destroy(&mutex);
     }
 }
 
@@ -42,7 +44,6 @@ recvCallBack(const ORTERecvInfo *info,void *vinstance, void *recvCallBackParam)
   FSubscriber *s=(FSubscriber*)recvCallBackParam;
   QRect   rect;
 
-
   a->lock();
   switch (info->status) {
     case NEW_DATA:

diff --git a/orte/contrib/shape/FSubscriberIcon.png b/orte/contrib/shape/FSubscriberIcon.png
new file mode 100644 (file)
index 0000000..4e6438b
Binary files /dev/null and b/orte/contrib/shape/FSubscriberIcon.png differ

diff --git a/orte/contrib/shape/MainForm.ui.h b/orte/contrib/shape/MainForm.ui.h
index 0fc4aeb08ad4a63c187c95a27936c7fc9b38a479..02636b56e56b6ed0e59d269ae79df82dbbdcb97c 100644 (file)
--- a/orte/contrib/shape/MainForm.ui.h
+++ b/orte/contrib/shape/MainForm.ui.h
@@ -10,10 +10,16 @@
 #include <qapplication.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <qptrlist.h>
 #include "FPublisher.h"
 #include "FSubscriber.h"
 #include "richtext.h"
+#if (QT_VERSION-0 >= 0x040000)
+#include <QCloseEvent>
+#include <QPixmap>
+#include <q3ptrlist.h>
+#else
+#include <qptrlist.h>
+#endif
 
 
 void MainForm::addPublisher()
@@ -23,6 +29,9 @@ void MainForm::addPublisher()
     fp = new FPublisher;
     connect( this, SIGNAL( sigClose() ), fp, SLOT( destroy() ) );
     fp->initPublisher(publGroup->id(publGroup->selected()),rand()%3);
+#if (QT_VERSION-0 >= 0x040000)
+    fp->setWindowIcon(QPixmap("FPublisherIcon.png"));
+#endif
     fp->show();
 }
 
@@ -37,6 +46,9 @@ void MainForm::addSubscriber()
         clRed->isChecked(),
         clBlack->isChecked(),
         clYellow->isChecked());
+#if (QT_VERSION-0 >= 0x040000)
+    fs->setWindowIcon(QPixmap("FSubscriberIcon.png"));
+#endif    
     fs->show();
 }
 

diff --git a/orte/contrib/shape/MyQFrame.cpp b/orte/contrib/shape/MyQFrame.cpp
index f6573003736e29a827c832f6a09ce604a0f4ccce..9d28085d04b9ccc92953c97c80fd84adc4220fe6 100644 (file)
--- a/orte/contrib/shape/MyQFrame.cpp
+++ b/orte/contrib/shape/MyQFrame.cpp
@@ -5,6 +5,11 @@
 ****************************************************************/
 
 #include "MyQFrame.h"
+#if (QT_VERSION-0 >= 0x040000)
+#include <QPolygon>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#endif
 
 MyQFrame::MyQFrame( QWidget *parent, const char *name )
         : QFrame( parent, name )
@@ -30,12 +35,12 @@ void MyQFrame::activateObject(int object,int color, int shape) {
 void MyQFrame::deactivateObject(int object) {
     if (object>4) return;
     objects[object]=0;
-    repaint();
+    update();
 }
 
 void MyQFrame::setPosition(int object,QRect position) {
     positions[object]=position;
-    repaint();
+    update();
 }
 
 void MyQFrame::paintEvent(QPaintEvent*)
@@ -45,7 +50,7 @@ void MyQFrame::paintEvent(QPaintEvent*)
     for(int i=0;i<5;i++) {
        if (!objects[i]) continue;
        p.setBrush(colors[i]);
-       p.setPen(NoPen);
+       p.setPen(Qt::NoPen);
        switch(shapes[i]){
            case 0://rectangle
                p.drawRect(positions[i]);
@@ -54,7 +59,11 @@ void MyQFrame::paintEvent(QPaintEvent*)
                p.drawEllipse(positions[i]);
                break;
            case 2: //triangle
+#if (QT_VERSION-0 >= 0x040000)
+               QPolygon pt;
+#else
                QPointArray pt(3);
+#endif
                pt.putPoints(0,3, positions[i].center().x(),positions[i].top(), 
                                  positions[i].right(),positions[i].bottom(), 
                                  positions[i].left(),positions[i].bottom());

diff --git a/orte/contrib/shape/main.cpp b/orte/contrib/shape/main.cpp
index abd44e1481f80520ffe19b3f5387f862bf015540..7a3af50c1a02fcab757b31c2539ca08a13f3b788 100644 (file)
--- a/orte/contrib/shape/main.cpp
+++ b/orte/contrib/shape/main.cpp
@@ -1,4 +1,7 @@
 #include <qapplication.h>
+#if (QT_VERSION-0 >= 0x040000)
+#include <QPixmap>
+#endif
 #include "MainForm.h"
 
 QApplication *a;
@@ -8,6 +11,9 @@ int main( int argc, char ** argv )
     a=new QApplication(argc,argv);
     MainForm w;
     a->setMainWidget( &w);
+#if (QT_VERSION-0 >= 0x040000)
+    w.setWindowIcon(QPixmap("FMainIcon.png"));
+#endif
     w.show();
     a->connect( a, SIGNAL( lastWindowClosed() ), a, SLOT( quit() ) );
     return a->exec();

diff --git a/orte/contrib/shape/ortedemo.pro b/orte/contrib/shape/ortedemo.pro
index d2518bfced9d40719a4423bf47601d366f528ee1..c7052212aa7c1b8507151ab49fd6ff220c814457 100644 (file)
--- a/orte/contrib/shape/ortedemo.pro
+++ b/orte/contrib/shape/ortedemo.pro
@@ -16,10 +16,20 @@ FORMS       = MainForm.ui \
        FPublisher.ui \
        FSubscriber.ui
 IMAGES = ocera_logo.png \
-       shapes.png
+       shapes.png \
+       marble.png \
+       FMainIcon.png \
+       FPublisherIcon.png \
+       FSubscriberIcon.png
 TEMPLATE       =app
 CONFIG += qt-mt 
 INCLUDEPATH    += .
 DEFINES += HAVE_STDINT_H QT_THREAD_SUPPORT
 LIBS   += -lorte -lpthread 
+win32:LIBS     += -lws2_32 
 LANGUAGE       = C++
+
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3

diff --git a/orte/contrib/shape/richtext.cpp b/orte/contrib/shape/richtext.cpp
index b001714ad420c6e188b4b074fccdaae7123f0187..e9df5ca9c3a8060a1336d090736877c0fa3cd654 100644 (file)
--- a/orte/contrib/shape/richtext.cpp
+++ b/orte/contrib/shape/richtext.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: richtext.cpp,v 1.7 2005/02/23 10:14:23 smolik Exp $
+** $Id: richtext.cpp,v 1.8 2005/11/03 09:27:47 smolik Exp $
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
@@ -8,14 +8,20 @@
 **
 *****************************************************************************/
 
-#include "richtext.h"
-
-#include <qhbox.h>
-#include <qhbox.h>
 #include <qpushbutton.h>
-#include <qtextview.h>
 #include <qbrush.h>
 #include <qapplication.h>
+#include <qglobal.h>
+
+#if (QT_VERSION-0 >= 0x040000)
+#include <q3hbox.h>
+#include <q3textview.h>
+#else
+#include <qhbox.h>
+#include <qtextview.h>
+#endif
+
+#include "richtext.h"
 
 static const char* publisherExamples[] = {
     "<b>Publisher Example 1:</b><br>"
@@ -23,7 +29,7 @@ static const char* publisherExamples[] = {
 
     "<pre>ORTEInit();<br>"
     "d=<b>ORTEDomainAppCreate</b>(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);<br>"
-    "<b>ORTETypeRegisterAdd</b>(d,\"HelloMsg\",NULL,NULL,64);<br>"
+    "<b>ORTETypeRegisterAdd</b>(d,\"HelloMsg\",NULL,NULL,NULL,64);<br>"
     "NTPTIME_BUILD(persistence,3);<br>"
     "p=<b>ORTEPublicationCreate</b>(<br>"
     "     d,<br>"
@@ -54,7 +60,7 @@ static const char* subscriberExamples[] = {
 
     "<pre>ORTEInit();<br>"
     "d=<b>ORTEDomainAppCreate</b>(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);<br>"
-    "<b>ORTETypeRegisterAdd</b>(d,\"HelloMsg\",NULL,NULL,64);<br>"
+    "<b>ORTETypeRegisterAdd</b>(d,\"HelloMsg\",NULL,NULL,NULL,64);<br>"
     "NTPTIME_BUILD(persistence,3);<br>"
     "s=<b>ORTESubscriptionCreate</b>(<br>"
     "    d,<br>"
@@ -66,7 +72,8 @@ static const char* subscriberExamples[] = {
     "    &deadline,              /* Deadline */<br>"
     "    &minimumSeparation,     /* Minimum Separation */<br>"
     "    recvCallBack,           /* CallBack function */<br>"
-    "    NULL);<br><br>"
+    "    NULL,<br>"
+    "    IPADDRESS_INVALID);<br><br>"
     "void <b>recvCallBack</b>(const ORTERecvInfo *info,<br>"
     "                  void *vinstance, void *recvCallBackParam) {<br>"
     "  char *instance=(char*)vinstance;<br><br>"
@@ -104,7 +111,7 @@ MyRichText::MyRichText( QWidget *parent, const char *name )
     if ( paper.pixmap() != 0 )
        view->setPaper( paper );
     else
-       view->setPaper( white );
+       view->setPaper( Qt::white );
 
     view->setMinimumSize( 500, 250 );
 

diff --git a/orte/contrib/shape/richtext.h b/orte/contrib/shape/richtext.h
index 6a8aa88c69747a3b1f2fd6f021ad2c2ff3a22305..a6db98011e50e489d9a35f403fd2536a59d19eb3 100644 (file)
--- a/orte/contrib/shape/richtext.h
+++ b/orte/contrib/shape/richtext.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: richtext.h,v 1.4 2004/04/20 08:37:21 smolik Exp $
+** $Id: richtext.h,v 1.5 2005/11/03 09:27:47 smolik Exp $
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
@@ -11,7 +11,16 @@
 #ifndef RICHTEXT_H
 #define RICHTEXT_H
 
+#include <qglobal.h>
+
+#if (QT_VERSION-0 >= 0x040000)
+#define QVBox Q3VBox
+#define QHBox Q3HBox
+#define QTextView Q3TextView
+#include <q3vbox.h>
+#else
 #include <qvbox.h>
+#endif
 
 class QTextView;
 class QPushButton;