[Marble-commits] KDE/kdeedu/marble/src

[Dennis Nienhüser]

SVN commit 1109654 by nienhueser:

More boolean vs. bitwise operator fixes.

 M  +1 -1      lib/MarbleAboutDialog.cpp  
 M  +7 -7      plugins/render/navigation/NavigationFloatItem.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleAboutDialog.cpp #1109653:1109654
@@ -58,7 +58,7 @@
     d->dataLoaded = false;
     d->licenseLoaded = false;
 
-    if( MarbleGlobal::getInstance()->profiles() && MarbleGlobal::SmallScreen ) {
+    if( MarbleGlobal::getInstance()->profiles() & MarbleGlobal::SmallScreen ) {
         d->uiWidget.m_pMarbleTitleLabel->hide();
         d->uiWidget.m_pMarbleLogoLabel->hide();
     }
--- trunk/KDE/kdeedu/marble/src/plugins/render/navigation/NavigationFloatItem.cpp #1109653:1109654
@@ -45,7 +45,7 @@
     // Plugin is not visible by default
     setVisible( false );
 
-    if( m_profiles && MarbleGlobal::SmallScreen ) {
+    if( m_profiles & MarbleGlobal::SmallScreen ) {
         setFrame( FrameGraphicsItem::RectFrame );
     }
     else {
@@ -96,7 +96,7 @@
 {
     QWidget *navigationParent = new QWidget( 0 );
     
-    if( m_profiles && MarbleGlobal::SmallScreen ) {
+    if( m_profiles & MarbleGlobal::SmallScreen ) {
         m_navigationWidgetSmall = new Ui::NavigationSmall;
         m_navigationWidgetSmall->setupUi( navigationParent );
     }
@@ -113,7 +113,7 @@
     
     setLayout( layout );
 
-    if( !( m_profiles && MarbleGlobal::SmallScreen ) ) {
+    if( !( m_profiles & MarbleGlobal::SmallScreen ) ) {
         connect( m_navigationWidget->zoomSlider,  SIGNAL( sliderPressed() ),
                  this, SLOT( adjustForAnimation() ) );
         connect( m_navigationWidget->zoomSlider,  SIGNAL( sliderReleased() ),
@@ -156,7 +156,7 @@
         int maxZoom = m_marbleWidget->map()->maximumZoom();
         //m_navigationWidget->zoomSlider->setRange(minZoom, maxZoom);
         
-        if( m_profiles && MarbleGlobal::SmallScreen ) {
+        if( m_profiles & MarbleGlobal::SmallScreen ) {
             connect( m_navigationWidgetSmall->zoomInButton, SIGNAL( clicked() ),
                      m_marbleWidget, SLOT( zoomIn() ) );
             connect( m_navigationWidgetSmall->zoomOutButton, SIGNAL( clicked() ),
@@ -203,7 +203,7 @@
 
 void NavigationFloatItem::zoomChanged(int level)
 {
-    if( !( m_profiles && MarbleGlobal::SmallScreen ) ) {
+    if( !( m_profiles & MarbleGlobal::SmallScreen ) ) {
         m_navigationWidget->zoomSlider->setValue(level);
     }
 }
@@ -213,7 +213,7 @@
     Q_UNUSED(theme);
     
     if ( m_marbleWidget ) {
-        if( m_profiles && MarbleGlobal::SmallScreen ) {
+        if( m_profiles & MarbleGlobal::SmallScreen ) {
             updateButtons( m_marbleWidget->map()->zoom() );
         }
         else {
@@ -256,7 +256,7 @@
     QToolButton *zoomInButton;
     QToolButton *zoomOutButton;
     
-    if( m_profiles && MarbleGlobal::SmallScreen ) {
+    if( m_profiles & MarbleGlobal::SmallScreen ) {
         if ( m_marbleWidget ) {
             minZoom = m_marbleWidget->map()->minimumZoom();
             maxZoom = m_marbleWidget->map()->maximumZoom();