[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/ktouch/src
From:       Laurent Montel <montel () kde ! org>
Date:       2005-09-21 9:58:01
Message-ID: 1127296681.004166.9832.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 462532 by mlaurent:

Other fix


 M  +5 -5      ktouch.cpp  
 M  +1 -1      ktouchkeyboard.cpp  


--- trunk/KDE/kdeedu/ktouch/src/ktouch.cpp #462531:462532
@@ -63,7 +63,7 @@
     m_keyboardWidget(NULL),
 	m_trainer(NULL)
 {
-	setFocusPolicy(StrongFocus);
+	setFocusPolicy(Qt::StrongFocus);
 	// Set global KTouchPtr to the main KTouch Object
 	KTouchPtr = this;
 	// General initialization of the program, common for all start modes
@@ -379,7 +379,7 @@
 // ----------------------------------------------------------------------------
 
 void KTouch::changeKeyboard(int num) {
-    if (static_cast<unsigned int>(num)>=m_keyboardFiles.count()) return;
+    if (num>=m_keyboardFiles.count()) return;
     Prefs::setCurrentKeyboardFile( m_keyboardFiles[num] );
 	//kdDebug() << "[KTouch::changeKeyboard]  new keyboard layout = " << \
Prefs::currentKeyboardFile() << endl;  m_keyboardLayoutAction->setCurrentItem(num);
@@ -389,14 +389,14 @@
 // ----------------------------------------------------------------------------
 
 void KTouch::changeColor(int num) {
-    if (static_cast<unsigned int>(num)>=m_colorSchemes.count()) return;
+    if (num>=m_colorSchemes.count()) return;
     Prefs::setColorScheme(num);
     m_keyboardWidget->applyPreferences(this, false);
 }
 // ----------------------------------------------------------------------------
 
 void KTouch::changeLecture(int num) {
-    if (static_cast<unsigned int>(num)>=m_lectureFiles.count()) return;
+    if (num>=m_lectureFiles.count()) return;
     trainingPause();
 	KTouchLecture l;
 	QString fileName = m_lectureFiles[num];
@@ -606,7 +606,7 @@
 	// Setup menu entries for colour schemes
 	m_keyboardColorAction = new KSelectAction(i18n("Keyboards &Color Schemes"), 0, \
this, 0, actionCollection(), "keyboard_schemes");  QStringList schemes_list;
-    for (unsigned int i=0; i<m_colorSchemes.count(); ++i)
+    for (int i=0; i<m_colorSchemes.count(); ++i)
 		schemes_list.append(m_colorSchemes[i].m_name);
     m_keyboardColorAction->setItems(schemes_list);
     m_keyboardColorAction->setCurrentItem(Prefs::colorScheme());  
--- trunk/KDE/kdeedu/ktouch/src/ktouchkeyboard.cpp #462531:462532
@@ -126,7 +126,7 @@
         if (line.isNull())  continue;
 
         // 'line' should now contain a key specification
-        QTextStream lineStream(line, QIODevice::ReadOnly);
+        QTextStream lineStream(&line, QIODevice::ReadOnly);
         QString keyType;
         int keyAscII;
         QString keyText;


[prev in list] [next in list] [prev in thread] [next in thread]