Merged in remaining kdebase bugfixes from the Chakra project

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1172677 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 0 deletions

diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index 5b6702412..4ca704a9b 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -61,6 +61,7 @@ class KSelectAction;
 class KRadioAction;
 class KTabWidget;
 class TQToolButton;
+class KURIFilterData;
 
 // Defined in main.C
 const char *konsole_shell(TQStrList &args);
@@ -200,6 +201,9 @@ private slots:
   void loadScreenSessions();
   void updateFullScreen(bool on);
 
+  void slotOpenSelection();
+  void slotOpenURI(int n);
+
   void slotSaveSettings();
   void slotSaveSessionsProfile();
   void slotConfigureNotifications();
@@ -362,6 +366,7 @@ private:
   KAction       *m_print;
   KAction       *m_quit;
   KAction       *m_tabDetachSession;
+  KPopupMenu    *m_openSelection;
 
   KActionCollection *m_shortcuts;
 
@@ -372,6 +377,7 @@ private:
   bool         m_find_first;
   bool         m_find_found;
   TQString      m_find_pattern;
+  TQString  selectedURL;
 
   int cmd_serial;
   int cmd_first_screen;
@@ -435,6 +441,7 @@ private:
   TQString  s_workDir;
 
   TQColor    m_tabColor;
+  KURIFilterData* m_filterData;
 };
 
 class TQSpinBox;