Deprecate QgsProject::title( QString )

m-kuhn · m-kuhn · commit 1465e9b3bdcc · 2015-08-19T16:45:33.000+02:00
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -165,7 +165,7 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString& offlineDataPath,
         projectTitle = QFileInfo( QgsProject::instance()->fileName() ).fileName();
       }
       projectTitle += " (offline)";
-      QgsProject::instance()->title( projectTitle );
+      QgsProject::instance()->setTitle( projectTitle );
 
       QgsProject::instance()->writeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH, dbPath );
 
@@ -295,7 +295,7 @@ void QgsOfflineEditing::synchronize()
       // disable offline project
       QString projectTitle = QgsProject::instance()->title();
       projectTitle.remove( QRegExp( " \\(offline\\)$" ) );
-      QgsProject::instance()->title( projectTitle );
+      QgsProject::instance()->setTitle( projectTitle );
       QgsProject::instance()->removeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH );
       remoteLayer->reload(); //update with other changes
     }
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -358,16 +358,11 @@ QgsProject *QgsProject::instance()
   return theProject_;
 } // QgsProject *instance()
 
-void QgsProject::title( QString const &title )
+void QgsProject::setTitle( const QString &title )
 {
   imp_->title = title;
 
   dirty( true );
-} // void QgsProject::title
-
-void QgsProject::setTitle( const QString &t )
-{
-  title( t );
 }
 
 
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -82,10 +82,10 @@ class CORE_EXPORT QgsProject : public QObject
     /**
        Every project has an associated title string
 
-       ### QGIS 3: remove in favor of setTitle(...)
+       @deprecated Use @link setTitle @endlink instead.
      */
     //@{
-    void title( const QString & title );
+    Q_DECL_DEPRECATED inline void title( const QString & title ) { setTitle( title ); }
 
     /** Set project title
      *  @note added in 2.4 */

Original file line number	Diff line number	Diff line change
`@@ -358,16 +358,11 @@ QgsProject *QgsProject::instance()`
`358`	`358`	`return theProject_;`
`359`	`359`	`} // QgsProject *instance()`
`360`	`360`
`361`		`-void QgsProject::title( QString const &title )`
	`361`	`+void QgsProject::setTitle( const QString &title )`
`362`	`362`	`{`
`363`	`363`	`imp_->title = title;`
`364`	`364`
`365`	`365`	`dirty( true );`
`366`		`-} // void QgsProject::title`
`367`		`-`
`368`		`-void QgsProject::setTitle( const QString &t )`
`369`		`-{`
`370`		`- title( t );`
`371`	`366`	`}`
`372`	`367`
`373`	`368`