[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/kmines
From:       Laurent Montel <montel () kde ! org>
Date:       2010-10-02 15:34:48
Message-ID: 20101002153449.02DBDAC891 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1181871 by mlaurent:

Fix compile


 M  +9 -9      borderitem.cpp  
 M  +23 -23    cellitem.cpp  
 M  +6 -6      mainwindow.cpp  
 M  +2 -2      scene.cpp  


--- trunk/KDE/kdegames/kmines/borderitem.cpp #1181870:1181871
@@ -22,7 +22,7 @@
 QHash<KMinesState::BorderElement, QString> BorderItem::s_elementNames;
 
 BorderItem::BorderItem( KGameRenderer* renderer, QGraphicsItem* parent )
-    : KGameRenderedItem(renderer, "", parent), m_element(KMinesState::BorderEast),
+    : KGameRenderedItem(renderer, QLatin1String( "" ), parent), \
m_element(KMinesState::BorderEast),  m_row(-1), m_col(-1)
 {
     if(s_elementNames.isEmpty())
@@ -37,12 +37,12 @@
 
 void BorderItem::fillNameHash()
 {
-    s_elementNames[KMinesState::BorderNorth] = "border.edge.north";
-    s_elementNames[KMinesState::BorderSouth] = "border.edge.south";
-    s_elementNames[KMinesState::BorderEast] = "border.edge.east";
-    s_elementNames[KMinesState::BorderWest] = "border.edge.west";
-    s_elementNames[KMinesState::BorderCornerNE] = "border.outsideCorner.ne";
-    s_elementNames[KMinesState::BorderCornerNW] = "border.outsideCorner.nw";
-    s_elementNames[KMinesState::BorderCornerSW] = "border.outsideCorner.sw";
-    s_elementNames[KMinesState::BorderCornerSE] = "border.outsideCorner.se";
+    s_elementNames[KMinesState::BorderNorth] = QLatin1String( "border.edge.north" );
+    s_elementNames[KMinesState::BorderSouth] = QLatin1String( "border.edge.south" );
+    s_elementNames[KMinesState::BorderEast] = QLatin1String( "border.edge.east" );
+    s_elementNames[KMinesState::BorderWest] = QLatin1String( "border.edge.west" );
+    s_elementNames[KMinesState::BorderCornerNE] = QLatin1String( \
"border.outsideCorner.ne" ); +    s_elementNames[KMinesState::BorderCornerNW] = \
QLatin1String( "border.outsideCorner.nw" ); +    \
s_elementNames[KMinesState::BorderCornerSW] = QLatin1String( \
"border.outsideCorner.sw" ); +    s_elementNames[KMinesState::BorderCornerSE] = \
QLatin1String( "border.outsideCorner.se" );  }
--- trunk/KDE/kdegames/kmines/cellitem.cpp #1181870:1181871
@@ -27,7 +27,7 @@
 QHash<KMinesState::CellState, QList<QString> > CellItem::s_stateNames;
 
 CellItem::CellItem(KGameRenderer* renderer, QGraphicsItem* parent)
-    : KGameRenderedItem(renderer, "", parent)
+    : KGameRenderedItem(renderer, QLatin1String( "" ), parent)
 {
     if(s_digitNames.isEmpty())
         fillNameHashes();
@@ -60,8 +60,8 @@
         else if(m_hasMine)
         {
             if(m_exploded)
-                addOverlay("explosion");
-            addOverlay("mine");
+                addOverlay(QLatin1String( "explosion" ));
+            addOverlay(QLatin1String( "mine" ));
         }
     }
 }
@@ -147,27 +147,27 @@
 
 void CellItem::fillNameHashes()
 {
-    s_digitNames[1] = "arabicOne";
-    s_digitNames[2] = "arabicTwo";
-    s_digitNames[3] = "arabicThree";
-    s_digitNames[4] = "arabicFour";
-    s_digitNames[5] = "arabicFive";
-    s_digitNames[6] = "arabicSix";
-    s_digitNames[7] = "arabicSeven";
-    s_digitNames[8] = "arabicEight";
+    s_digitNames[1] = QLatin1String( "arabicOne" );
+    s_digitNames[2] = QLatin1String( "arabicTwo" );
+    s_digitNames[3] = QLatin1String( "arabicThree" );
+    s_digitNames[4] = QLatin1String( "arabicFour" );
+    s_digitNames[5] = QLatin1String( "arabicFive" );
+    s_digitNames[6] = QLatin1String( "arabicSix" );
+    s_digitNames[7] = QLatin1String( "arabicSeven" );
+    s_digitNames[8] = QLatin1String( "arabicEight" );
 
-    s_stateNames[KMinesState::Released].append("cell_up");
-    s_stateNames[KMinesState::Pressed].append("cell_down");
-    s_stateNames[KMinesState::Revealed].append("cell_down");
-    s_stateNames[KMinesState::Questioned].append("cell_up");
-    s_stateNames[KMinesState::Questioned].append("question");
-    s_stateNames[KMinesState::Flagged].append("cell_up");
-    s_stateNames[KMinesState::Flagged].append("flag");
-    s_stateNames[KMinesState::Error].append("cell_down");
-    s_stateNames[KMinesState::Error].append("mine");
-    s_stateNames[KMinesState::Error].append("error");
-    s_stateNames[KMinesState::Hint].append("cell_up");
-    s_stateNames[KMinesState::Hint].append("hint");
+    s_stateNames[KMinesState::Released].append(QLatin1String( "cell_up" ));
+    s_stateNames[KMinesState::Pressed].append(QLatin1String( "cell_down" ));
+    s_stateNames[KMinesState::Revealed].append(QLatin1String( "cell_down" ));
+    s_stateNames[KMinesState::Questioned].append(QLatin1String( "cell_up" ));
+    s_stateNames[KMinesState::Questioned].append(QLatin1String( "question" ));
+    s_stateNames[KMinesState::Flagged].append(QLatin1String( "cell_up" ));
+    s_stateNames[KMinesState::Flagged].append(QLatin1String( "flag" ));
+    s_stateNames[KMinesState::Error].append(QLatin1String( "cell_down" ));
+    s_stateNames[KMinesState::Error].append(QLatin1String( "mine" ));
+    s_stateNames[KMinesState::Error].append(QLatin1String( "error" ));
+    s_stateNames[KMinesState::Hint].append(QLatin1String( "cell_up" ));
+    s_stateNames[KMinesState::Hint].append(QLatin1String( "hint" ));
 }
 
 void CellItem::addOverlay(const QString& spriteKey)
--- trunk/KDE/kdegames/kmines/mainwindow.cpp #1181870:1181871
@@ -242,14 +242,14 @@
 
 void KMinesMainWindow::configureSettings()
 {
-    if ( KConfigDialog::showDialog( "settings" ) )
+    if ( KConfigDialog::showDialog( QLatin1String(  "settings" ) ) )
         return;
-    KConfigDialog *dialog = new KConfigDialog( this, "settings", Settings::self() );
-    dialog->addPage( new GeneralOptsConfig( dialog ), i18n("General"), \
                "games-config-options" );
-    dialog->addPage( new KGameThemeSelector( dialog, Settings::self(), \
KGameThemeSelector::NewStuffDisableDownload ), i18n( "Theme" ), "games-config-theme" \
                );
-    dialog->addPage( new CustomGameConfig( dialog ), i18n("Custom Game"), \
"games-config-custom" ); +    KConfigDialog *dialog = new KConfigDialog( this, \
QLatin1String( "settings" ), Settings::self() ); +    dialog->addPage( new \
GeneralOptsConfig( dialog ), i18n("General"), QLatin1String( "games-config-options" \
)); +    dialog->addPage( new KGameThemeSelector( dialog, Settings::self(), \
KGameThemeSelector::NewStuffDisableDownload ), i18n( "Theme" ), QLatin1String( \
"games-config-theme" )); +    dialog->addPage( new CustomGameConfig( dialog ), \
                i18n("Custom Game"), QLatin1String( "games-config-custom" ));
     connect( dialog, SIGNAL( settingsChanged(const QString&) ), this, SLOT( \
                loadSettings() ) );
-    dialog->setHelp(QString(),"kmines");
+    dialog->setHelp(QString(),QLatin1String( "kmines" ));
     dialog->show();
 }
 
--- trunk/KDE/kdegames/kmines/scene.cpp #1181870:1181871
@@ -63,13 +63,13 @@
     m_gamePausedMessageItem->setHideOnMouseClick(false);
     addItem(m_gamePausedMessageItem);
 
-    setBackgroundBrush(m_renderer.spritePixmap("mainWidget", \
sceneRect().size().toSize())); +    \
setBackgroundBrush(m_renderer.spritePixmap(QLatin1String( "mainWidget" ), \
sceneRect().size().toSize()));  }
 
 void KMinesScene::resizeScene(int width, int height)
 {
     setSceneRect(0, 0, width, height);
-    setBackgroundBrush(m_renderer.spritePixmap("mainWidget", \
sceneRect().size().toSize())); +    \
setBackgroundBrush(m_renderer.spritePixmap(QLatin1String( "mainWidget" ), \
sceneRect().size().toSize()));  m_fieldItem->resizeToFitInRect( sceneRect() );
     m_fieldItem->setPos( sceneRect().width()/2 - \
                m_fieldItem->boundingRect().width()/2,
                          sceneRect().height()/2 - \
m_fieldItem->boundingRect().height()/2 );


[prev in list] [next in list] [prev in thread] [next in thread]