Skip to content

Commit 622ee51

Browse files
committed
renamed Configuration::getPlugin to Configuration::getPluginInfo
1 parent 20baa7a commit 622ee51

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

configuration.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ QStringList Configuration::getPluginKeys()
8787
return plugins.keys();
8888
}
8989

90-
QPair<QString, IPlugin *> Configuration::getPlugin(const QString &key)
90+
QPair<QString, IPlugin *> Configuration::getPluginInfo(const QString &key)
9191
{
9292
if(plugins.contains(key)){
9393
return plugins[key];

configuration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Configuration
1818
bool read();
1919
static QVariant get(const QString &key, QVariant defaultValue = QVariant());
2020
static QStringList getPluginKeys();
21-
static QPair<QString, IPlugin *> getPlugin(const QString &key);
21+
static QPair<QString, IPlugin *> getPluginInfo(const QString &key);
2222
QString getSettingsPath() const;
2323
bool check() const;
2424
protected:

dispatcher.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Dispatcher::Dispatcher()
99
{
1010
}
11+
1112
HTTPRequestHandler *Dispatcher::getHTTPRequestHandler(const QString &path) const
1213
{
1314
QStringList urlParts = path.split("/", QString::SkipEmptyParts);
@@ -23,12 +24,12 @@ HTTPRequestHandler *Dispatcher::getHTTPRequestHandler(const QString &path) const
2324
foreach(QString key, Configuration::getPluginKeys()){
2425
qDebug() << "plugin_key (path):" << key;
2526
if(key.right(key.size()-1) == urlStart || (urlStart == "" && "/" == key)){
26-
pluginInfo = Configuration::getPlugin(key);
27+
pluginInfo = Configuration::getPluginInfo(key);
2728
return pluginInfo.second->getHTTPRequestHandler(Configuration::get(pluginInfo.first).toHash());
2829
}
2930
}
3031

31-
pluginInfo = Configuration::getPlugin("static_file");
32+
pluginInfo = Configuration::getPluginInfo("static_file");
3233
QPair<QString, IPlugin*> err;
3334
if(err == pluginInfo){
3435
return NULL;

0 commit comments

Comments
 (0)