the easy cases of porting

svn path=/trunk/KDE/kdebase/konsole/; revision=466870

konsole/TEWidget.cpp

@@ -86,7 +86,7 @@
 #include <knotifyclient.h>
 #include <kglobalsettings.h>
 #include <kshortcut.h>
-#include <kurldrag.h>
+#include <k3urldrag.h>
 #include <kio/netaccess.h>
 #include <qlabel.h>
 #include <qtimer.h>
@@ -278,7 +278,7 @@ void TEWidget::fontChange(const QFont &)
       break;
   }
   }
-  
+
   if (font_w>200) // don't trust unrealistic value, fallback to QFontMetrics::maxWidth()
     font_w=fm.maxWidth();
   if (font_w<1)
@@ -411,8 +411,8 @@ TEWidget::TEWidget(QWidget *parent, const char *name)
   setFocusPolicy( Qt::WheelFocus );
 
   // im
-  setInputMethodEnabled(true);  
-  
+  setInputMethodEnabled(true);
+
   if (!argb_visual)
   {
     // Looks better at startup with KRootPixmap based pseudo-transparancy
@@ -440,7 +440,7 @@ TEWidget::~TEWidget()
  It represents the 250x - 257x glyphs. If it's zero, we can't use it.
  if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered
  0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit.
-  
+
  Then, the pixels basically have the following interpretation:
  _|||_
  -...-
@@ -452,32 +452,32 @@ where _ = none
       | = vertical line.
       - = horizontal line.
  */
- 
+
 
 enum LineEncode
 {
     TopL  = (1<<1),
     TopC  = (1<<2),
     TopR  = (1<<3),
-    
+
     LeftT = (1<<5),
     Int11 = (1<<6),
     Int12 = (1<<7),
     Int13 = (1<<8),
     RightT = (1<<9),
-    
+
     LeftC = (1<<10),
     Int21 = (1<<11),
     Int22 = (1<<12),
     Int23 = (1<<13),
     RightC = (1<<14),
-    
+
     LeftB = (1<<15),
     Int31 = (1<<16),
     Int32 = (1<<17),
     Int33 = (1<<18),
     RightB = (1<<19),
-    
+
     BotL  = (1<<21),
     BotC  = (1<<22),
     BotR  = (1<<23)
@@ -494,7 +494,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
     int ey = y + h - 1;
 
     Q_UINT32 toDraw = LineChars[code];
-    
+
     //Top lines:
     if (toDraw & TopL)
         paint.drawLine(cx-1, y, cx-1, cy-2);
@@ -526,7 +526,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
         paint.drawLine(cx+2, cy, ex, cy);
     if (toDraw & RightB)
         paint.drawLine(cx+2, cy+1, ex, cy+1);
-    
+
     //Intersection points.
     if (toDraw & Int11)
         paint.drawPoint(cx-1, cy-1);
@@ -534,7 +534,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
         paint.drawPoint(cx, cy-1);
     if (toDraw & Int13)
         paint.drawPoint(cx+1, cy-1);
-    
+
     if (toDraw & Int21)
         paint.drawPoint(cx-1, cy);
     if (toDraw & Int22)
@@ -571,7 +571,7 @@ void TEWidget::drawTextFixed(QPainter &paint, int x, int y,
       w = font_w*2;
       nc+=2;
     }
-    
+
     //Check for line-drawing char
     if (isLineChar(drawstr[0].unicode()))
     {
@@ -583,7 +583,7 @@ void TEWidget::drawTextFixed(QPainter &paint, int x, int y,
             continue;
         }
     }
-    
+
     paint.drawText(x,y, w, font_h, Qt::AlignHCenter | Qt::DontClip, drawstr, -1);
     x += w;
   }
@@ -627,7 +627,7 @@ void TEWidget::drawAttrStr(QPainter &paint, const QRect& rect,
           Q_UINT8 dalpha = 255 - salpha;
 
           int a, r, g, b;
-          a = QMIN( (qAlpha (col) * salpha) / 255 + (qAlpha (blend_color) * dalpha) / 255, 255 ); 
+          a = QMIN( (qAlpha (col) * salpha) / 255 + (qAlpha (blend_color) * dalpha) / 255, 255 );
           r = QMIN( (qRed   (col) * salpha) / 255 + (qRed   (blend_color) * dalpha) / 255, 255 );
           g = QMIN( (qGreen (col) * salpha) / 255 + (qGreen (blend_color) * dalpha) / 255, 255 );
           b = QMIN( (qBlue  (col) * salpha) / 255 + (qBlue  (blend_color) * dalpha) / 255, 255 );
@@ -657,7 +657,7 @@ void TEWidget::drawAttrStr(QPainter &paint, const QRect& rect,
       int w = font_w * (m_imSelEnd - m_imSelStart);
       int h = font_h;
 
-      QRect tmpRect = QRect( x, y, w, h ); 
+      QRect tmpRect = QRect( x, y, w, h );
       if ( str != m_imPreeditText ) {  // ugly hack
         tmpRect.setLeft( tmpRect.left() + font_w );
         tmpRect.setWidth( tmpRect.width() + font_w );
@@ -727,7 +727,7 @@ void TEWidget::drawAttrStr(QPainter &paint, const QRect& rect,
 #ifdef __GNUC__
    #warning "BiDi stuff killed, it should force TRL when !bidiEnabled"
 #endif
- 
+
       if ( shadow ) {
         paint.setPen( Qt::black );
 
@@ -894,7 +894,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
           if ( ( m_imSelStart < m_imSelEnd ) )
             m_isIMSel = true;
 	}
-        
+
         bool save_fixed_font = fixed_font;
         if (lineDraw)
            fixed_font = false;
@@ -918,7 +918,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
     memcpy((void*)lcl,(const void*)ext,cols*sizeof(ca));
   }
   repaint(dirtyRegion);
-  
+
   if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms
   if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; }
   free(dirtyMask);
@@ -1936,7 +1936,7 @@ void TEWidget::imEndEvent( QIMEvent *e )
                              contentsRect().width(), contentsRect().height() );
   m_imStart = 0;
   m_imPreeditLength = 0;
- 
+
   m_isIMEdit = m_isIMSel = false;
   repaint( repaintRect, true );
 }
@@ -2136,7 +2136,7 @@ void TEWidget::styleChange(QStyle &)
 void TEWidget::dragEnterEvent(QDragEnterEvent* e)
 {
   e->accept(Q3TextDrag::canDecode(e) ||
-      KURLDrag::canDecode(e));
+      K3URLDrag::canDecode(e));
 }
 
 enum dropPopupOptions { paste, cd, cp, ln, mv };
@@ -2145,7 +2145,7 @@ void TEWidget::dropEvent(QDropEvent* event)
 {
    if (m_drop==0)
    {
-      m_drop = new KPopupMenu(this);
+      m_drop = new KMenu(this);
       m_drop->insertItem( i18n("Paste"), paste );
       m_drop->insertSeparator();
       m_drop->insertItem( "cd", cd );

konsole/TEWidget.h

@@ -34,7 +34,7 @@
 //Should have been added by qt3to4:
 #include <Q3TextDrag>
 
-#include <kpopupmenu.h>
+#include <kmenu.h>
 
 #include "TECommon.h"
 
@@ -277,7 +277,7 @@ private:
     QTimer* blinkT;  // active when hasBlinker
     QTimer* blinkCursorT;  // active when hasBlinkingCursor
 
-    KPopupMenu* m_drop;
+    KMenu* m_drop;
     QString dropText;
     int m_dnd_file_count;
 

konsole/konsole.cpp

@@ -116,12 +116,12 @@ Time to start a requirement list.
 #include <kglobalsettings.h>
 #include <knotifydialog.h>
 #include <kprinter.h>
-#include <kaccelmanager.h>
+#include <kacceleratormanager.h>
 
 #include <kaction.h>
 #include <kshell.h>
 #include <qlabel.h>
-#include <kpopupmenu.h>
+#include <kmenu.h>
 #include <klocale.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -144,6 +144,7 @@ Time to start a requirement list.
 #include "konsole.h"
 #include <netwm.h>
 #include <QMenu>
+#include <kauthorized.h>
 #include "printsettings.h"
 
 #define KONSOLEDEBUG    kdDebug(1211)
@@ -486,9 +487,9 @@ void Konsole::makeGUI()
    KActionCollection* actions = actionCollection();
 
    // Send Signal Menu -------------------------------------------------------------
-   if (kapp->authorizeKAction("send_signal"))
+   if (KAuthorized::authorizeKAction("send_signal"))
    {
-      m_signals = new KPopupMenu(this);
+      m_signals = new KMenu(this);
       m_signals->insertItem( i18n( "&Suspend Task" )   + " (STOP)", SIGSTOP);
       m_signals->insertItem( i18n( "&Continue Task" )  + " (CONT)", SIGCONT);
       m_signals->insertItem( i18n( "&Hangup" )         + " (HUP)", SIGHUP);
@@ -562,14 +563,14 @@ void Konsole::makeGUI()
       connect(m_bookmarksSession, SIGNAL(aboutToShow()), SLOT(bookmarks_menu_check()));
 
    // Schema Options Menu -----------------------------------------------------
-   m_schema = new KPopupMenu(this);
+   m_schema = new KMenu(this);
    m_schema->setCheckable(true);
    KAcceleratorManager::manage( m_schema );
    connect(m_schema, SIGNAL(activated(int)), SLOT(schema_menu_activated(int)));
    connect(m_schema, SIGNAL(aboutToShow()), SLOT(schema_menu_check()));
 
    // Keyboard Options Menu ---------------------------------------------------
-   m_keytab = new KPopupMenu(this);
+   m_keytab = new KMenu(this);
    m_keytab->setCheckable(true);
    KAcceleratorManager::manage( m_keytab );
    connect(m_keytab, SIGNAL(activated(int)), SLOT(keytab_menu_activated(int)));
@@ -616,26 +617,26 @@ void Konsole::makeGUI()
       selectBell->plug(m_options);
 
       checkBitmapFonts();
-      KActionMenu* m_fontsizes = new KActionMenu( i18n( "Font" ), 
-                                                  SmallIconSet( "text" ), 
+      KActionMenu* m_fontsizes = new KActionMenu( i18n( "Font" ),
+                                                  SmallIconSet( "text" ),
                                                   actions, 0L );
-      m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ), 
-                           SmallIconSet( "fontsizeup" ), 0, this, 
-                           SLOT( biggerFont() ), actions, 
+      m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ),
+                           SmallIconSet( "fontsizeup" ), 0, this,
+                           SLOT( biggerFont() ), actions,
                            "enlarge_font" ) );
-      m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ), 
-                           SmallIconSet( "fontsizedown" ), 0, this, 
-                           SLOT( smallerFont() ), actions, 
+      m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ),
+                           SmallIconSet( "fontsizedown" ), 0, this,
+                           SLOT( smallerFont() ), actions,
                            "shrink_font" ) );
-      m_fontsizes->insert( new KAction( i18n( "Se&lect..." ), 
-                           SmallIconSet( "font" ), 0, this, 
-                           SLOT( slotSelectFont() ), actions, 
+      m_fontsizes->insert( new KAction( i18n( "Se&lect..." ),
+                           SmallIconSet( "font" ), 0, this,
+                           SLOT( slotSelectFont() ), actions,
                            "select_font" ) );
       if ( b_installBitmapFonts )
       {
-         m_fontsizes->insert( new KAction( i18n( "&Install Bitmap..." ), 
-                              SmallIconSet( "font" ), 0, this, 
-                              SLOT( slotInstallBitmapFonts() ), actions, 
+         m_fontsizes->insert( new KAction( i18n( "&Install Bitmap..." ),
+                              SmallIconSet( "font" ), 0, this,
+                              SLOT( slotInstallBitmapFonts() ), actions,
                               "install_fonts" ) );
       }
       m_fontsizes->plug(m_options);
@@ -648,11 +649,11 @@ void Konsole::makeGUI()
       selectSetEncoding->setCurrentItem (0);
       selectSetEncoding->plug(m_options);
 
-      if (kapp->authorizeKAction("keyboard"))
+      if (KAuthorized::authorizeKAction("keyboard"))
          m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
 
       // Schema
-      if (kapp->authorizeKAction("schema"))
+      if (KAuthorized::authorizeKAction("schema"))
          m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
 
       // Select size
@@ -791,7 +792,7 @@ void Konsole::makeGUI()
 
 
    // Fill tab context menu
-   m_tabPopupMenu = new KPopupMenu( this );
+   m_tabPopupMenu = new KMenu( this );
    KAcceleratorManager::manage( m_tabPopupMenu );
 
    m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, SLOT(slotTabDetachSession()), this );
@@ -801,12 +802,12 @@ void Konsole::makeGUI()
                          SLOT(slotTabRenameSession()) );
    m_tabPopupMenu->insertSeparator();
 
-  m_tabMonitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ), 
+  m_tabMonitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ),
       SmallIconSet("konsole"), 0, this, SLOT( slotTabToggleMonitor() ), this );
   m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ), SmallIconSet( "activity" ) ) );
    m_tabMonitorActivity->plug(m_tabPopupMenu);
 
-  m_tabMonitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ), 
+  m_tabMonitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ),
       SmallIconSet("konsole"), 0, this, SLOT( slotTabToggleMonitor() ), this );
   m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ), SmallIconSet( "silence" ) ) );
    m_tabMonitorSilence->plug(m_tabPopupMenu);
@@ -819,7 +820,7 @@ void Konsole::makeGUI()
    m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, SLOT(slotTabSelectColor()) );
 
    m_tabPopupMenu->insertSeparator();
-   m_tabPopupTabsMenu = new KPopupMenu( m_tabPopupMenu );
+   m_tabPopupTabsMenu = new KMenu( m_tabPopupMenu );
    m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu );
    connect( m_tabPopupTabsMenu, SIGNAL( activated ( int ) ),
             SLOT( activateSession( int ) ) );
@@ -830,7 +831,7 @@ void Konsole::makeGUI()
 
    if (m_options) {
       // Fill tab bar context menu
-      m_tabbarPopupMenu = new KPopupMenu( this );
+      m_tabbarPopupMenu = new KMenu( this );
       KAcceleratorManager::manage( m_tabbarPopupMenu );
       selectTabbar->plug(m_tabbarPopupMenu);
 
@@ -903,7 +904,7 @@ void Konsole::makeTabWidget()
   connect( tabwidget, SIGNAL(contextMenu(const QPoint &)),
            SLOT(slotTabbarContextMenu(const QPoint &)));
 
-  if (kapp->authorize("shell_access")) {
+  if (KAuthorized::authorizeKAction("shell_access")) {
     connect(tabwidget, SIGNAL(mouseDoubleClick()), SLOT(newSession()));
 
     m_newSessionButton = new QToolButton( tabwidget );
@@ -959,19 +960,19 @@ bool Konsole::eventFilter( QObject *o, QEvent *ev )
 
 void Konsole::makeBasicGUI()
 {
-  if (kapp->authorize("shell_access")) {
-    m_tabbarSessionsCommands = new KPopupMenu( this );
+  if (KAuthorized::authorizeKAction("shell_access")) {
+    m_tabbarSessionsCommands = new KMenu( this );
     KAcceleratorManager::manage( m_tabbarSessionsCommands );
     connect(m_tabbarSessionsCommands, SIGNAL(activated(int)), SLOT(newSessionTabbar(int)));
   }
 
-  m_session = new KPopupMenu(this);
+  m_session = new KMenu(this);
   KAcceleratorManager::manage( m_session );
-  m_edit = new KPopupMenu(this);
+  m_edit = new KMenu(this);
   KAcceleratorManager::manage( m_edit );
-  m_view = new KPopupMenu(this);
+  m_view = new KMenu(this);
   KAcceleratorManager::manage( m_view );
-  if (kapp->authorizeKAction("bookmarks"))
+  if (KAuthorized::authorizeKAction("bookmarks"))
   {
     bookmarkHandler = new KonsoleBookmarkHandler( this, true );
     m_bookmarks = bookmarkHandler->menu();
@@ -979,20 +980,20 @@ void Konsole::makeBasicGUI()
     bookmarks_menu_check();
   }
 
-  if (kapp->authorizeKAction("settings")) {
-     m_options = new KPopupMenu(this);
+  if (KAuthorized::authorizeKAction("settings")) {
+     m_options = new KMenu(this);
      KAcceleratorManager::manage( m_options );
   }
 
-  if (kapp->authorizeKAction("help"))
+  if (KAuthorized::authorizeKAction("help"))
      m_help = helpMenu(0, false);
 
-  if (kapp->authorizeKAction("konsole_rmb")) {
-     m_rightButton = new KPopupMenu(this);
+  if (KAuthorized::authorizeKAction("konsole_rmb")) {
+     m_rightButton = new KMenu(this);
      KAcceleratorManager::manage( m_rightButton );
   }
 
-  if (kapp->authorizeKAction("bookmarks"))
+  if (KAuthorized::authorizeKAction("bookmarks"))
   {
     // Bookmarks that open new sessions.
     bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false );
@@ -1073,18 +1074,18 @@ void Konsole::makeBasicGUI()
   m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, this,
                                 SLOT(slotRenameSession()), m_shortcuts, "rename_session");
 
-  if (kapp->authorizeKAction("zmodem_upload"))
-    m_zmodemUpload = new KAction( i18n( "&ZModem Upload..." ), 
+  if (KAuthorized::authorizeKAction("zmodem_upload"))
+    m_zmodemUpload = new KAction( i18n( "&ZModem Upload..." ),
                                   Qt::CTRL+Qt::ALT+Qt::Key_U, this,
-                                  SLOT( slotZModemUpload() ), 
+                                  SLOT( slotZModemUpload() ),
                                   m_shortcuts, "zmodem_upload" );
 
-  monitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ), 
+  monitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ),
       SmallIconSet("konsole"), 0, this,
       SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
   monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ), SmallIconSet( "activity" ) ) );
 
-  monitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ), 
+  monitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ),
       SmallIconSet("konsole"), 0, this,
       SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
   monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ), SmallIconSet( "silence" ) ) );
@@ -1149,7 +1150,7 @@ void Konsole::makeBasicGUI()
   }
   m_shortcuts->readShortcutSettings();
 
-  m_sessionList = new KPopupMenu(this);
+  m_sessionList = new KMenu(this);
   KAcceleratorManager::manage( m_sessionList );
   connect(m_sessionList, SIGNAL(activated(int)), SLOT(activateSession(int)));
 }
@@ -1278,7 +1279,7 @@ void Konsole::configureRequest(TEWidget* _te, int state, int x, int y)
 {
    if (!m_menuCreated)
       makeGUI();
-  KPopupMenu *menu = (state & Qt::ControlModifier) ? m_session : m_rightButton;
+  KMenu *menu = (state & Qt::ControlModifier) ? m_session : m_rightButton;
   if (menu)
      menu->popup(_te->mapToGlobal(QPoint(x,y)));
 }
@@ -1762,7 +1763,7 @@ void Konsole::checkBitmapFonts()
 
 // In KDE 3.5, Konsole only allows the user to pick a font via
 // KFontDialog.  This causes problems with the bdf/pcf files
-// distributed with Konsole (console8x16 and 9x15). 
+// distributed with Konsole (console8x16 and 9x15).
 void Konsole::slotInstallBitmapFonts()
 {
     if ( !b_installBitmapFonts )
@@ -1786,19 +1787,19 @@ void Konsole::slotInstallBitmapFonts()
 
     if ( !sl_installFonts.isEmpty() )
     {
-        if ( KMessageBox::questionYesNoList( this, 
-            i18n( "If you want to use the bitmap fonts distributed with Konsole, they must be installed.  After installation, you must restart Konsole to use them.  Do you want to install the fonts listed below into fonts:/Personal?" ), 
+        if ( KMessageBox::questionYesNoList( this,
+            i18n( "If you want to use the bitmap fonts distributed with Konsole, they must be installed.  After installation, you must restart Konsole to use them.  Do you want to install the fonts listed below into fonts:/Personal?" ),
             sl_installFonts,
-            i18n( "Install Bitmap Fonts?" ), 
-            KGuiItem( i18n("&Install" ) ), 
+            i18n( "Install Bitmap Fonts?" ),
+            KGuiItem( i18n("&Install" ) ),
             i18n("Do Not Install") ) == KMessageBox::Yes )
         {
-            for ( QStringList::iterator it = sl_installFonts.begin(); 
+            for ( QStringList::iterator it = sl_installFonts.begin();
                   it != sl_installFonts.end(); ++it )
             {
                 QString sf = "fonts/" + *it;
-                if ( KIO::NetAccess::copy( locate( "appdata", sf ), 
-                                            "fonts:/Personal/", 0 ) ) 
+                if ( KIO::NetAccess::copy( locate( "appdata", sf ),
+                                            "fonts:/Personal/", 0 ) )
                 {
                     b_installBitmapFonts = false;
                     // TODO: Remove the Install from the Fonts sub-menu.
@@ -2457,7 +2458,7 @@ void Konsole::listSessions()
 {
   int counter=0;
   m_sessionList->clear();
-  m_sessionList->insertTitle(i18n("Session List"));
+  m_sessionList->addTitle(i18n("Session List"));
   m_sessionList->setKeyboardShortcutsEnabled(true);
   for (TESession *ses = sessions.first(); ses; ses = sessions.next()) {
     QString title=ses->Title();
@@ -2604,7 +2605,7 @@ void Konsole::setSessionEncoding( const QString &encoding, TESession *session )
     QString t_enc = encoding + " ";
     int i = 0;
 
-    for( QStringList::ConstIterator it = items.begin(); it != items.end(); 
+    for( QStringList::ConstIterator it = items.begin(); it != items.end();
          ++it, ++i)
     {
         if ( (*it).find( t_enc ) != -1 )
@@ -2888,7 +2889,7 @@ QString Konsole::newSession(KSimpleConfig *co, QString program, const Q3StrList
            this, SLOT(slotGetSessionSchema(TESession*, QString &)));
   connect( s, SIGNAL(setSessionSchema(TESession*, const QString &)),
            this, SLOT(slotSetSessionSchema(TESession*, const QString &)));
-  connect( s, SIGNAL(changeTabTextColor(TESession*, int)), 
+  connect( s, SIGNAL(changeTabTextColor(TESession*, int)),
            this,SLOT(changeTabTextColor(TESession*, int)) );
 
   s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession
@@ -3249,7 +3250,7 @@ void Konsole::buildSessionMenus()
 
    createSessionMenus();
 
-   if (kapp->authorizeKAction("file_print"))
+   if (KAuthorized::authorizeKAction("file_print"))
    {
       m_session->insertSeparator();
       m_print->plug(m_session);
@@ -3262,7 +3263,7 @@ void Konsole::buildSessionMenus()
    m_quit->plug(m_session);
 }
 
-static void insertItemSorted(KPopupMenu *menu, const QIcon &iconSet, const QString &txt, int id)
+static void insertItemSorted(KMenu *menu, const QIcon &iconSet, const QString &txt, int id)
 {
   const int defaultId = SESSION_NEW_SHELL_ID; // The id of the 'new' item.
   int index = menu->indexOf(defaultId);
@@ -3350,7 +3351,7 @@ void Konsole::loadSessionCommands()
   cmd_serial = 99;
   cmd_first_screen = -1;
 
-  if (!kapp->authorize("shell_access"))
+  if (!KAuthorized::authorizeKAction("shell_access"))
      return;
 
   addSessionCommand(QString::null);
@@ -3431,7 +3432,7 @@ void Konsole::addScreenSession(const QString &path, const QString &socket)
 
 void Konsole::loadScreenSessions()
 {
-  if (!kapp->authorize("shell_access"))
+  if (!KAuthorized::authorizeKAction("shell_access"))
      return;
   QByteArray screenDir = getenv("SCREENDIR");
   if (screenDir.isEmpty())
@@ -4029,7 +4030,7 @@ void Konsole::slotZModemUpload()
 
 void Konsole::slotZModemDetected(TESession *session)
 {
-  if (!kapp->authorize("zmodem_download")) return;
+  if (!KAuthorized::authorizeKAction("zmodem_download")) return;
 
   if(se != session)
     activateSession(session);

konsole/konsole.h

@@ -53,7 +53,7 @@ class KRootPixmap;
 class QLabel;
 class QCheckBox;
 class KonsoleFind;
-class KPopupMenu;
+class KMenu;
 class KAction;
 class KToggleAction;
 class KSelectAction;
@@ -308,22 +308,22 @@ private:
   KMenuBar*   menubar;
   KStatusBar* statusbar;
 
-  KPopupMenu* m_session;
-  KPopupMenu* m_edit;
-  KPopupMenu* m_view;
-  KPopupMenu* m_bookmarks;
-  KPopupMenu* m_bookmarksSession;
-  KPopupMenu* m_options;
-  KPopupMenu* m_schema;
-  KPopupMenu* m_keytab;
-  KPopupMenu* m_tabbarSessionsCommands;
-  KPopupMenu* m_signals;
-  KPopupMenu* m_help;
-  KPopupMenu* m_rightButton;
-  KPopupMenu* m_sessionList;
-  KPopupMenu* m_tabPopupMenu;
-  KPopupMenu* m_tabPopupTabsMenu;
-  KPopupMenu* m_tabbarPopupMenu;
+  KMenu* m_session;
+  KMenu* m_edit;
+  KMenu* m_view;
+  KMenu* m_bookmarks;
+  KMenu* m_bookmarksSession;
+  KMenu* m_options;
+  KMenu* m_schema;
+  KMenu* m_keytab;
+  KMenu* m_tabbarSessionsCommands;
+  KMenu* m_signals;
+  KMenu* m_help;
+  KMenu* m_rightButton;
+  KMenu* m_sessionList;
+  KMenu* m_tabPopupMenu;
+  KMenu* m_tabPopupTabsMenu;
+  KMenu* m_tabbarPopupMenu;
 
   KAction *m_zmodemUpload;
   KToggleAction *monitorActivity, *m_tabMonitorActivity;

konsole/konsole_part.cpp

@@ -48,10 +48,11 @@
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
-#include <kpopupmenu.h>
+#include <kmenu.h>
 #include <krootpixmap.h>
 #include <kconfig.h>
 #include <kaction.h>
+#include <kauthorized.h>
 
 // We can't use the ARGB32 visual when embedded in another application
 bool argb_visual = false;
@@ -113,7 +114,7 @@ KInstance *konsoleFactory::instance()
 #define DEFAULT_HISTORY_SIZE 1000
 
 konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject *parent, const char *name, const char *classname)