Diffstat (limited to 'inputmethods/handwriting/qimpeninput.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpeninput.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp index 6a21931..3f7a347 100644 --- a/inputmethods/handwriting/qimpeninput.cpp +++ b/inputmethods/handwriting/qimpeninput.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
@@ -134,8 +134,8 @@ static char * help_xpm[] = { | |||
134 | 134 | ||
135 | Pen input widget. | 135 | Pen input widget. |
136 | */ | 136 | */ |
137 | QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags flags ) | 137 | QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags f ) |
138 | : QFrame( parent, name, flags ), helpDlg(0), profile(0) | 138 | : QFrame( parent, name, f ), helpDlg(0), profile(0) |
139 | { | 139 | { |
140 | setFrameStyle( Box | Plain ); | 140 | setFrameStyle( Box | Plain ); |
141 | 141 | ||
@@ -238,7 +238,7 @@ void QIMPenInput::loadProfiles() | |||
238 | profile = 0; | 238 | profile = 0; |
239 | delete shortcutCharSet; | 239 | delete shortcutCharSet; |
240 | shortcutCharSet = new QIMPenCharSet(); | 240 | shortcutCharSet = new QIMPenCharSet(); |
241 | shortcutCharSet->setTitle( "Shortcut" ); | 241 | shortcutCharSet->setTitle( tr("Shortcut") ); |
242 | QString path = QPEApplication::qpeDir() + "etc/qimpen"; | 242 | QString path = QPEApplication::qpeDir() + "etc/qimpen"; |
243 | QDir dir( path, "*.conf" ); | 243 | QDir dir( path, "*.conf" ); |
244 | QStringList list = dir.entryList(); | 244 | QStringList list = dir.entryList(); |
@@ -254,7 +254,6 @@ void QIMPenInput::loadProfiles() | |||
254 | } | 254 | } |
255 | } | 255 | } |
256 | 256 | ||
257 | |||
258 | Config config( "handwriting" ); | 257 | Config config( "handwriting" ); |
259 | config.setGroup( "Settings" ); | 258 | config.setGroup( "Settings" ); |
260 | QString prof = config.readEntry( "Profile", "Default" ); | 259 | QString prof = config.readEntry( "Profile", "Default" ); |
@@ -271,10 +270,8 @@ void QIMPenInput::selectProfile( const QString &name ) | |||
271 | } | 270 | } |
272 | } | 271 | } |
273 | 272 | ||
274 | if ( !it.current() ) { | 273 | if ( !it.current() ) |
275 | qWarning("No profile selected!\n"); | 274 | return; |
276 | return; | ||
277 | } | ||
278 | 275 | ||
279 | pw->clearCharSets(); | 276 | pw->clearCharSets(); |
280 | baseSets.clear(); | 277 | baseSets.clear(); |