Changeset 1267 for trunk

Timestamp:

May 26, 2010, 3:54:16 PM (14 years ago)

Author:

garnier

Message:

test qt3

File:

• trunk/source/interfaces/basic/src/G4UIQt.cc (modified) (7 diffs)

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -1226 +1226 @@
   
 #if QT_VERSION < 0x040000
-  if (myCommand.findRev("/") == (myCommand.length()-1)) {
+  if (myCommand.findRev("/") == ((int)myCommand.length()-1)) {
     myCommand = myCommand.left(myCommand.length()-1);
 #else
@@ -1737 +1737 @@
   fCoutTBTextArea->verticalScrollBar()->setSliderPosition(fCoutTBTextArea->verticalScrollBar()->maximum());
 #endif
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::CoutFilterCallback textSize:%d resSize:%d \n",fG4cout.join("").size(),result.join("").size());
-#endif
 
  }
@@ -2016 +2013 @@
 {
   if (commandPath.indexOf("/") == 0) {
+#if QT_VERSION < 0x040000
+    commandPath = commandPath.right(commandPath.length()-1);
+#else
     commandPath = commandPath.right(commandPath.size()-1);
-  }
-
+#endif
+  }
+
+#if QT_VERSION < 0x040000
+  commandPath = commandPath.right(commandPath.length()-commandPath.findRev("/",-2)-1);
+#else
   commandPath = commandPath.right(commandPath.size()-commandPath.lastIndexOf("/",-2)-1);
+#endif
  
+#if QT_VERSION < 0x040000
+  if (commandPath.findRev("/") == ((int)commandPath.length()-1)) {
+    commandPath = commandPath.left(commandPath.length()-1);
+ }
+#else
  if (commandPath.lastIndexOf("/") == (commandPath.size()-1)) {
     commandPath = commandPath.left(commandPath.size()-1);
-  }
+ }
+#endif
 
  return commandPath;
@@ -2070 +2081 @@
   
 void G4UIQt::TabCloseCallback(int a){
+#if QT_VERSION < 0x040000
+  QWidget* temp = fTabWidget->item(a);
+  fTabWidget->removeItem (a);
+#else
   QWidget* temp = fTabWidget->widget(a);
   fTabWidget->removeTab (a);
+#endif
+
   delete temp;
 
   if (fTabWidget->count() == 0) {
+#if QT_VERSION < 0x040000
+    fEmptyViewerTabLabel->setParent(fMyVSplitter);
+    fTabWidget->reparent(0,0,QPoint(0,0));  
+#else
     fMyVSplitter->addWidget(fEmptyViewerTabLabel);
-#if QT_VERSION < 0x040000
-    fTabWidget->reparent(0,0,QPoint(0,0));  
-#else
     fTabWidget->setParent(0);
 #endif
@@ -2087 +2105 @@
 void G4UIQt::ToolBoxActivated(int a){
 
+#if QT_VERSION < 0x040000
+  if (fToolBox->item(a) == fHelpTBWidget) {
+#else
   if (fToolBox->widget(a) == fHelpTBWidget) {
+#endif
     // Rebuild the help tree
     FillHelpTree();
@@ -2098 +2120 @@
 {
 
+#if QT_VERSION < 0x040000
+  if (currentItem()) {
+#else
   if (currentWidget()) {
+#endif
+
 #ifdef G4DEBUG_INTERFACES_BASIC
     printf("G4QTabWidget::paintEvent repaint type : %d -- rect %d %d  region:%d %d page : %d %d  ________________________  i= %d\n", event->type(),event->rect().height(),event->rect().width(),event->region().boundingRect().width(),event->region().boundingRect().height(),currentWidget()->width(),currentWidget()->height(),currentIndex());
@@ -2124 +2151 @@
         if(UI != NULL)  {
 #if QT_VERSION < 0x040000
-          UI->ApplyCommand(paramSelect.ascii().c_str());
+          UI->ApplyCommand(paramSelect.ascii());
 #else
           UI->ApplyCommand(paramSelect.toStdString().c_str());