Changeset 1321 for trunk

Timestamp:

Jun 23, 2010, 2:56:46 PM (14 years ago)

Author:

garnier

Message:

fix warning

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.45 2010/06/10 16:01:38 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.48 2010/06/22 18:24:18 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -711 +711 @@
 
   if (fEmptyViewerTabLabel != NULL) {
-    if (fTabWidget->isVisible()) {
+    bool visible = false;
+    if (fTabWidget != NULL) {
+      if (fTabWidget->isVisible()) {
+        visible = true;
+      }
+    }
+    if (visible) {
 #if QT_VERSION >= 0x040000
   #if QT_VERSION >= 0x040200
@@ -744 +750 @@
 #endif
   // get the size of the tabbar
-  int tabBarX;
-  int tabBarY;
-#if QT_VERSION < 0x040000
-  tabBarX = fTabWidget->width()-fTabWidget->page(0)->width();
-  tabBarY = fTabWidget->height()-fTabWidget->page(0)->height();
-#else
-  tabBarX = fTabWidget->width()-fTabWidget->widget(0)->width();
-  tabBarY = fTabWidget->height()-fTabWidget->widget(0)->height();
-#endif
-
-  fMainWindow->resize(tabBarX+fMainWindow->width()+fLastQTabSizeX-fTabWidget->width(),tabBarY+fMainWindow->height()+fLastQTabSizeY-fTabWidget->height());
+  int tabBarX = 0;
+  int tabBarY = 0;
+
+  if (fTabWidget != NULL) {
+#if QT_VERSION < 0x040000
+    tabBarX = -fTabWidget->page(0)->width();
+    tabBarY = -fTabWidget->page(0)->height();
+#else
+    tabBarX = -fTabWidget->widget(0)->width();
+    tabBarY = -fTabWidget->widget(0)->height();
+#endif
+  }
+  fMainWindow->resize(tabBarX+fMainWindow->width()+fLastQTabSizeX,tabBarY+fMainWindow->height()+fLastQTabSizeY);
 
 #if QT_VERSION < 0x040000
@@ -1760 +1768 @@
 
 void G4UIQt::CoutFilterCallback(
+#if QT_VERSION < 0x040000
+const QString &) {
+#else
 const QString & text) {
+#endif
 
 #if QT_VERSION < 0x040000
@@ -2119 +2131 @@
 
   
+#if QT_VERSION >= 0x040500
 void G4UIQt::TabCloseCallback(int a){
+#else
+void G4UIQt::TabCloseCallback(int){
+#endif
 #if QT_VERSION >= 0x040500
   QWidget* temp = fTabWidget->widget(a);
@@ -2168 +2184 @@
 
 void G4QTabWidget::paintEvent(
-QPaintEvent * event
+QPaintEvent *
 )
 {