File tree 3 files changed +5
-4
lines changed
3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ QStringList Configuration::getPluginKeys()
87
87
return plugins.keys ();
88
88
}
89
89
90
- QPair<QString, IPlugin *> Configuration::getPlugin (const QString &key)
90
+ QPair<QString, IPlugin *> Configuration::getPluginInfo (const QString &key)
91
91
{
92
92
if (plugins.contains (key)){
93
93
return plugins[key];
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ class Configuration
18
18
bool read ();
19
19
static QVariant get (const QString &key, QVariant defaultValue = QVariant());
20
20
static QStringList getPluginKeys ();
21
- static QPair<QString, IPlugin *> getPlugin (const QString &key);
21
+ static QPair<QString, IPlugin *> getPluginInfo (const QString &key);
22
22
QString getSettingsPath () const ;
23
23
bool check () const ;
24
24
protected:
Original file line number Diff line number Diff line change 8
8
Dispatcher::Dispatcher ()
9
9
{
10
10
}
11
+
11
12
HTTPRequestHandler *Dispatcher::getHTTPRequestHandler (const QString &path) const
12
13
{
13
14
QStringList urlParts = path.split (" /" , QString::SkipEmptyParts);
@@ -23,12 +24,12 @@ HTTPRequestHandler *Dispatcher::getHTTPRequestHandler(const QString &path) const
23
24
foreach (QString key, Configuration::getPluginKeys ()){
24
25
qDebug () << " plugin_key (path):" << key;
25
26
if (key.right (key.size ()-1 ) == urlStart || (urlStart == " " && " /" == key)){
26
- pluginInfo = Configuration::getPlugin (key);
27
+ pluginInfo = Configuration::getPluginInfo (key);
27
28
return pluginInfo.second ->getHTTPRequestHandler (Configuration::get (pluginInfo.first ).toHash ());
28
29
}
29
30
}
30
31
31
- pluginInfo = Configuration::getPlugin (" static_file" );
32
+ pluginInfo = Configuration::getPluginInfo (" static_file" );
32
33
QPair<QString, IPlugin*> err;
33
34
if (err == pluginInfo){
34
35
return NULL ;
You can’t perform that action at this time.
0 commit comments