several_fixes_08branch.diff

Redmine Admin, 2007-06-05 12:17 PM

             imp_->file.close();     // even though we got an error, let's make
                                     // sure it's closed anyway
             throw QgsIOException("Unable to open " + imp_->file.name());
             throw QgsIOException( QObject::tr("Unable to open ") + imp_->file.name());
             return false;           // XXX raise exception? Ok now superfluous
                                     // XXX because of exception.
-...
             // doesn't *have* layers -- nor a GUI for that matter -- we'll just
             // leave in the whining and boldly stomp on.
              throw QgsException("Cannot get extents from " + imp_->file.name());
              throw QgsException( QObject::tr("Cannot get extents from ") + imp_->file.name());
              // return false;
+        }

+        {
           QMessageBox::critical(this,
               tr("QGIS Project Read Error"),
               tr("") + "\n" + e.what() );
               tr("") + "\n" + QString::fromLocal8Bit( e.what() ) );
           qDebug( "%s:%d %d bad layers found", __FILE__, __LINE__, e.layers().size() );
           // attempt to find the new locations for missing layers
-...
+        {
           QMessageBox::critical(this,
               tr("QGIS Project Read Error"),
               tr("") + "\n" + e.what() );
               tr("") + "\n" + QString::fromLocal8Bit( e.what() ) );
           qDebug( "%s:%d BAD LAYERS FOUND", __FILE__, __LINE__ );
+        }
+      }
-...
         if ( QMessageBox::Yes == QMessageBox::critical( this,
               tr("QGIS Project Read Error"),
               tr("") + "\n" + e.what() + "\n" +
               tr("") + "\n" + QString::fromLocal8Bit( e.what() ) + "\n" +
               tr("Try to find missing layers?"),
               QMessageBox::Yes | QMessageBox::Default,
               QMessageBox::No  | QMessageBox::Escape ) )
-...
         qDebug( "%s:%d BAD LAYERS FOUND", __FILE__, __LINE__ );
         QMessageBox::critical( 0x0,
             tr("Unable to open project"), QString::fromLocal8Bit(e.what()), QMessageBox::Ok,
             tr("Unable to open project"), QString::fromLocal8Bit( e.what() ), QMessageBox::Ok,
             Qt::NoButton );
         mMapCanvas->freeze(false);
-...
+      {
         QMessageBox::critical( 0x0,
             tr("Unable to save project ") + QgsProject::instance()->filename(),
             e.what(),
             QString::fromLocal8Bit( e.what() ),
             QMessageBox::Ok,
             Qt::NoButton );
-...
         fullPath.setFile( newFilePath );
+      }
       try
+      {
         QgsProject::instance()->filename( fullPath.filePath() );
       QgsProject::instance()->filename( fullPath.filePath() );
       if ( QgsProject::instance()->write() )
+      {
         setTitleBarText_(*this); // update title bar
         statusBar()->message(tr("Saved project to:") + " " + QgsProject::instance()->filename() );
         // add this to the list of recently used project files
         saveRecentProjectPath(fullPath.filePath(), settings);
         if ( QgsProject::instance()->write() )
+        {
           setTitleBarText_(*this); // update title bar
           statusBar()->message(tr("Saved project to:") + " " + QgsProject::instance()->filename() );
           // add this to the list of recently used project files
           saveRecentProjectPath(fullPath.filePath(), settings);
+        }
         else
+        {
           QMessageBox::critical(this,
               tr("Unable to save project"),
               tr("Unable to save project to ") + QgsProject::instance()->filename() );
+        }
+      }
       else
       catch ( std::exception & e )
+      {
         QMessageBox::critical(this,
             tr("Unable to save project"),
             tr("Unable to save project to ") + QgsProject::instance()->filename() );
         QMessageBox::critical( 0x0,
             tr("Unable to save project ") + QgsProject::instance()->filename(),
             QString::fromLocal8Bit( e.what() ),
             QMessageBox::Ok,
             Qt::NoButton );
+      }
     } // QgisApp::fileSaveAs

QGIS » QGIS Application

several_fixes_08branch.diff