BUILDFIX: repeating default-arguments in definition

btw., what is or was calc2 supposed to be? It is non-functional,
can we remove it to unsupported or trashcan?

2 files changed, 26 insertions, 26 deletions

diff --git a/noncore/tools/calc2/calc.cpp b/noncore/tools/calc2/calc.cpp
index 883ab33..f75eb69 100644
--- a/noncore/tools/calc2/calc.cpp
+++ b/noncore/tools/calc2/calc.cpp
@@ -1,93 +1,93 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qvaluelist.h>
 #include <qpe/qpeapplication.h>
 #include <qdir.h>
 #include <qwidgetstack.h>
 
 #include "calc.h"
 #include "plugininterface.h"
 
-calc::calc (QWidget * p = 0, const char *n = 0):QWidget (p, n)
+calc::calc (QWidget * p, const char *n):QWidget (p, n)
 {
   setCaption (tr ("Calculator"));
 
 // widgets
   LCD = new QLCDNumber (this);
   LCD->setMaximumSize (QSize (240, 30));
     LCD->setNumDigits(12);
 LCD->setSegmentStyle(QLCDNumber::Filled);
   pluginWidgetStack = new QWidgetStack (this);
 
 // layout widgets
   calculatorLayout = new QVBoxLayout (this);
   calculatorLayout->addWidget (LCD);
   calculatorLayout->addWidget (pluginWidgetStack);
 
 // no formatting of display for now
   connect (&engine, SIGNAL(display (double)), LCD, SLOT(display (double)));
   connect (&engine, SIGNAL(display (const QString &)), LCD, SLOT(display (const QString &)));
     connect (&engine, SIGNAL(setBinMode()), LCD, SLOT(setBinMode()));
     connect (&engine, SIGNAL(setOctMode()), LCD, SLOT(setOctMode()));
     connect (&engine, SIGNAL(setDecMode()), LCD, SLOT(setDecMode()));
     connect (&engine, SIGNAL(setHexMode()), LCD, SLOT(setHexMode()));
 
 #ifndef NO_PLUGINS
 // load plugins
   QValueList < Plugin >::Iterator mit;
   for (mit = pluginList.begin (); mit != pluginList.end (); ++mit) {
     (*mit).interface->release ();
     (*mit).library->unload ();
     delete (*mit).library;
   }
   pluginList.clear ();
 
   QString path = QPEApplication::qpeDir() + "/plugins/calculator";
   QDir dir (path, "lib*.so");
   QStringList list = dir.entryList ();
 
   QStringList::Iterator it;
   for (it = list.begin (); it != list.end (); ++it) {
     CalcInterface *iface = 0;
     QLibrary *lib = new QLibrary (path + "/" + *it);
 
     Plugin plugin;
     plugin.pluginWidget = 0;
 
     if (lib->queryInterface (IID_Calc, (QUnknownInterface **) & iface) ==
 	QS_OK) {
       plugin.library = lib;
       plugin.interface = iface;
       plugin.pluginWidget = plugin.interface->getPlugin(&engine,pluginWidgetStack);
       if (plugin.pluginWidget) 
 	pluginWidgetStack->addWidget (plugin.pluginWidget, pluginList.count());
       pluginList.append (plugin);
     } else {
       delete lib;
     }
   }
   setMode (1);
 #else
 // load simple interface
 #endif
 }
 
 calc::~calc ()
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index 8dfba95..c9f5fa1 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -1,29 +1,29 @@
-#TEMPLATE = app
-#CONFIG += qt release
-## Input
-#HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
-#SOURCES += calc.cpp main.cpp engine.cpp
-#INCLUDEPATH     += $(OPIEDIR)/include 
-#DEPENDPATH      += $(OPIEDIR)/include 
-#LIBS += -lqpe -Wl,-export-dynamic 
-#TARGET = calc
-#DESTDIR = $(OPIEDIR)/bin
-#
-#TRANSLATIONS = ../../../i18n/de/calc.pro \
-#	 ../../../i18n/en/calc.pro \
-#	 ../../../i18n/es/calc.pro \
-#	 ../../../i18n/fr/calc.pro \
-#	 ../../../i18n/hu/calc.pro \
-#	 ../../../i18n/ja/calc.pro \
-#	 ../../../i18n/ko/calc.pro \
-#	 ../../../i18n/no/calc.pro \
-#	 ../../../i18n/pl/calc.pro \
-#	 ../../../i18n/pt/calc.pro \
-#	 ../../../i18n/pt_BR/calc.pro \
-#	 ../../../i18n/sl/calc.pro \
-#	 ../../../i18n/zh_CN/calc.pro \
-#	 ../../../i18n/zh_TW/calc.pro
+TEMPLATE = app
+CONFIG += qt release
+# Input
+HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
+SOURCES += calc.cpp main.cpp engine.cpp
+INCLUDEPATH     += $(OPIEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
+LIBS += -lqpe -Wl,-export-dynamic 
+TARGET = calc
+DESTDIR = $(OPIEDIR)/bin
+
+TRANSLATIONS = ../../../i18n/de/calc.pro \
+	 ../../../i18n/en/calc.pro \
+	 ../../../i18n/es/calc.pro \
+	 ../../../i18n/fr/calc.pro \
+	 ../../../i18n/hu/calc.pro \
+	 ../../../i18n/ja/calc.pro \
+	 ../../../i18n/ko/calc.pro \
+	 ../../../i18n/no/calc.pro \
+	 ../../../i18n/pl/calc.pro \
+	 ../../../i18n/pt/calc.pro \
+	 ../../../i18n/pt_BR/calc.pro \
+	 ../../../i18n/sl/calc.pro \
+	 ../../../i18n/zh_CN/calc.pro \
+	 ../../../i18n/zh_TW/calc.pro
 
 
 
 include ( $(OPIEDIR)/include.pro )