Last missing piece to remove stdc++ dependency

-Remove linking against stdc++
-Remove includes of fstream and algorithm

2 files changed, 1 insertions, 6 deletions

diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index a74b861..d76ae39 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -21,20 +21,20 @@ SOURCES        = mainwin.cpp \
           ipkg.cpp \
           main.cpp \
           packagewin.cpp \
           package.cpp \
           installdlgimpl.cpp \
           instoptionsimpl.cpp \
           destination.cpp \
           utils.cpp \
           server.cpp \
           letterpushbutton.cpp \
           inputdlg.cpp \
           version.cpp \
           categoryfilterimpl.cpp
 TARGET        = aqpkg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopiecore2 -lopieui2 -lstdc++
+LIBS        += -lqpe -lopiecore2 -lopieui2 
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 2f35617..9c8ec7a 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -34,37 +34,32 @@
 #include <opie2/otabwidget.h>
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #endif
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
-/* STD */
-#include <fstream>
-#include <algorithm>
-using namespace std;
-
 using namespace Opie::Ui;
 using namespace Opie::Ui;
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
         : QDialog( parent, name, modal, fl )
 {
     setCaption( tr( "Configuration" ) );
 
     // Setup layout to make everything pretty
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     // Setup tabs for all info
     OTabWidget *tabwidget = new OTabWidget( this );
     layout->addWidget( tabwidget );