summaryrefslogtreecommitdiff
authorsimon <simon>2002-03-25 19:19:51 (UTC)
committer simon <simon>2002-03-25 19:19:51 (UTC)
commit956522a9355051294e12e85e564d8ae1f0b928a3 (patch) (side-by-side diff)
tree1926e6b270be501ed9fa4d5b89d839666c2c82ba
parent7c0676ba302dc1cfa4348423544ea2d66417c1bd (diff)
downloadopie-956522a9355051294e12e85e564d8ae1f0b928a3.zip
opie-956522a9355051294e12e85e564d8ae1f0b928a3.tar.gz
opie-956522a9355051294e12e85e564d8ae1f0b928a3.tar.bz2
- no default arguments in method implementations
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/categorymenu.cpp2
-rw-r--r--library/imageedit.cpp2
-rw-r--r--library/menubutton.cpp2
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,76 +1,76 @@
/**********************************************************************
** 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;
diff --git a/library/imageedit.cpp b/library/imageedit.cpp
index 7f98ebb..0c22448 100644
--- a/library/imageedit.cpp
+++ b/library/imageedit.cpp
@@ -1,71 +1,71 @@
/**********************************************************************
** 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();
}
diff --git a/library/menubutton.cpp b/library/menubutton.cpp
index c34383a..6b1fa2b 100644
--- a/library/menubutton.cpp
+++ b/library/menubutton.cpp
@@ -56,97 +56,97 @@ MenuButton::MenuButton( const QStringList& items, QWidget* parent, const char* n
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());
}