3 files changed, 3 insertions, 3 deletions

diff --git a/library/categorymenu.cpp b/library/categorymenu.cpp
index 52a127c..e733107 100644
--- a/library/categorymenu.cpp
+++ b/library/categorymenu.cpp
@@ -1,110 +1,110 @@
 /**********************************************************************
 ** Copyright (C) 2001 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 "categorymenu.h"
 #include "backend/categories.h"
 #include "categoryselect.h"
 #include <qstring.h>
 #include <qmap.h>
 
 CategoryMenu::CategoryMenu( const QString &n, bool ig = TRUE,
-        QWidget *parent = 0, const char *name = 0 ) : 
+        QWidget *parent, const char *name ) : 
     QPopupMenu(parent, name),
         appName(n),
         includeGlobal(ig)
 {
     currentMid = 1;
     reload();
     connect(this, SIGNAL(activated(int)), this, SLOT(mapMenuId(int)));
 }
 
 CategoryMenu::~CategoryMenu( ) 
 {
 }
 
 void CategoryMenu::reload()
 {
     clear();
     Categories c;
 
     c.load(categoryFileName());
 
     QStringList sl = c.labels(appName, includeGlobal);
     int mid = 1;
 
     insertItem(tr("All"), mid);
     mid++;
     insertItem(tr("Unfiled"), mid);
     mid++;
 
     for (QStringList::Iterator it = sl.begin();
             it != sl.end(); ++it ) {
         int cid = c.id(appName, *it);
         insertItem(*it, mid);
         menuToId.insert(mid, cid);
         idToMenu.insert(cid, mid);
         mid++;
     }
 
     setItemChecked(currentMid, TRUE );
 }
 
 void CategoryMenu::mapMenuId(int id) 
 {
     if (id == currentMid)
         return;
     setItemChecked( currentMid, FALSE );
     setItemChecked( id, TRUE );
     currentMid = id;
 
     emit categoryChange();
 }
 
 bool CategoryMenu::isSelected(const QArray<int> &cUids) const
 {
     if (currentMid == 1)
         return TRUE;
 
     if (currentMid == 2 && cUids.count() == 0) 
         return TRUE;
 
     if (cUids.contains(menuToId[currentMid]))
         return TRUE;
 
     return FALSE;
 }
 
 void CategoryMenu::setCurrentCategory( int newCatUid )
 {
     if (!idToMenu.contains(newCatUid)) 
         return;
 
     mapMenuId(idToMenu[newCatUid]);
 }
 
 void CategoryMenu::setCurrentCategoryAll( )
 {
     mapMenuId(1);
 }
 
 void CategoryMenu::setCurrentCategoryUnfiled( )
 {
     mapMenuId(2);
 }
diff --git a/library/imageedit.cpp b/library/imageedit.cpp
index 7f98ebb..0c22448 100644
--- a/library/imageedit.cpp
+++ b/library/imageedit.cpp
@@ -1,97 +1,97 @@
 /**********************************************************************
 ** 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 "imageedit.h"
 #include <qpainter.h>
 
-ImageEdit::ImageEdit( QWidget *parent = 0, const char *name = 0 )
+ImageEdit::ImageEdit( QWidget *parent, const char *name )
     : QScrollView( parent, name, WNorthWestGravity | WResizeNoErase ), buffer()
 {
     buffer.resize( size() );
     buffer.fill( colorGroup().color( QColorGroup::Base ) );
 }
 
 ImageEdit::~ImageEdit()
 {
     
 }
 
 void ImageEdit::contentsMousePressEvent( QMouseEvent *e )
 {
     lastPos = e->pos();
 }
 
 void ImageEdit::contentsMouseMoveEvent( QMouseEvent *e )
 {
     QPainter pw( viewport() );
     QPainter pb( &buffer );
     pb.drawLine( lastPos, e->pos() );
     pw.drawLine( contentsToViewport( lastPos ),
                  contentsToViewport( e->pos() ) );
     lastPos = e->pos();
 }
 
 void ImageEdit::contentsMouseReleaseEvent( QMouseEvent * )
 {
 }
 
 void ImageEdit::viewportResizeEvent( QResizeEvent *e )
 {
     enlargeBuffer(e->size());
 }
 
 void ImageEdit::enlargeBuffer( const QSize& sz )
 {
     QSize osz = buffer.size();
     QSize nsz( QMAX( osz.width(), sz.width() ), QMAX( osz.height(), sz.height() ) );
     buffer.resize( nsz.width(), nsz.height() );
     // clear new area
     QPainter p( &buffer );
     if ( sz.width() > osz.width() )
         p.fillRect( osz.width(), 0, sz.width() - osz.width(), nsz.height(), colorGroup().color( QColorGroup::Base ) );
     if ( sz.height() > osz.height() )
         p.fillRect( 0, osz.height(), nsz.width(), sz.height() - osz.height(), colorGroup().color( QColorGroup::Base ) );
     p.end();
 }
 
 void ImageEdit::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
 {
     p->drawPixmap( cx, cy, buffer, cx, cy, cw, ch );
 }
 
 void ImageEdit::setPixmap( const QPixmap &pm )
 {
     QSize osz = buffer.size();
     if ( pm.width() < osz.width() || pm.height() < osz.height() ) {
         buffer.fill(white);
         enlargeBuffer( pm.size() );
         QPainter p(&buffer);
         p.drawPixmap(0,0,pm);
     } else {
         buffer = pm;
     }
     resizeContents( buffer.width(), buffer.height() );
     viewport()->repaint( FALSE );
 }
 
 QPixmap ImageEdit::pixmap() const
 {
     return buffer;
 }
 
diff --git a/library/menubutton.cpp b/library/menubutton.cpp
index c34383a..6b1fa2b 100644
--- a/library/menubutton.cpp
+++ b/library/menubutton.cpp
@@ -8,180 +8,180 @@
 ** 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 "menubutton.h"
 #include <qpopupmenu.h>
 
 /*!
   \class MenuButton menubutton.h
   \brief The MenuButton class is a pushbutton with a menu.
 
   Similar in function to a QComboBox.
 */
 
 /*!
   \fn void MenuButton::selected(int index)
 
   This signal is emitted when the item at \a index is selected.
 */
 
 /*!
   \fn void MenuButton::selected(const QString& text)
 
   This signal is emitted when the item with the given \a text is selected.
 */
 
 
 /*!
   Constructs a MenuButton with the given \a items added (see insertItems()).
   The standard \a parent an \a name arguments are passed to the base class.
 */
 MenuButton::MenuButton( const QStringList& items, QWidget* parent, const char* name) :
     QPushButton(parent,name)
 {
     init();
     insertItems(items);
 }
 
 /*!
   Constructs an empty MenuButton.
   The standard \a parent an \a name arguments are passed to the base class.
 
   \sa insertItems()
 */
 MenuButton::MenuButton( QWidget* parent, const char* name) :
     QPushButton(parent,name)
 {
     init();
 }
 
 void MenuButton::init()
 {
     setAutoDefault(FALSE);
     pop = new QPopupMenu(this);
     nitems=0;
     connect(pop, SIGNAL(activated(int)), this, SLOT(select(int)));
     setPopup(pop);
     //setPopupDelay(0);
 }
 
 /*!
   Removes all items from the button and menu.
 */
 void MenuButton::clear()
 {
     delete pop;
     init();
 }
 
 /*!
   Inserts string \a items into the menu. The string "--" represents
   a separator.
 */
 void MenuButton::insertItems( const QStringList& items )
 {
     QStringList::ConstIterator it=items.begin();
     for (; it!=items.end(); ++it) {
         if ( (*it) == "--" )
             insertSeparator();
         else
             insertItem(*it);
     }
 }
 
 /*!
   Inserts an \a icon and \a text into the menu.
 */
-void MenuButton::insertItem( const QIconSet& icon, const QString& text=QString::null )
+void MenuButton::insertItem( const QIconSet& icon, const QString& text )
 {
     pop->insertItem(icon, text, nitems++);
     if ( nitems==1 ) select(0);
 }
 
 /*!
   Inserts \a text into the menu.
 */
 void MenuButton::insertItem( const QString& text )
 {
     pop->insertItem(text, nitems++);
     if ( nitems==1 ) select(0);
 }
 
 /*!
   Inserts a visual separator into the menu.
 */
 void MenuButton::insertSeparator()
 {
     pop->insertSeparator();
 }
 
 /*!
   Selects the items with text \a s.
 */
 void MenuButton::select(const QString& s)
 {
     for (int i=0; i<nitems; i++) {
         if ( pop->text(i) == s ) {
             select(i);
             break;
         }
     }
 }
 
 /*!
   Selects the item at index \a s.
 */
 void MenuButton::select(int s)
 {
     cur = s;
     updateLabel();
     if ( pop->iconSet(cur) )
         setIconSet(*pop->iconSet(cur));
     emit selected(cur);
     emit selected(currentText());
 }
 
 /*!
   Returns the index of the current item.
 */
 int MenuButton::currentItem() const
 {
     return cur;
 }
 
 /*!
   Returns the text of the current item.
 */
 QString MenuButton::currentText() const
 {
     return pop->text(cur);
 }
 
 /*!
   Sets the label. If \a label is empty, the
   current item text is displayed, otherwise \a label should contain
   "%1", which will be replaced by the current item text.
 */
 void MenuButton::setLabel(const QString& label)
 {
     lab = label;
     updateLabel();
 }
 
 void MenuButton::updateLabel()
 {
     QString t = pop->text(cur);
     if ( !lab.isEmpty() )
         t = lab.arg(t);
     setText(t);
 }