Commit fae0d949 authored by Tomas Mecir's avatar Tomas Mecir

mapper fixes

parent 7c6f9b78
Tomas Mecir <kmuddy@kmuddy.com>
Tomas Mecir <mecirt@gmail.com>
......@@ -3,5 +3,5 @@ SRCDIR=$(pwd)
mkdir ../kmuddy-build
cd ../kmuddy-build
cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`
cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix`
......@@ -3,5 +3,5 @@ SRCDIR=$(pwd)
mkdir ../kmuddy-build
cd ../kmuddy-build
cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`
cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix`
......@@ -58,7 +58,7 @@ add_library(kmuddycore SHARED ${kmuddycore_LIB_SRCS})
# TODO: get rid of the support libs
target_link_libraries(kmuddycore KF5::KCMUtils KF5::I18n KF5::Service KF5::KDELibs4Support Qt5::Script Qt5::Multimedia)
set_target_properties(kmuddycore PROPERTIES VERSION 1.0.0 SOVERSION 1 )
set_target_properties(kmuddycore PROPERTIES VERSION 2.0.0 SOVERSION 2 )
install(TARGETS kmuddycore DESTINATION ${LIB_INSTALL_DIR} )
......
......@@ -104,9 +104,7 @@ void CMapViewStatusbar::setZone(CMapZone *zone)
d->zonePicker->setCurrentIndex(zones->activeZone());
}
if (d->zone == zone) return;
d->zone = zone;
d->levelPicker->setModel(zone->levelsModel());
setLevel(d->manager->getActiveView()->getCurrentlyViewedLevel());
}
......
......@@ -639,7 +639,7 @@ void CMapFileFilterXML::savePluginPropertiesForElement(CMapElement *element,QDom
plugin->saveElementProperties(element,&pluginProperties);
EntryMap entries = pluginProperties.entryMap("Properties");
for (EntryMap::ConstIterator it = entries.begin(); it != entries.end(); ++it)
for (EntryMap::ConstIterator it = entries.constBegin(); it != entries.constEnd(); ++it)
{
pNode.setAttribute(it.key(),it.value());
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment