deprecated--

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=536541

konsole/schema.cpp

@@ -391,7 +391,8 @@ bool ColorSchema::rereadSchemaFile()
         if (!(0 <= fi && fi <  TABLE_COLORS)) continue;
         if (!(0 <= tr && tr <= 1           )) continue;
         if (!(0 <= bo && bo <= 1           )) continue;
-        m_table[fi].color       = kapp->palette().active().text();
+        kapp->palette().setCurrentColorGroup( QPalette::Active );
+        m_table[fi].color       = kapp->palette().text().color();
         m_table[fi].transparent = tr;
         m_table[fi].bold        = bo;
       }
@@ -402,7 +403,7 @@ bool ColorSchema::rereadSchemaFile()
         if (!(0 <= fi && fi <  TABLE_COLORS)) continue;
         if (!(0 <= tr && tr <= 1           )) continue;
         if (!(0 <= bo && bo <= 1           )) continue;
-        m_table[fi].color       = kapp->palette().active().base();
+        m_table[fi].color       = kapp->palette().base().color();
         m_table[fi].transparent = tr;
         m_table[fi].bold        = bo;
       }

konsole/session.cpp

@@ -138,7 +138,7 @@ void TESession::run()
   exec = KShell::tildeExpand(exec);
   QString pexec = KGlobal::dirs()->findExe(exec);
   if ( pexec.isEmpty() ) {
-    kdError()<<"can not execute "<<exec<<endl;
+    kError()<<"can not execute "<<exec<<endl;
     QTimer::singleShot(1, this, SLOT(done()));
     return;
   }
@@ -664,9 +664,8 @@ void TESession::zmodemStatus(KProcess *, char *data, int len)
 
 void TESession::zmodemRcvBlock(const char *data, int len)
 {
-  QByteArray ba;
-  ba.duplicate(data, len);
-  zmodemProc->writeStdin(ba);
+  QByteArray ba( data, len );
+  zmodemProc->writeStdin( ba );
 //  qWarning("--> %d bytes", len);
 }