Test fixes

qgis · Apr 7, 2018 · 663a9ac · 663a9ac
1 parent 17a8c45
commit 663a9ac
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
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" ); }