refs #649, refs #658 fixed includes to new subfolders "db"

some style changes in same step
This commit is contained in:
Klaus Basan
2016-05-24 00:40:40 +02:00
parent 5789bdd722
commit 54b1234f7f
44 changed files with 130 additions and 109 deletions

View File

@@ -12,7 +12,8 @@
#ifndef BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H
#define BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H
#include "blackcore/databaseauthentication.h"
#include "blackcore/db/databaseauthentication.h"
#include "blackcore/data/globalsetup.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/statusmessagelist.h"
@@ -20,8 +21,6 @@
#include <QObject>
#include <QScopedPointer>
class QWidget;
namespace BlackMisc { namespace Network { class CAuthenticatedUser; } }
namespace Ui { class CDbLoginComponent; }
@@ -45,7 +44,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CDbLoginComponent> ui;
BlackCore::CDatabaseAuthenticationService m_loginService {this}; //!< login service
BlackCore::Db::CDatabaseAuthenticationService m_loginService {this}; //!< login service
//! Overlay messages
void displayOverlayMessages(const BlackMisc::CStatusMessageList &msgs);
@@ -62,7 +61,6 @@ namespace BlackGui
//! User authentication completed
void ps_AuthenticationFinished(const BlackMisc::Network::CAuthenticatedUser &user, const BlackMisc::CStatusMessageList &status);
};
} // ns
} // ns