summaryrefslogtreecommitdiff
path: root/src/settings.cpp
diff options
context:
space:
mode:
authorAndrzej Rybczak <electricityispower@gmail.com>2012-09-14 00:54:48 +0200
committerAndrzej Rybczak <electricityispower@gmail.com>2012-09-14 00:54:48 +0200
commit1891c1c0503a5ef66e7ef4b57a23d42cd4c2e824 (patch)
treec1cac6258581ff6e949bcdf581a436c1412cbcd9 /src/settings.cpp
parent7c3f93e211c6748b4fdf4486bd0e88fff38e3454 (diff)
do not initialize screens lazily as it doesn't make much sense
Diffstat (limited to 'src/settings.cpp')
-rw-r--r--src/settings.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index 4ce08b94..27a584f1 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -87,7 +87,7 @@ namespace
return NC::Border(stringToColor(border));
}
- BasicScreen *intToScreen(int n)
+ ScreenRef intToScreen(int n)
{
switch (n)
{
@@ -120,7 +120,7 @@ namespace
return myClock;
# endif // ENABLE_CLOCK
default:
- return 0;
+ return ScreenRef();
}
}
@@ -667,7 +667,7 @@ void Configuration::Read()
++it;
if (it == v.end())
break;
- if (BasicScreen *screen = intToScreen(atoi(&*it)))
+ if (auto screen = intToScreen(atoi(&*it)))
screens_seq.push_back(screen);
while (it != v.end() && isdigit(*it))
++it;