summaryrefslogtreecommitdiff
authorerik <erik>2007-02-05 20:18:36 (UTC)
committer erik <erik>2007-02-05 20:18:36 (UTC)
commitb017b14c0ec6d327e061a1f96209e19fdc59885a (patch) (side-by-side diff)
tree5b4727ced07dd1ef44a736dd4b0d75589f3ba06d
parent73edac572d9ac9cfd18cc1254fc2019563d55f16 (diff)
downloadopie-b017b14c0ec6d327e061a1f96209e19fdc59885a.zip
opie-b017b14c0ec6d327e061a1f96209e19fdc59885a.tar.gz
opie-b017b14c0ec6d327e061a1f96209e19fdc59885a.tar.bz2
BUG: My change to a switch statement made opie-gutenbrowser uncompilable.
FIX: The code there is just strange. I tore out the switch statement and replaced it with a simple if block instead.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/openetext.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index a5d855d..75edacd 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -347,59 +347,57 @@ bool OpenEtext::checkConf()
Config config("Gutenbrowser");
config.setGroup( "Files" );
QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
int i_numofFiles = s_numofFiles.toInt();
for (int i = 1; i <= i_numofFiles; i++) {
QString temp;
temp.setNum(i);
config.setGroup( "Files");
QString ramble = config.readEntry(temp, "" );
if(ramble == file ) {
return true;
}
}
return false;
}
void OpenEtext::remove()
{
title_text = QListBox_1->text( QListBox_1->currentItem() );
title_text=title_text.stripWhiteSpace();
QString msg ="<p>Do you really want to REMOVE\n" + title_text +
"?\nThis will not delete the file.</P>";
- switch( QMessageBox::information( this, tr("Remove Etext"),
- tr(msg),
- tr("&Yes"), tr("&Cancel"), 0 ) )
- {
- case 0: // Yes clicked,
- removeSelection();
- QListBox_1->clear();
- getTitles();
- break;
- case 1:
- default:
+ unsigned short clickVal =
+ QMessageBox::information( this, tr("Remove Etext"),
+ tr(msg),
+ tr("&Yes"), tr("&Cancel"), 0 );
+ if ( clickVal == 0 ) {
+ // The yes button was clicked
+ removeSelection();
+ QListBox_1->clear();
+ getTitles();
}
}
/*!
* This removes selected title entry
*/
void OpenEtext::removeSelection()
{
Config config("Gutenbrowser");
config.setGroup( "Files" );
s_numofFiles = config.readEntry("NumberOfFiles", "0");
int rem=0;
int i_numofFiles = s_numofFiles.toInt();
QString fileNum2;
QString fileNum;
for (int i = 1; i <= i_numofFiles; i++) {
fileNum.setNum(i);
config.setGroup( "Files" );
QString s_filename = config.readEntry(fileNum, "" );
config.setGroup( "Titles" );
QString file_title = config.readEntry( s_filename, "");