summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-30 02:59:54 (UTC)
committer mickeyl <mickeyl>2003-03-30 02:59:54 (UTC)
commite1c4cb3364f8f7ff68da88b5ec26053ee561c8a1 (patch) (side-by-side diff)
treea7688f2a87c3aa29e7672c9d865d3a953f15ff87
parent15ee85466704072173296ff4f0f446cd8fe81d1e (diff)
downloadopie-e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1.zip
opie-e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1.tar.gz
opie-e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1.tar.bz2
convert my beloved "not" to "!" to make ancient compilers happy, but not me...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/oversatileview.cpp152
-rw-r--r--libopie2/opieui/oversatileviewitem.cpp2
2 files changed, 77 insertions, 77 deletions
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 32855be..6808539 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -258,5 +258,5 @@ void OVersatileView::contextMenuRequested( QIconViewItem* item, const QPoint& po
void OVersatileView::popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col )
{
- if ( not item )
+ if ( !item )
_contextmenu->exec( pos );
else
@@ -450,5 +450,5 @@ void OVersatileView::expanded( QListViewItem *item ) // QListView
{
//qDebug( "OVersatileView::expanded(): opening tree..." );
- if ( not _treeopened.isNull() )
+ if ( !_treeopened.isNull() )
item->setPixmap( 0, _treeopened );
emit( expanded( static_cast<OVersatileViewItem*>( item ) ) );
@@ -456,5 +456,5 @@ void OVersatileView::expanded( QListViewItem *item ) // QListView
void OVersatileView::collapsed( QListViewItem *item ) // QListView
{
- if ( not _treeclosed.isNull() )
+ if ( !_treeclosed.isNull() )
item->setPixmap( 0, _treeclosed );
emit( collapsed( static_cast<OVersatileViewItem*>( item ) ) );
@@ -467,5 +467,5 @@ void OVersatileView::collapsed( QListViewItem *item ) // QListView
int OVersatileView::treeStepSize() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -475,5 +475,5 @@ int OVersatileView::treeStepSize() const // QListView
void OVersatileView::setTreeStepSize( int size ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -484,5 +484,5 @@ int OVersatileView::treeStepSize() const // QListView
QHeader * OVersatileView::header() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return 0;
@@ -493,5 +493,5 @@ QHeader * OVersatileView::header() const // QListView
int OVersatileView::addColumn( const QString &label, int size ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -499,8 +499,8 @@ QHeader * OVersatileView::header() const // QListView
return _listview->addColumn( label, size );
}
-
+
int OVersatileView::addColumn( const QIconSet& iconset, const QString &label, int size ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -511,5 +511,5 @@ QHeader * OVersatileView::header() const // QListView
void OVersatileView::removeColumn( int index ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -519,5 +519,5 @@ void OVersatileView::removeColumn( int index ) // QListView
void OVersatileView::setColumnText( int column, const QString &label ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -527,5 +527,5 @@ void OVersatileView::removeColumn( int index ) // QListView
void OVersatileView::setColumnText( int column, const QIconSet& iconset, const QString &label ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -535,5 +535,5 @@ void OVersatileView::removeColumn( int index ) // QListView
QString OVersatileView::columnText( int column ) const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return QString::null;
@@ -543,5 +543,5 @@ QString OVersatileView::columnText( int column ) const // QListView
void OVersatileView::setColumnWidth( int column, int width ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -551,5 +551,5 @@ QString OVersatileView::columnText( int column ) const // QListView
int OVersatileView::columnWidth( int column ) const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -559,5 +559,5 @@ int OVersatileView::columnWidth( int column ) const // QListView
void OVersatileView::setColumnWidthMode( int column, WidthMode mode ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -567,5 +567,5 @@ int OVersatileView::columnWidth( int column ) const // QListView
int OVersatileView::columns() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -576,5 +576,5 @@ int OVersatileView::columns() const // QListView
void OVersatileView::setColumnAlignment( int column, int align ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -584,5 +584,5 @@ int OVersatileView::columns() const // QListView
int OVersatileView::columnAlignment( int column ) const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -593,5 +593,5 @@ int OVersatileView::columnAlignment( int column ) const // QListView
OVersatileViewItem * OVersatileView::itemAt( const QPoint & screenPos ) const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return 0;
@@ -601,5 +601,5 @@ OVersatileViewItem * OVersatileView::itemAt( const QPoint & screenPos ) const /
QRect OVersatileView::itemRect( const OVersatileViewItem * item ) const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return QRect( -1, -1, -1, -1 );
@@ -609,5 +609,5 @@ QRect OVersatileView::itemRect( const OVersatileViewItem * item ) const // QLis
int OVersatileView::itemPos( const OVersatileViewItem * item ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -618,5 +618,5 @@ int OVersatileView::itemPos( const OVersatileViewItem * item ) // QListView
bool OVersatileView::isSelected( const OVersatileViewItem * item ) const // QListView // also in QIconViewItem but !in QIconView *shrug*
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return false;
@@ -636,5 +636,5 @@ bool OVersatileView::isMultiSelection() const
OVersatileViewItem * OVersatileView::selectedItem() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return 0;
@@ -644,5 +644,5 @@ OVersatileViewItem * OVersatileView::selectedItem() const // QListView
void OVersatileView::setOpen( OVersatileViewItem * item, bool open ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -652,5 +652,5 @@ OVersatileViewItem * OVersatileView::selectedItem() const // QListView
bool OVersatileView::isOpen( const OVersatileViewItem * item ) const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return false;
@@ -661,5 +661,5 @@ bool OVersatileView::isOpen( const OVersatileViewItem * item ) const // QListVi
OVersatileViewItem * OVersatileView::firstChild() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return 0;
@@ -669,5 +669,5 @@ OVersatileViewItem * OVersatileView::firstChild() const // QListView
int OVersatileView::childCount() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -678,5 +678,5 @@ int OVersatileView::childCount() const // QListView
void OVersatileView::setAllColumnsShowFocus( bool focus ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -686,5 +686,5 @@ int OVersatileView::childCount() const // QListView
bool OVersatileView::allColumnsShowFocus() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return false;
@@ -695,5 +695,5 @@ bool OVersatileView::allColumnsShowFocus() const // QListView
void OVersatileView::setItemMargin( int margin ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -703,5 +703,5 @@ bool OVersatileView::allColumnsShowFocus() const // QListView
int OVersatileView::itemMargin() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return -1;
@@ -712,5 +712,5 @@ int OVersatileView::itemMargin() const // QListView
void OVersatileView::setRootIsDecorated( bool decorate ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -720,5 +720,5 @@ int OVersatileView::itemMargin() const // QListView
bool OVersatileView::rootIsDecorated() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return false;
@@ -729,5 +729,5 @@ bool OVersatileView::rootIsDecorated() const // QListView
void OVersatileView::setShowSortIndicator( bool show ) // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -737,5 +737,5 @@ void OVersatileView::setShowSortIndicator( bool show ) // QListView
bool OVersatileView::showSortIndicator() const // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return false;
@@ -746,5 +746,5 @@ bool OVersatileView::showSortIndicator() const // QListView
void OVersatileView::triggerUpdate() // QListView
{
- if ( not isValidViewMode( Tree ) )
+ if ( !isValidViewMode( Tree ) )
{
return;
@@ -759,5 +759,5 @@ void OVersatileView::triggerUpdate() // QListView
uint OVersatileView::count() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -768,5 +768,5 @@ uint OVersatileView::count() const // QIconView
int OVersatileView::index( const OVersatileViewItem *item ) const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return -1;
@@ -777,5 +777,5 @@ int OVersatileView::index( const OVersatileViewItem *item ) const // QIconView
OVersatileViewItem* OVersatileView::firstItem() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -785,5 +785,5 @@ OVersatileViewItem* OVersatileView::firstItem() const // QIconView
OVersatileViewItem* OVersatileView::lastItem() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -794,5 +794,5 @@ OVersatileViewItem* OVersatileView::lastItem() const // QIconView
OVersatileViewItem* OVersatileView::findItem( const QPoint &pos ) const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -802,5 +802,5 @@ OVersatileViewItem* OVersatileView::findItem( const QPoint &pos ) const // QIcon
OVersatileViewItem* OVersatileView::findItem( const QString &text ) const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -811,5 +811,5 @@ OVersatileViewItem* OVersatileView::findItem( const QString &text ) const // QIc
OVersatileViewItem* OVersatileView::findFirstVisibleItem( const QRect &r ) const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -819,5 +819,5 @@ OVersatileViewItem* OVersatileView::findFirstVisibleItem( const QRect &r ) const
OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return 0;
@@ -828,5 +828,5 @@ OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const
void OVersatileView::setGridX( int rx ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -836,5 +836,5 @@ OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const
void OVersatileView::setGridY( int ry ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -844,5 +844,5 @@ OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const
int OVersatileView::gridX() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return -1;
@@ -852,5 +852,5 @@ int OVersatileView::gridX() const // QIconView
int OVersatileView::gridY() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return -1;
@@ -860,5 +860,5 @@ int OVersatileView::gridY() const // QIconView
void OVersatileView::setSpacing( int sp ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -868,5 +868,5 @@ int OVersatileView::gridY() const // QIconView
int OVersatileView::spacing() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return -1;
@@ -876,5 +876,5 @@ int OVersatileView::spacing() const // QIconView
void OVersatileView::setItemTextPos( QIconView::ItemTextPos pos ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -884,5 +884,5 @@ int OVersatileView::spacing() const // QIconView
QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return (QIconView::ItemTextPos) -1;
@@ -892,5 +892,5 @@ QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView
void OVersatileView::setItemTextBackground( const QBrush &b ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -900,5 +900,5 @@ QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView
QBrush OVersatileView::itemTextBackground() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return QBrush();
@@ -908,5 +908,5 @@ QBrush OVersatileView::itemTextBackground() const // QIconView
void OVersatileView::setArrangement( QIconView::Arrangement am ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -916,5 +916,5 @@ QBrush OVersatileView::itemTextBackground() const // QIconView
QIconView::Arrangement OVersatileView::arrangement() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return (QIconView::Arrangement) -1;
@@ -924,5 +924,5 @@ QIconView::Arrangement OVersatileView::arrangement() const // QIconView
void OVersatileView::setResizeMode( QIconView::ResizeMode am ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -932,5 +932,5 @@ QIconView::Arrangement OVersatileView::arrangement() const // QIconView
QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return (QIconView::ResizeMode) -1;
@@ -940,5 +940,5 @@ QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView
void OVersatileView::setMaxItemWidth( int w ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -948,5 +948,5 @@ QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView
int OVersatileView::maxItemWidth() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return -1;
@@ -956,5 +956,5 @@ int OVersatileView::maxItemWidth() const // QIconView
void OVersatileView::setMaxItemTextLength( int w ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -964,5 +964,5 @@ int OVersatileView::maxItemWidth() const // QIconView
int OVersatileView::maxItemTextLength() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return -1;
@@ -972,5 +972,5 @@ int OVersatileView::maxItemTextLength() const // QIconView
void OVersatileView::setAutoArrange( bool b ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -980,5 +980,5 @@ int OVersatileView::maxItemTextLength() const // QIconView
bool OVersatileView::autoArrange() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return false;
@@ -988,5 +988,5 @@ bool OVersatileView::autoArrange() const // QIconView
void OVersatileView::setShowToolTips( bool b ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -996,5 +996,5 @@ bool OVersatileView::autoArrange() const // QIconView
bool OVersatileView::showToolTips() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return false;
@@ -1005,5 +1005,5 @@ bool OVersatileView::showToolTips() const // QIconView
bool OVersatileView::sorting() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return false;
@@ -1013,5 +1013,5 @@ bool OVersatileView::sorting() const // QIconView
bool OVersatileView::sortDirection() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return false;
@@ -1022,5 +1022,5 @@ bool OVersatileView::sortDirection() const // QIconView
void OVersatileView::setItemsMovable( bool b ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -1030,5 +1030,5 @@ bool OVersatileView::sortDirection() const // QIconView
bool OVersatileView::itemsMovable() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return false;
@@ -1038,5 +1038,5 @@ bool OVersatileView::itemsMovable() const // QIconView
void OVersatileView::setWordWrapIconText( bool b ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -1046,5 +1046,5 @@ void OVersatileView::setWordWrapIconText( bool b ) // QIconView
bool OVersatileView::wordWrapIconText() const // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return false;
@@ -1055,5 +1055,5 @@ bool OVersatileView::wordWrapIconText() const // QIconView
void OVersatileView::arrangeItemsInGrid( const QSize &grid, bool update ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -1063,5 +1063,5 @@ void OVersatileView::arrangeItemsInGrid( const QSize &grid, bool update ) // QI
void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
@@ -1071,5 +1071,5 @@ void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView
void OVersatileView::updateContents() // QIconView
{
- if ( not isValidViewMode( Icons ) )
+ if ( !isValidViewMode( Icons ) )
{
return;
diff --git a/libopie2/opieui/oversatileviewitem.cpp b/libopie2/opieui/oversatileviewitem.cpp
index 379ce24..66de8eb 100644
--- a/libopie2/opieui/oversatileviewitem.cpp
+++ b/libopie2/opieui/oversatileviewitem.cpp
@@ -97,5 +97,5 @@ OVersatileView* OVersatileViewItem::versatileView() const
void OVersatileViewItem::init()
{
- if ( not firstChild() )
+ if ( !firstChild() )
{
// I'm a sweet yellow and browne autumn leaf