summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-23 12:20:13 (UTC)
committer mickeyl <mickeyl>2004-04-23 12:20:13 (UTC)
commit33666eb31ae6d35aa527cf7bf22c2c2e0dcd6824 (patch) (side-by-side diff)
treec05204f0ed7f02a522ded2aaf9121e1976612f15
parent85bfee8e542805ff7df67d9786bb291f7d2b34f3 (diff)
downloadopie-33666eb31ae6d35aa527cf7bf22c2c2e0dcd6824.zip
opie-33666eb31ae6d35aa527cf7bf22c2c2e0dcd6824.tar.gz
opie-33666eb31ae6d35aa527cf7bf22c2c2e0dcd6824.tar.bz2
gcc3.4 fixlet
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 6b9fe4d..f918767 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -632,120 +632,120 @@ void Appearance::styleSettingsClicked ( )
if ( item-> setSettings ( accepted ))
m_style_changed = true;
}
delete d;
}
}
void Appearance::decoClicked ( int index )
{
DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index );
if ( m_sample )
{
if ( dli && dli-> interface ( ))
m_sample-> setDecoration ( dli-> interface ( ));
else
m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
m_sample-> repaint ( );
}
m_deco_changed |= ( index != m_original_deco );
}
void Appearance::fontClicked ( const QFont &f )
{
m_font_changed |= ( f != m_sample-> font ( ));
m_sample-> setFont ( f );
}
void Appearance::colorClicked ( int index )
{
ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
if ( item )
m_sample-> setPalette ( item-> palette ( ));
m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
}
void Appearance::editSchemeClicked ( )
{
ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
int cnt = 0;
QString labels [QColorGroup::NColorRoles];
QColor colors [QColorGroup::NColorRoles];
- for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+ for ( int role = 0; role < (int) QColorGroup::NColorRoles; ++role )
{
- QColor col = item-> color ( role );
+ QColor col = item->color( static_cast<QColorGroup::ColorRole>( role ) );
if ( col. isValid ( ))
{
- labels [cnt] = item-> label ( role );
- colors [cnt] = col;
+ labels[cnt] = item->label( static_cast<QColorGroup::ColorRole>( role ) );
+ colors[cnt] = col;
cnt++;
}
}
EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
if ( QPEApplication::execDialog( editdlg ) == QDialog::Accepted )
{
ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
cnt = 0;
- for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ )
+ for ( int role = 0; role < (int) QColorGroup::NColorRoles; ++role )
{
- if ( item-> color ( role ). isValid ( ))
+ if ( item->color( static_cast<QColorGroup::ColorRole>( role ) ).isValid() )
{
- citem-> setColor ( role, colors [cnt] );
+ citem->setColor( static_cast<QColorGroup::ColorRole>( role ), colors[cnt] );
cnt++;
}
}
m_color_list-> setCurrentItem ( 0 );
colorClicked ( 0 );
m_color_changed = true;
}
delete editdlg;
}
void Appearance::saveSchemeClicked()
{
ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
if ( !item )
return;
QDialog *d = new QDialog ( this, 0, true );
d-> setCaption ( tr( "Save Scheme" ));
QLineEdit *ed = new QLineEdit ( d );
( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
ed-> setFocus ( );
if ( d-> exec ( ) == QDialog::Accepted )
{
QString schemename = ed-> text ( );
QString filestr = QPEApplication::qpeDir();
filestr.append( "/etc/colors/" );
filestr.append( schemename );
filestr.append( ".scheme" );
QFile file ( filestr );
if ( !file. exists ( ))
{
QPalette p = item-> palette ( );
Config config ( file.name(), Config::File );
config. setGroup( "Colors" );
item-> save ( config );
config. write ( ); // need to flush the config info first
m_color_list-> insertItem ( new ColorListItem ( schemename, config ));
}
else