Changeset 66:81d097d3b117 in SMSSender


Ignore:
Timestamp:
Feb 5, 2010 2:30:26 PM (8 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
3.0
Convert:
svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@65
Message:
  • Removed QPluginLoader dependencies from BCLibraryLoader
  • Fixed wrong settingsPath detection.
Location:
src/business
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/business/BCLibraryLoader.cpp

    r64 r66  
    2020BCLibraryLoader* BCLibraryLoader::instance() {
    2121    return instance_ ? instance_ : (instance_ = new BCLibraryLoader);
    22 }
    23 
    24 BCLibraryLoader::BCLibraryLoader() {
    25     pluginLoader_ = new QPluginLoader();
    26 }
    27 
    28 BCLibraryLoader::~BCLibraryLoader() {
    29     delete pluginLoader_;
    30 }
    31 
    32 
    33 QPluginLoader* BCLibraryLoader::pluginLoader() const {
    34     return pluginLoader_;
    3522}
    3623
     
    6754
    6855            return lib;
     56        } else {
     57            qWarning() << "The library could not have been loaded: The returned library object was NULL";
    6958        }
    7059    } else {
    7160        qWarning() << "The library could not have been loaded: " + library.errorString();
    72         return NULL;
    7361    }
     62    return NULL;
    7463
    7564/*    pluginLoader()->setLoadHints(QLibrary::ResolveAllSymbolsHint | QLibrary::ExportExternalSymbolsHint);
  • src/business/BCLibraryLoader.h

    r40 r66  
    1111#include <QObject>
    1212#include <QMap>
    13 #include <QPluginLoader>
     13//#include <QPluginLoader>
    1414
    1515#include <ilibraryloader.h>
     
    3131
    3232protected:
    33     BCLibraryLoader();
    34     virtual ~BCLibraryLoader();
    35 
    36     QPluginLoader* pluginLoader() const;
     33    BCLibraryLoader(){};
    3734
    3835private:
    3936    static BCLibraryLoader*    instance_;
    40     QPluginLoader*             pluginLoader_;
    4137    QMap<QString, ILibrary*>   libraries_;
    4238    QMap<ILibrary*, IGateway*> gateways_;
  • src/business/BCSettings.cpp

    r63 r66  
    4444        QString path = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/gorrion/SMSSender/";
    4545        settingsPath.mkpath(path);
    46         settingsPath.setCurrent(path);
     46        settingsPath.setPath(path);
    4747    }
    4848   
Note: See TracChangeset for help on using the changeset viewer.