Test fixes

wonder-sk · wonder-sk · commit 663a9ac26aaf · 2018-04-07T12:58:02.000+02:00
diff --git a/python/core/qgsprojectstorageregistry.sip.in b/python/core/qgsprojectstorageregistry.sip.in
@@ -23,7 +23,6 @@ This is a singleton that should be accessed through :py:func:`QgsApplication.pro
 #include "qgsprojectstorageregistry.h"
 %End
   public:
-    QgsProjectStorageRegistry();
     ~QgsProjectStorageRegistry();
 
     QgsProjectStorage *projectStorageFromType( const QString &type );
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -483,6 +483,9 @@ QString QgsProject::absoluteFilePath() const
   if ( storage )
     return QString();
 
+  if ( mFile.fileName().isEmpty() )
+    return QString();  // this is to protect ourselves from getting current directory from QFileInfo::absoluteFilePath()
+
   return QFileInfo( mFile.fileName() ).absoluteFilePath();
 }
 
diff --git a/src/core/qgsprojectstorageregistry.h b/src/core/qgsprojectstorageregistry.h
@@ -33,7 +33,6 @@ class QgsProjectStorage;
 class CORE_EXPORT QgsProjectStorageRegistry
 {
   public:
-    QgsProjectStorageRegistry() = default;
     ~QgsProjectStorageRegistry();
 
     //! Returns storage implementation if the storage type matches one. Returns null pointer otherwise (it is a normal file)
diff --git a/src/providers/postgres/qgspostgresprojectstorage.h b/src/providers/postgres/qgspostgresprojectstorage.h
@@ -23,7 +23,6 @@ typedef struct
 class QgsPostgresProjectStorage : public QgsProjectStorage
 {
   public:
-    QgsPostgresProjectStorage() = default;
 
     virtual QString type() override { return QStringLiteral( "postgresql" ); }
 

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,9 @@ QString QgsProject::absoluteFilePath() const`
`483`	`483`	`if ( storage )`
`484`	`484`	`return QString();`
`485`	`485`
	`486`	`+ if ( mFile.fileName().isEmpty() )`
	`487`	`+ return QString(); // this is to protect ourselves from getting current directory from QFileInfo::absoluteFilePath()`
	`488`	`+`
`486`	`489`	`return QFileInfo( mFile.fileName() ).absoluteFilePath();`
`487`	`490`	`}`
`488`	`491`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ class QgsProjectStorage;`
`33`	`33`	`class CORE_EXPORT QgsProjectStorageRegistry`
`34`	`34`	`{`
`35`	`35`	`public:`
`36`		`- QgsProjectStorageRegistry() = default;`
`37`	`36`	`~QgsProjectStorageRegistry();`
`38`	`37`
`39`	`38`	`//! Returns storage implementation if the storage type matches one. Returns null pointer otherwise (it is a normal file)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ typedef struct`
`23`	`23`	`class QgsPostgresProjectStorage : public QgsProjectStorage`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`		`- QgsPostgresProjectStorage() = default;`
`27`	`26`
`28`	`27`	`virtual QString type() override { return QStringLiteral( "postgresql" ); }`
`29`	`28`