1 files changed, 12 insertions, 11 deletions

diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index a18a178..9dd2206 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -17,4 +17,5 @@
 
 #include <fstream>
+#include <algorithm>
 using namespace std;
 
@@ -92,5 +93,5 @@ void SettingsImpl :: editServer( int sel )
 {
         currentSelectedServer = sel;
-    Server *s = dataMgr->getServer( servers->currentText() );
+    vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
     serverName = s->getServerName();
     servername->setText( s->getServerName() );
@@ -110,8 +111,8 @@ void SettingsImpl :: newServer()
 void SettingsImpl :: removeServer()
 {
-        changed = true;
-    Server *s = dataMgr->getServer( servers->currentText() );
-        dataMgr->getServerList().erase( s );
-        servers->removeItem( currentSelectedServer );
+    changed = true;
+    vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
+    dataMgr->getServerList().erase( s );
+    servers->removeItem( currentSelectedServer );
 }
 
@@ -123,5 +124,5 @@ void SettingsImpl :: changeServerDetails()
         if ( !newserver )
         {
-                Server *s = dataMgr->getServer( serverName );
+                vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
 
                 // Update url
@@ -160,5 +161,5 @@ void SettingsImpl :: editDestination( int sel )
 {
         currentSelectedDestination = sel;
-    Destination *d = dataMgr->getDestination( destinations->currentText() );
+    vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() );
     destinationName = d->getDestinationName();
     destinationname->setText( d->getDestinationName() );
@@ -178,7 +179,7 @@ void SettingsImpl :: newDestination()
 void SettingsImpl :: removeDestination()
 {
-        changed = true;
-    Destination *d = dataMgr->getDestination( destinations->currentText() );
-        dataMgr->getDestinationList().erase( d );
+    changed = true;
+    vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() );
+    dataMgr->getDestinationList().erase( d );
         destinations->removeItem( currentSelectedDestination );
 }
@@ -196,5 +197,5 @@ void SettingsImpl :: changeDestinationDetails()
         if ( !newdestination )
         {
-                Destination *d = dataMgr->getDestination( destinationName );
+                vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() );
 
                 // Update url