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

List:       kde-commits
Subject:    KDE/kdegames/kpat
From:       Parker Coates <parker.coates () kdemail ! net>
Date:       2012-02-15 4:45:41
Message-ID: 20120215044541.71EA0AC894 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1280179 by coates:

Rename things to make it clear that the old format is a legacy format.

 M  +4 -4      dealer.cpp  
 M  +4 -4      dealer.h  
 M  +3 -3      main.cpp  
 M  +16 -16    mainwindow.cpp  
 M  +2 -2      mimetypes/kpatience.xml  


--- trunk/KDE/kdegames/kpat/dealer.cpp #1280178:1280179
@@ -273,7 +273,7 @@
 }
 
 
-void DealerScene::saveGameState( QIODevice * io )
+void DealerScene::saveLegacyFile( QIODevice * io )
 {
     QXmlStreamWriter xml( io );
     xml.setCodec( "UTF-8" );
@@ -314,7 +314,7 @@
     d->gameWasJustSaved = true;
 }
 
-bool DealerScene::loadGameState( QIODevice * io )
+bool DealerScene::loadLegacyFile( QIODevice * io )
 {
     resetInternals();
 
@@ -423,7 +423,7 @@
 }
 
 
-void DealerScene::saveGameHistory( QIODevice * io )
+void DealerScene::saveFile( QIODevice * io )
 {
     QXmlStreamWriter xml( io );
     xml.setCodec( "UTF-8" );
@@ -490,7 +490,7 @@
 }
 
 
-bool DealerScene::loadGameHistory( QIODevice * io )
+bool DealerScene::loadFile( QIODevice * io )
 {
     resetInternals();
 
--- trunk/KDE/kdegames/kpat/dealer.h #1280178:1280179
@@ -108,10 +108,10 @@
     bool allowedToStartNewGame();
     int moveCount() const;
 
-    void saveGameState( QIODevice * io );
-    bool loadGameState( QIODevice * io );
-    void saveGameHistory( QIODevice * io );
-    bool loadGameHistory( QIODevice * io );
+    void saveFile( QIODevice * io );
+    bool loadFile( QIODevice * io );
+    void saveLegacyFile( QIODevice * io );
+    bool loadLegacyFile( QIODevice * io );
     
     virtual void mapOldId(int id);
     virtual int oldId() const;
--- trunk/KDE/kdegames/kpat/main.cpp #1280178:1280179
@@ -200,7 +200,7 @@
 
         DealerScene *f = getDealer( doc.documentElement().attribute("id").toInt() );
 
-        f->loadGameState( &of );
+        f->loadLegacyFile( &of );
         f->solver()->translate_layout();
         int ret = f->solver()->patsolve();
         if ( ret == Solver::SolutionExists )
@@ -234,14 +234,14 @@
                    count--;
                    QFile \
file(QString("%1/%2-%3-1").arg(testdir).arg(dealer).arg(i));  file.open( \
                QFile::WriteOnly );
-                   f->saveGameState( &file );
+                   f->saveLegacyFile( &file );
                 }
                 else if ( ret == Solver::NoSolutionExists ) {
                    fprintf( stdout, "%d: %d lost (%d ms)\n", dealer, i, \
mytime.elapsed()  );  count--;
                    QFile \
file(QString("%1/%2-%3-0").arg(testdir).arg(dealer).arg(i));  file.open( \
                QFile::WriteOnly );
-                   f->saveGameState( &file );
+                   f->saveLegacyFile( &file );
                 } else {
                    fprintf( stdout, "%d: %d unknown (%d ms)\n", dealer, i, \
mytime.elapsed() );  }
--- trunk/KDE/kdegames/kpat/mainwindow.cpp #1280178:1280179
@@ -88,8 +88,8 @@
 namespace
 {
     const KUrl dialogUrl( "kfiledialog:///kpat" );
-    const QString savedStateMimeType( "application/vnd.kde.kpatience.savedstate" );
-    const QString savedGameMimeType( "application/vnd.kde.kpatience.savedgame" );    \
 +    const QString saveFileMimeType( "application/vnd.kde.kpatience.savedgame" );
+    const QString legacySaveFileMimeType( "application/vnd.kde.kpatience.savedstate" \
);  }
 
 
@@ -746,7 +746,7 @@
         if ( Settings::rememberStateOnExit() && !m_dealer->isGameWon() )
         {
             stateFile.open( QFile::WriteOnly | QFile::Truncate );
-            m_dealer->saveGameHistory( &stateFile );
+            m_dealer->saveFile( &stateFile );
         }
         else
         {
@@ -842,11 +842,11 @@
     }
 
     int gameId = -1;
-    bool isOldStyleFile;
+    bool isLegacyFile;
 
     if ( xml.name() == "dealer" )
     {
-        isOldStyleFile = true;
+        isLegacyFile = true;
         bool ok;
         int id = xml.attributes().value("id").toString().toInt( &ok );
         if ( ok )
@@ -854,7 +854,7 @@
     }
     else if ( xml.name() == "kpat-game" )
     {
-        isOldStyleFile = false;
+        isLegacyFile = false;
         QStringRef gameType = xml.attributes().value("game-type");
         foreach ( const DealerInfo * di, DealerInfoList::self()->games() )
         {
@@ -887,8 +887,8 @@
     xml.clear();
     file.reset();
 
-    bool success = isOldStyleFile ? m_dealer->loadGameState( &file )
-                                  : m_dealer->loadGameHistory( &file );
+    bool success = isLegacyFile ? m_dealer->loadLegacyFile( &file )
+                                : m_dealer->loadFile( &file );
     if ( !success )
     {
         KMessageBox::error( this, i18n("Errors encountered while parsing file.") );
@@ -909,7 +909,7 @@
 {
     KFileDialog dialog( dialogUrl, "", this, 0 );
     dialog.setOperationMode( KFileDialog::Opening );
-    dialog.setMimeFilter( QStringList() << savedStateMimeType << savedGameMimeType \
<< "all/allfiles" ); +    dialog.setMimeFilter( QStringList() << saveFileMimeType << \
legacySaveFileMimeType << "all/allfiles" );  dialog.setCaption( i18n("Load") );
 
     if ( dialog.exec() == KFileDialog::Accepted )
@@ -927,7 +927,7 @@
 
     KFileDialog dialog( dialogUrl, "", this, 0 );
     dialog.setOperationMode( KFileDialog::Saving );
-    dialog.setMimeFilter( QStringList() << savedStateMimeType << savedGameMimeType, \
savedGameMimeType ); +    dialog.setMimeFilter( QStringList() << saveFileMimeType << \
legacySaveFileMimeType, saveFileMimeType );  dialog.setConfirmOverwrite( true );
     dialog.setCaption( i18n("Save") );
     if ( dialog.exec() != KFileDialog::Accepted )
@@ -948,10 +948,10 @@
             return;
         }
 
-        if ( mimeType->is( savedStateMimeType ) )
-            m_dealer->saveGameState( &file );
+        if ( mimeType->is( legacySaveFileMimeType ) )
+            m_dealer->saveLegacyFile( &file );
         else
-            m_dealer->saveGameHistory( &file );
+            m_dealer->saveFile( &file );
     }
     else
     {
@@ -962,10 +962,10 @@
             return;
         }
 
-        if ( mimeType->is( savedStateMimeType ) )
-            m_dealer->saveGameState( &tempFile );
+        if ( mimeType->is( legacySaveFileMimeType ) )
+            m_dealer->saveLegacyFile( &tempFile );
         else
-            m_dealer->saveGameHistory( &tempFile );
+            m_dealer->saveFile( &tempFile );
 
         if ( !KIO::NetAccess::upload( tempFile.fileName(), url, this ) )
         {
--- trunk/KDE/kdegames/kpat/mimetypes/kpatience.xml #1280178:1280179
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
   <mime-type type="application/vnd.kde.kpatience.savedstate">
-    <comment>KPatience saved state</comment>
+    <comment>KPatience legacy save file</comment>
     <sub-class-of type="application/xml"/>
     <magic priority="80">
       <match type="string" value="&lt;!DOCTYPE kpat" offset="0:50"/>
@@ -9,7 +9,7 @@
     <glob pattern="*.kpatience" weight="75"/>
   </mime-type>
   <mime-type type="application/vnd.kde.kpatience.savedgame">
-    <comment>KPatience saved game</comment>
+    <comment>KPatience save file</comment>
     <sub-class-of type="application/xml"/>
     <glob pattern="*.kpat" weight="75"/>
   </mime-type>


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