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

List:       kde-commits
Subject:    kdebase/kxkb
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2003-10-30 18:58:11
[Download RAW message or body]

CVS commit by ossi: 

- abort() is for internal errors and causes drkonqi to start up -> use
  exit() if xkb was not found. silently failing isn't too user-friendly,
  either, but i simply wasn't able to bring up a message box without a
  crash (KUniqueApplication makes it explode).
- fix signedness warnings


  M +4 -4      kxkb.cpp   1.70


--- kdebase/kxkb/kxkb.cpp  #1.69:1.70
@@ -142,5 +142,5 @@ KXKBApp::KXKBApp(bool allowStyles, bool 
     if( !m_extension->init() ) {
         kdDebug() << "xkb initialization failed, exiting..." << endl;
-        abort();
+        ::exit(1);
     }
 
@@ -373,5 +373,5 @@ void KXKBApp::toggled()
    {
         // get next layout from queue
-        if (m_lastLayout->count() >= m_stickySwitchingDepth)
+        if ((int)m_lastLayout->count() >= m_stickySwitchingDepth)
         {
             while (m_lastLayout->count() > 0)
@@ -391,5 +391,5 @@ void KXKBApp::toggled()
         // shrink queue if m_stickySwitchingDepth has been decremented
         
-        while (m_lastLayout->count() > m_stickySwitchingDepth)
+        while ((int)m_lastLayout->count() > m_stickySwitchingDepth)
         {
             delete m_lastLayout->dequeue();
@@ -453,5 +453,5 @@ void KXKBApp::menuActivated(int id)
         if (m_stickySwitching)
         {
-            if (m_lastLayout->count() >= m_stickySwitchingDepth)
+            if ((int)m_lastLayout->count() >= m_stickySwitchingDepth)
                 delete m_lastLayout->dequeue();
             m_lastLayout->enqueue(new QString(m_layout));


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