cleanups:

- use QMetaObject instead of RTTI - no get in getters: - QgsDataProvider: - getProvider => provider - getSelectWidget => selectWidget - getFunction => function - getLibary => providerLibrary - QgsProviderRegistry: - getLibrary => providerLibrary - /* ... */ => #if 0 / #endif - reindentation
qgis · May 23, 2011 · 4549d0e · 4549d0e
1 parent ee6c516
commit 4549d0e
Show file tree

Hide file tree

Showing 116 changed files with 4,071 additions and 3,488 deletions.
diff --git a/python/core/qgsproviderregistry.sip b/python/core/qgsproviderregistry.sip
@@ -26,7 +26,7 @@ class QgsProviderRegistry
 
     void setLibraryDirectory(const QDir & path);
 
-    QgsDataProvider * getProvider( const QString & providerKey, 
+    QgsDataProvider *provider( const QString & providerKey,
                                    const QString & dataSource );
 
     /** Return list of available providers by their keys */

diff --git a/scripts/astyle-all.sh b/scripts/astyle-all.sh
@@ -8,21 +8,21 @@ export elcr="$(tput el)$(tput cr)"
 
 find src -type f -print | while read f; do
 	case "$f" in
-	src/core/spatialite/*)
-		continue
-		;;
-
+        src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
+                echo $f skipped
+                continue
+                ;;
 
-        *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
+        *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp)
                 cmd=astyle.sh
                 ;;
 
-	*.ui|*.qgm|*.txt|*.t2t|*.py|*.sip|resources/context_help/*)
-		cmd="flip -ub"
-		;;
-
+        *.ui|*.qgm|*.txt|*.t2t|*.py|*.sip|resources/context_help/*)
+                cmd="flip -ub"
+                ;;
 
         *)
+                echo $f skipped
                 continue
                 ;;
         esac

diff --git a/src/analysis/interpolation/DualEdgeTriangulation.cc b/src/analysis/interpolation/DualEdgeTriangulation.cc
@@ -1979,7 +1979,6 @@ void DualEdgeTriangulation::ruppertRefinement()
 
           }
           while ( actedge != pointingedge );
-
         }
       }
     }
@@ -2190,9 +2189,6 @@ void DualEdgeTriangulation::ruppertRefinement()
 
         }
         while ( actedge != pointingedge );
-
-
-
       }
     } //end fast method
 
@@ -2407,7 +2403,6 @@ void DualEdgeTriangulation::ruppertRefinement()
 
       }
       while ( actedge != pointingedge );
-
     }
   }
 

diff --git a/src/analysis/interpolation/ParametricLine.h b/src/analysis/interpolation/ParametricLine.h
@@ -22,7 +22,7 @@
 #include <QVector>
 
 class ANALYSIS_EXPORT ParametricLine
-    /**ParametricLine is an Interface for parametric lines. It is possible, that a parametric line is composed of several parametric lines (see the composite pattern in Gamma et al. 'Design Patterns'). Do not build instances of it since it is an abstract class.*/
+      /**ParametricLine is an Interface for parametric lines. It is possible, that a parametric line is composed of several parametric lines (see the composite pattern in Gamma et al. 'Design Patterns'). Do not build instances of it since it is an abstract class.*/
 {
   protected:
     /**Degree of the parametric Line*/

diff --git a/src/app/attributetable/qgsattributetabledialog.cpp b/src/app/attributetable/qgsattributetabledialog.cpp
@@ -137,7 +137,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   connect( mView->verticalHeader(), SIGNAL( sectionPressed( int ) ), this, SLOT( updateRowPressed( int ) ) );
   connect( mModel, SIGNAL( modelChanged() ), this, SLOT( updateSelection() ) );
 
-  connect( mView, SIGNAL(willShowContextMenu( QMenu*, QModelIndex ) ), this, SLOT(viewWillShowContextMenu(QMenu*, QModelIndex ) ) );
+  connect( mView, SIGNAL( willShowContextMenu( QMenu*, QModelIndex ) ), this, SLOT( viewWillShowContextMenu( QMenu*, QModelIndex ) ) );
 
   mLastClickedHeaderIndex = 0;
   mSelectionModel = new QItemSelectionModel( mFilterModel );

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -499,7 +499,8 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
 
   int result = myQFileDialog->exec();
   raise();
-  if ( result != QDialog::Accepted ) return;
+  if ( result != QDialog::Accepted )
+    return;
 
   QString myOutputFileNameQString = myQFileDialog->selectedFiles().first();
   if ( myOutputFileNameQString == "" )
@@ -666,7 +667,8 @@ void QgsComposer::on_mActionExportAsImage_triggered()
     QString myFilter = tr( "%1 format (*.%2 *.%3)" )
                        .arg( myFormat ).arg( myFormat.toLower() ).arg( myFormat.toUpper() );
 
-    if ( myCounterInt > 0 ) myFilters += ";;";
+    if ( myCounterInt > 0 )
+      myFilters += ";;";
     myFilters += myFilter;
     myFilterMap[myFilter] = myFormat;
     if ( myFormat == myLastUsedFormat )
@@ -799,7 +801,8 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
 
   int result = myQFileDialog->exec();
   raise();
-  if ( result != QDialog::Accepted ) return;
+  if ( result != QDialog::Accepted )
+    return;
 
   QString myOutputFileNameQString = myQFileDialog->selectedFiles().first();
   if ( myOutputFileNameQString == "" )

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -402,13 +402,17 @@ void QgsComposerMapWidget::updateComposerExtentFromGui()
   bool conversionSuccess;
 
   xmin = mXMinLineEdit->text().toDouble( &conversionSuccess );
-  if ( !conversionSuccess ) {return;}
+  if ( !conversionSuccess )
+    return;
   xmax = mXMaxLineEdit->text().toDouble( &conversionSuccess );
-  if ( !conversionSuccess ) {return;}
+  if ( !conversionSuccess )
+    return;
   ymin = mYMinLineEdit->text().toDouble( &conversionSuccess );
-  if ( !conversionSuccess ) {return;}
+  if ( !conversionSuccess )
+    return;
   ymax = mYMaxLineEdit->text().toDouble( &conversionSuccess );
-  if ( !conversionSuccess ) {return;}
+  if ( !conversionSuccess )
+    return;
 
   QgsRectangle newExtent( xmin, ymin, xmax, ymax );
   mComposerMap->beginCommand( tr( "Map extent changed" ) );

diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -870,7 +870,8 @@ void QgsLegend::legendLayerShowInOverview()
     return;
 
   QgsLegendLayer* ll = qobject_cast<QgsLegendLayer *>( li );
-  if ( !ll ) return;
+  if ( !ll )
+    return;
   ll->showInOverview();
 }
 
@@ -1805,7 +1806,7 @@ void QgsLegend::legendLayerZoom()
     }
   }
 
-  if( extent.isEmpty() )
+  if ( extent.isEmpty() )
   {
     return;
   }

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -448,7 +448,7 @@ int main( int argc, char *argv[] )
   }
 
   // GUI customization is enabled by default unless --nocustomization argument is used
-  QgsCustomization::instance()->setEnabled(myCustomization);
+  QgsCustomization::instance()->setEnabled( myCustomization );
 
   QgsApplication myApp( argc, argv, myUseGuiFlag, configpath );
 
@@ -624,10 +624,10 @@ int main( int argc, char *argv[] )
   QgisApp *qgis = new QgisApp( mypSplash, myRestorePlugins ); // "QgisApp" used to find canonical instance
   qgis->setObjectName( "QgisApp" );
 
-  myApp.connect ( 
-    &myApp, SIGNAL( preNotify( QObject *, QEvent *, bool *)),
+  myApp.connect(
+    &myApp, SIGNAL( preNotify( QObject *, QEvent *, bool * ) ),
     //qgis, SLOT( preNotify( QObject *, QEvent *))
-    QgsCustomization::instance(), SLOT( preNotify( QObject *, QEvent *, bool *))
+    QgsCustomization::instance(), SLOT( preNotify( QObject *, QEvent *, bool * ) )
   );
 
   /////////////////////////////////////////////////////////////////////

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -983,9 +983,9 @@ void QgisApp::createMenus()
 
   // Panel and Toolbar Submenus
   mPanelMenu = new QMenu( tr( "Panels" ) );
-  mPanelMenu->setObjectName("mPanelMenu");
+  mPanelMenu->setObjectName( "mPanelMenu" );
   mToolbarMenu = new QMenu( tr( "Toolbars" ) );
-  mToolbarMenu->setObjectName("mToolbarMenu");
+  mToolbarMenu->setObjectName( "mToolbarMenu" );
 
   // Get platform for menu layout customization (Gnome, Kde, Mac, Win)
   QDialogButtonBox::ButtonLayout layout =
@@ -1079,9 +1079,9 @@ void QgisApp::createToolBars()
 
   QList<QAction*> toolbarMenuActions;
   // Set action names so that they can be used in customization
-  foreach ( QToolBar *toolBar, toolbarMenuToolBars )
+  foreach( QToolBar *toolBar, toolbarMenuToolBars )
   {
-    toolBar->toggleViewAction()->setObjectName ( "mActionToggle" + toolBar->objectName().mid(1) );
+    toolBar->toggleViewAction()->setObjectName( "mActionToggle" + toolBar->objectName().mid( 1 ) );
     toolbarMenuActions << toolBar->toggleViewAction();
   }
 
@@ -2448,16 +2448,16 @@ void QgisApp::addWmsLayer()
   QgsDebugMsg( "about to addRasterLayer" );
 
   // TODO: QDialog for now, switch to QWidget in future
-  QDialog *wmss = dynamic_cast<QDialog*> ( QgsProviderRegistry::instance()->getSelectWidget( QString("wms"), this ) );
-  if ( !wmss ) 
+  QDialog *wmss = dynamic_cast<QDialog*>( QgsProviderRegistry::instance()->selectWidget( QString( "wms" ), this ) );
+  if ( !wmss )
   {
     QMessageBox::warning( this, tr( "WMS" ), tr( "Cannot get WMS select dialog from provider." ) );
-    return;   
+    return;
   }
-  connect ( wmss , SIGNAL ( addRasterLayer( QString const &, QString const &, QString const &,QStringList const &,QStringList const &,QString const &,
-QString const &) ),
-	    this , SLOT ( addRasterLayer( QString const &, QString const &, QString const &,QStringList const &,QStringList const &,QString const &,
-QString const &) ) );
+  connect( wmss , SIGNAL( addRasterLayer( QString const &, QString const &, QString const &, QStringList const &, QStringList const &, QString const &,
+                                          QString const & ) ),
+           this , SLOT( addRasterLayer( QString const &, QString const &, QString const &, QStringList const &, QStringList const &, QString const &,
+                                        QString const & ) ) );
   wmss->exec();
   delete wmss;
 }
@@ -3103,8 +3103,10 @@ void QgisApp::toggleActiveWindowMaximized()
   QWidget *window = QApplication::activeWindow();
   if ( window )
   {
-    if ( window->isMaximized() ) window->showNormal();
-    else window->showMaximized();
+    if ( window->isMaximized() )
+      window->showNormal();
+    else
+      window->showMaximized();
   }
 }
 
@@ -4554,8 +4556,8 @@ void QgisApp::showPluginManager()
 // implementation of the python runner
 class QgsPythonRunnerImpl : public QgsPythonRunner
 {
-public:
-    QgsPythonRunnerImpl(QgsPythonUtils* pythonUtils) : mPythonUtils(pythonUtils) {}
+  public:
+    QgsPythonRunnerImpl( QgsPythonUtils* pythonUtils ) : mPythonUtils( pythonUtils ) {}
     virtual bool runCommand( QString command, QString messageOnError = QString() )
     {
       if ( mPythonUtils && mPythonUtils->isEnabled() )
@@ -4565,7 +4567,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
       return false;
     }
 
-protected:
+  protected:
     QgsPythonUtils* mPythonUtils;
 };
 
@@ -4615,7 +4617,7 @@ void QgisApp::loadPythonSupport()
     QgsPluginRegistry::instance()->setPythonUtils( mPythonUtils );
 
     // init python runner
-    QgsPythonRunner::setInstance( new QgsPythonRunnerImpl(mPythonUtils) );
+    QgsPythonRunner::setInstance( new QgsPythonRunnerImpl( mPythonUtils ) );
 
     std::cout << "Python support ENABLED :-) " << std::endl; // OK
   }
@@ -5477,7 +5479,8 @@ void QgisApp::updateMouseCoordinatePrecision()
     dp = QgsProject::instance()->readNumEntry( "PositionPrecision", "/DecimalPlaces" );
 
   // Keep dp sensible
-  if ( dp < 0 ) dp = 0;
+  if ( dp < 0 )
+    dp = 0;
 
   mMousePrecisionDecimalPlaces = dp;
 }

diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
@@ -71,7 +71,8 @@ void QgsAbout::init()
     {
       line = stream.readLine(); // line of text excluding '\n'
       //ignore the line if it starts with a hash....
-      if ( line.left( 1 ) == "#" ) continue;
+      if ( line.left( 1 ) == "#" )
+        continue;
       QStringList myTokens = line.split( "\t", QString::SkipEmptyParts );
       lines << myTokens[0];
     }
@@ -102,7 +103,8 @@ void QgsAbout::init()
     {
       line = stream.readLine(); // line of text excluding '\n'
       //ignore the line if it starts with a hash....
-      if ( line.left( 1 ) == "#" ) continue;
+      if ( line.left( 1 ) == "#" )
+        continue;
       lines += line;
     }
     file2.close();
@@ -129,7 +131,8 @@ void QgsAbout::init()
                                "money to fund QGIS development and other project costs see "
                                "<a href=\"http://qgis.org/en/sponsorship/donors.html\">"
                                "http://qgis.org/en/sponsorship/donors.html</a></p>" );
-    /*QString website;
+#if 0
+    QString website;
     QTextStream donorsStream( &donorsFile );
     // Always use UTF-8
     donorsStream.setCodec( "UTF-8" );
@@ -138,7 +141,8 @@ void QgsAbout::init()
     {
       sline = donorsStream.readLine(); // line of text excluding '\n'
       //ignore the line if it starts with a hash....
-      if ( sline.left( 1 ) == "#" ) continue;
+      if ( sline.left( 1 ) == "#" )
+        continue;
       QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
       if ( myTokens.size() > 1 )
       {
@@ -153,7 +157,8 @@ void QgsAbout::init()
       // close the row
       donorsHTML += "</tr>";
     }
-    donorsHTML += "</table>";*/
+    donorsHTML += "</table>";
+#endif
 
     QString myStyle = QgsApplication::reportStyleSheet();
     txtDonors->clear();
@@ -187,7 +192,8 @@ void QgsAbout::init()
     {
       sline = translatorStream.readLine(); // line of text excluding '\n'
       //ignore the line if it starts with a hash....
-      if ( sline.left( 1 ) == "#" ) continue;
+      if ( sline.left( 1 ) == "#" )
+        continue;
       QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
       if ( myTokens.size() > 1 )
       {

diff --git a/src/app/qgsattributeactiondialog.cpp b/src/app/qgsattributeactiondialog.cpp
@@ -164,15 +164,15 @@ void QgsAttributeActionDialog::remove()
     attributeActionTable->removeRow( row );
 
     // And select the row below the one that was selected or the last one.
-    if ( row >= attributeActionTable->rowCount() ) row = attributeActionTable->rowCount() - 1;
+    if ( row >= attributeActionTable->rowCount() )
+      row = attributeActionTable->rowCount() - 1;
     attributeActionTable->selectRow( row );
   }
 }
 
 void QgsAttributeActionDialog::insert()
 {
   // Add the action details as a new row in the table.
-
   int pos = attributeActionTable->rowCount();
   insert( pos );
 }

diff --git a/src/app/qgsconfigureshortcutsdialog.cpp b/src/app/qgsconfigureshortcutsdialog.cpp
@@ -212,7 +212,8 @@ void QgsConfigureShortcutsDialog::changeShortcut()
 void QgsConfigureShortcutsDialog::resetShortcut()
 {
   QAction* action = currentAction();
-  if ( !action ) return;
+  if ( !action )
+    return;
 
   // set default shortcut
   QString shortcut = QgsShortcutsManager::instance()->actionDefaultShortcut( action );
@@ -361,7 +362,8 @@ void QgsConfigureShortcutsDialog::setGettingShortcut( bool getting )
 void QgsConfigureShortcutsDialog::setCurrentActionShortcut( QKeySequence s )
 {
   QAction* action = currentAction();
-  if ( !action ) return;
+  if ( !action )
+    return;
 
   // first check whether this action is not taken already
   QAction* otherAction = QgsShortcutsManager::instance()->actionForShortcut( s );