9 files changed, 174 insertions, 387 deletions

diff --git a/x11/kdebase3/files/freebsd.keytab b/x11/kdebase3/files/freebsd.keytab
new file mode 100644
index 000000000000..2607089e1dbe
--- /dev/null
+++ b/x11/kdebase3/files/freebsd.keytab
@@ -0,0 +1,134 @@
+# [freebsd.keytab] Konsole Keyboard Table (FreeBSD console keys)
+#
+# $FreeBSD$
+# --------------------------------------------------------------
+
+# NOT TESTED, MAY NEED SOME CLEANUPS
+keyboard "freebsd console"
+
+# --------------------------------------------------------------
+#
+# This configuration table allows to customize the
+# meaning of the keys.
+#
+# The syntax is that each entry has the form : 
+#
+#   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
+#
+# Keynames are those defined in <qnamespace.h> with the
+# "Qt::Key_" removed. (We'd better insert the list here)
+#
+# Mode names are : 
+#
+# - Shift
+# - Alt
+# - Control
+#
+#   The VT100 emulation has two modes that can affect the
+#   sequences emitted by certain keys. These modes are
+#   under control of the client program.
+#   
+# - Newline     : effects Return and Enter key.
+# - Application : effects Up and Down key.
+#
+# - Ansi        : effects Up and Down key (This is for VT52, really).
+#
+# Operations are
+#
+# - scrollUpLine
+# - scrollUpPage
+# - scrollDownLine
+# - scrollDownPage
+#
+# - emitSelection
+#
+# If the key is not found here, the text of the
+# key event as provided by QT is emitted, possibly
+# preceeded by ESC if the Alt key is pressed.
+#
+# --------------------------------------------------------------
+
+key Escape : "\E"
+key Tab    : "\t"
+
+# VT100 can add an extra \n after return.
+# The NewLine mode is set by an escape sequence.
+
+key Return-NewLine : "\r"  
+key Return+NewLine : "\r\n"
+
+# Some desperately try to save the ^H.
+
+key Backspace : "\x08"  # Control H
+key Delete    : "\E[3~"
+
+# These codes are for the VT52 mode of VT100
+# The Ansi mode (i.e. VT100 mode) is set by
+# an escape sequence
+
+key Up   -Shift-Ansi : "\EA"
+key Down -Shift-Ansi : "\EB"
+key Right-Shift-Ansi : "\EC"
+key Left -Shift-Ansi : "\ED"
+
+# VT100 emits a mode bit together
+# with the arrow keys.The AppCuKeys
+# mode is set by an escape sequence.
+
+key Up   -Shift+Ansi+AppCuKeys : "\EOA"
+key Down -Shift+Ansi+AppCuKeys : "\EOB"
+key Right-Shift+Ansi+AppCuKeys : "\EOC"
+key Left -Shift+Ansi+AppCuKeys : "\EOD"
+
+key Up   -Shift+Ansi-AppCuKeys : "\E[A"
+key Down -Shift+Ansi-AppCuKeys : "\E[B"
+key Right-Shift+Ansi-AppCuKeys : "\E[C"
+key Left -Shift+Ansi-AppCuKeys : "\E[D"
+
+# FreeBSD functions keys F1-F5 differ from Xterm
+
+key F1 : "\E[[A" 
+key F2 : "\E[[B" 
+key F3 : "\E[[C" 
+key F4 : "\E[[D" 
+key F5 : "\E[[E" 
+
+key F6     : "\E[17~" 
+key F7     : "\E[18~" 
+key F8     : "\E[19~" 
+key F9     : "\E[20~" 
+key F10    : "\E[21~" 
+key F11    : "\E[23~" 
+key F12    : "\E[24~" 
+
+key Home   : "\E[1~"  
+key End    : "\E[4~"  
+
+key Prior -Shift : "\E[5~"  
+key Next  -Shift : "\E[6~"  
+key Insert-Shift : "\E[2~"  
+
+# Keypad-Enter. See comment on Return above.
+
+key Enter+NewLine : "\r\n"
+key Enter-NewLine : "\r"  
+
+key Space +Control : "\x00"
+
+# some of keys are used by konsole.
+
+key Up    +Shift   : scrollLineUp
+key Prior +Shift   : scrollPageUp
+key Down  +Shift   : scrollLineDown
+key Next  +Shift   : scrollPageDown
+
+key ScrollLock     : scrollLock
+
+#----------------------------------------------------------
+
+# keypad characters as offered by Qt
+# cannot be recognized as such.
+
+#----------------------------------------------------------
+
+# Following other strings as emitted by konsole.
diff --git a/x11/kdebase3/files/kdm.sh b/x11/kdebase3/files/genkdmconf.sh
index 479317482140..479317482140 100644
--- a/x11/kdebase3/files/kdm.sh
+++ b/x11/kdebase3/files/genkdmconf.sh
diff --git a/x11/kdebase3/files/patch-kdm-backend-dm.c b/x11/kdebase3/files/patch-kdm-backend-dm.c
new file mode 100644
index 000000000000..a36cb7d63260
--- /dev/null
+++ b/x11/kdebase3/files/patch-kdm-backend-dm.c
@@ -0,0 +1,40 @@
+Index: dm.c
+===================================================================
+RCS file: /home/kde/kdebase/kdm/backend/dm.c,v
+retrieving revision 1.90.2.3
+diff -u -3 -p -r1.90.2.3 dm.c
+--- kdm/backend/dm.c	13 Aug 2004 19:21:11 -0000	1.90.2.3
++++ kdm/backend/dm.c	23 Aug 2004 16:32:29 -0000
+@@ -1033,7 +1033,7 @@ static void
+ MainLoop (void)
+ {
+     struct display *d;
+-    struct timeval tv;
++    struct timeval *tvp, tv;
+     time_t to;
+     int nready;
+     char buf;
+@@ -1055,12 +1055,17 @@ MainLoop (void)
+ 	    to = serverTimeout;
+ 	if (utmpTimeout < to)
+ 	    to = utmpTimeout;
+-	to -= now;
+-	if (to < 0)
+-	    to = 0;
+-	tv.tv_sec = to;
+-	tv.tv_usec = 0;
+-	nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv);
++	if (to == TO_INF)
++	    tvp = 0;
++	else {
++	    to -= now;
++	    if (to < 0)
++		to = 0;
++	    tv.tv_sec = to;
++	    tv.tv_usec = 0;
++	    tvp = &to;
++	}
++	nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp);
+ 	Debug ("select returns %d\n", nready);
+ 	time (&now);
+ #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM)
diff --git a/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp b/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp
deleted file mode 100644
index 750137b49743..000000000000
--- a/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-===================================================================
-RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v
-retrieving revision 1.82.2.1
-retrieving revision 1.86
-diff -u -p -r1.82.2.1 -r1.86
---- kxkb/kcmlayout.cpp	2004/05/19 12:09:58	1.82.2.1
-+++ kxkb/kcmlayout.cpp	2004/06/28 14:19:03	1.86
-@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi
- }
- 
- LayoutConfig::LayoutConfig(QWidget *parent, const char *name)
--  : KCModule(parent, name), m_rules(0)
-+  : KCModule(parent, name), 
-+    m_rules(NULL)
- {
-   QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint());
- 
-@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare
- #endif
- 
-   //Read rules - we _must_ read _before_ creating xkb-options comboboxes
--  ruleChanged("xfree86");
-+  ruleChanged();
- 
-   makeOptionsTab();
- 
-@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab()
-   connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed()));
-   connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand()));
- 
-+  connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed()));
-+
-   connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed()));
-   connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand()));
- 
-@@ -405,10 +409,10 @@ void LayoutConfig::load()
-   bool use = config->readBoolEntry( "Use", false );
- 
-   // find out which rule applies
--  QString rule = "xfree86"; //config->readEntry("Rule", "xfree86");
-+  //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86");
- 
-   // update other files
--  ruleChanged(rule);
-+  ruleChanged();
- 
-   // find out about the model
-   QString model = config->readEntry("Model", "pc104");
-@@ -499,12 +506,12 @@ void LayoutConfig::load()
-   emit KCModule::changed( false );
- }
- 
--void LayoutConfig::ruleChanged(const QString &rule)
-+void LayoutConfig::ruleChanged()
- {
--  if( rule == m_rule )
--    return;
-+//  if( rule == m_rule )
-+//    return;
- 
--  m_rule = rule;
-+//  m_rule = rule;
- 
-   QString model; //, layout;
-   if (m_rules)
-@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt
-     }
- 
-   delete m_rules;
--  m_rules = new KeyRules(rule);
-+  m_rules = new KeyRules();
- 
-   QStringList tmp;
-   widget->comboModel->clear();
-@@ -672,7 +680,7 @@ void LayoutConfig::save()
- void LayoutConfig::defaults()
- {
-   widget->chkEnable->setChecked(false);
--  ruleChanged("xfree86");
-+  ruleChanged();
- 
-   widget->comboModel->setCurrentText("pc104");
-   //layoutCombo->setCurrentText("us");
diff --git a/x11/kdebase3/files/patch-kxkb_kcmlayout.h b/x11/kdebase3/files/patch-kxkb_kcmlayout.h
deleted file mode 100644
index e2630a0a4398..000000000000
--- a/x11/kdebase3/files/patch-kxkb_kcmlayout.h
+++ /dev/null
@@ -1,25 +0,0 @@
-===================================================================
-RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v
-retrieving revision 1.22
-retrieving revision 1.23
-diff -u -p -r1.22 -r1.23
---- kxkb/kcmlayout.h	2003/10/29 07:30:36	1.22
-+++ kxkb/kcmlayout.h	2004/06/28 14:19:03	1.23
-@@ -54,7 +54,7 @@ protected slots:
-   void variantChanged();
-   void latinChanged();
-   void layoutSelChanged(QListViewItem *);
--  void ruleChanged(const QString &rule);
-+  void ruleChanged();
-   void updateLayoutCommand();
-   void updateOptionsCommand();
-   void add();
-@@ -71,7 +71,7 @@ private:
-   QDict<OptionListItem> m_optionGroups;
-   QDict<char> m_variants;
-   QDict<char> m_includes;
--  QString m_rule;
-+//  QString m_rule;
-   KeyRules *m_rules;
- 
-   QWidget* makeOptionsTab();
diff --git a/x11/kdebase3/files/patch-kxkb_kxkb.cpp b/x11/kdebase3/files/patch-kxkb_kxkb.cpp
deleted file mode 100644
index bc011c166585..000000000000
--- a/x11/kdebase3/files/patch-kxkb_kxkb.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-===================================================================
-RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v
-retrieving revision 1.70
-retrieving revision 1.72
-diff -u -p -r1.70 -r1.72
---- kxkb/kxkb.cpp	2003/10/30 18:58:11	1.70
-+++ kxkb/kxkb.cpp	2004/06/28 14:19:03	1.72
-@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead()
- 	}
-     }
- 
--    QString rule = "xfree86"; //config->readEntry("Rule", "xfree86");
--    m_rules = new KeyRules( rule );
-+    m_rules = new KeyRules();
-     m_model = config->readEntry("Model", "pc104");
-     m_layout = config->readEntry("Layout", "");
-     m_defaultLayout = m_layout;
- 
-+
-     m_list = config->readListEntry("Additional");
-     if (!m_list.contains(m_layout))
-     {
-
diff --git a/x11/kdebase3/files/patch-kxkb_rules.cpp b/x11/kdebase3/files/patch-kxkb_rules.cpp
deleted file mode 100644
index c76490862b0f..000000000000
--- a/x11/kdebase3/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-===================================================================
-RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v
-retrieving revision 1.37
-retrieving revision 1.38
-diff -u -p -r1.37 -r1.38
---- kxkb/rules.cpp	2003/10/24 06:15:26	1.37
-+++ kxkb/rules.cpp	2004/06/28 14:19:03	1.38
-@@ -16,11 +16,23 @@
- 
- #include "rules.h"
- 
--const QString X11_DIR( "/usr/X11R6/lib/X11/" );
-+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"};
-+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"};
- 
--KeyRules::KeyRules(QString rule):
-+KeyRules::KeyRules():
-     m_layouts(90)
- {
-+  for(int ii=0; ii<2; ii++)
-+    if( QDir(X11DirList[ii]).exists() ) {
-+	X11_DIR = X11DirList[ii];
-+	break;
-+    }
-+
-+  if( X11_DIR.isEmpty() ) {
-+    kdDebug() << "Cannot find X11 directory!" << endl;
-+    return;
-+  }
-+
-   // ugly check for XFree 4.3 or older
-   if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) {
- 	m_xfree43 = true;
-@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule):
- 	m_xfree43 = false;
-   }
- 
--  loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule));
--  loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86"));
-+  QString rulesFile;
-+  for(int ii=0; ii<2; ii++)
-+    if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
-+	rulesFile = X11_DIR + rulesFileList[ii];
-+	break;
-+    }
-+
-+  if( rulesFile.isEmpty() ) {
-+    kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
-+    return;
-+  }
-+
-+  loadRules(rulesFile);
-+  loadOldLayouts(rulesFile);
-   loadGroups(::locate("config", "kxkb_groups"));
- }
- 
-@@ -51,9 +75,7 @@ static struct {
-     { 0, 0 }
- };
- 
--  XkbRF_RulesPtr rules;
--
--  rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true);
-+  XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true);
- 
-   if (rules == NULL) {
-      kdDebug() << "Unable to load rules" << endl;
-@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS
-     return it == m_initialGroups.end() ? 0 : it.data();
- }
- 
--
-+/*
- QStringList KeyRules::rules(QString path)
- {
-   QStringList result;
-@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path
- 
-   return result;
- }
--
-+*/
- 
- /* pretty simple algorithm - reads the layout file and
-     tries to find "xkb_symbols"
diff --git a/x11/kdebase3/files/patch-kxkb_rules.h b/x11/kdebase3/files/patch-kxkb_rules.h
deleted file mode 100644
index 23d2432f51e6..000000000000
--- a/x11/kdebase3/files/patch-kxkb_rules.h
+++ /dev/null
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -p -r1.11 -r1.12
---- kxkb/rules.h	2003/08/24 04:02:38	1.11
-+++ kxkb/rules.h	2004/06/28 14:19:03	1.12
-@@ -10,14 +10,14 @@ class KeyRules
- {
- public:
- 
--  KeyRules(QString rule="xfree86");
-+  KeyRules();
- 
-   const QDict<char> &models() const { return m_models; };
-   const QDict<char> &layouts() const { return m_layouts; };
-   const QDict<char> &options() const { return m_options; };
- 
-   void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true);
--  static QStringList rules(QString path = QString::null);
-+//  static QStringList rules(QString path = QString::null);
- 
-   QStringList getVariants(const QString& layout);
-   unsigned int getGroup(const QString& layout, const char* baseGr);
-@@ -42,6 +42,8 @@ private:
-   QStringList m_oldLayouts;
-   QStringList m_nonLatinLayouts;
-   bool m_xfree43;
-+  
-+  QString X11_DIR;	// pseudo-constant
- };
- 
- 
diff --git a/x11/kdebase3/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kdebase3/files/patch-post-3.2.3-kdebase-htmlframes
deleted file mode 100644
index 87a3a7688f32..000000000000
--- a/x11/kdebase3/files/patch-post-3.2.3-kdebase-htmlframes
+++ /dev/null
@@ -1,138 +0,0 @@
-Index: konqueror/konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1274.2.24
-diff -u -p -r1.1274.2.24 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	7 Jun 2004 23:10:55 -0000	1.1274.2.24
-+++ konqueror/konq_mainwindow.cc	3 Aug 2004 14:54:23 -0000
-@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest(
- {
-   kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
- 
-+  KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
-   QString frameName = args.frameName;
- 
-   if ( !frameName.isEmpty() )
-@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest(
-          frameName.lower() != _parent )
-     {
-       KParts::BrowserHostExtension *hostExtension = 0;
--      KonqView *view = childView( frameName, &hostExtension, 0 );
-+      KonqView *view = childView( callingPart, frameName, &hostExtension, 0 );
-       if ( !view )
-       {
-         KonqMainWindow *mainWindow = 0;
--        view = findChildView( frameName, &mainWindow, &hostExtension, 0 );
-+        view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 );
- 
-         if ( !view || !mainWindow )
-         {
-@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest(
-     }
-   }
- 
--  KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
--  KonqView *view = childView( part );
-+  KonqView *view = childView( callingPart );
-   openURL( view, url, args );
- }
- 
-@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow
-     if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" )
-     {
-         KParts::BrowserHostExtension *hostExtension = 0;
--        if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) )
-+        if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) )
-         {
-             // Found a view. If url isn't empty, we should open it - but this never happens currently
-             // findChildView put the resulting part in 'part', so we can just return now
-@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP
-     return 0L;
- }
- 
--KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
-+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
- {
--  //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
-+  kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
- 
-   MapViews::ConstIterator it = m_mapViews.begin();
-   MapViews::ConstIterator end = m_mapViews.end();
-@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co
-   {
-     KonqView* view = it.data();
-     QString viewName = view->viewName();
--    //kdDebug() << "       - viewName=" << viewName << "   "
--    //          << "frame names:" << view->frameNames().join( "," ) << endl;
-+    kdDebug() << "       - viewName=" << viewName << "   "
-+              << "frame names:" << view->frameNames().join( "," ) << endl;
-     if ( !viewName.isEmpty() && viewName == name )
-     {
--      //kdDebug() << "found existing view by name: " << view << endl;
-+      kdDebug() << "found existing view by name: " << view << endl;
-       if ( hostExtension )
-         *hostExtension = 0;
-       if ( part )
-@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co
-     }
- 
-     // First look for a hostextension containing this frame name
--    // (KonqView looks for it recursively)
--    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+    }
-+    
-+//    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
-     {
-@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co
-       {
-         if ( frameIt.current()->name() == name )
-         {
--          //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
-+          kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
-           if ( hostExtension )
-             *hostExtension = ext;
-           if ( part )
-@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co
- }
- 
- // static
--KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
-+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
- {
-   if ( !s_lstViews )
-     return 0;
-@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView
-   QPtrListIterator<KonqMainWindow> it( *s_lstViews );
-   for (; it.current(); ++it )
-   {
--    KonqView *res = it.current()->childView( name, hostExtension, part );
-+    KonqView *res = it.current()->childView( callingPart, name, hostExtension, part );
-     if ( res )
-     {
-       if ( mainWindow )
-Index: konqueror/konq_mainwindow.h
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v
-retrieving revision 1.423.2.4
-diff -u -p -r1.423.2.4 konq_mainwindow.h
---- konqueror/konq_mainwindow.h	7 Jun 2004 23:10:56 -0000	1.423.2.4
-+++ konqueror/konq_mainwindow.h	3 Aug 2004 14:54:23 -0000
-@@ -145,10 +145,10 @@ public:
-   void insertChildView( KonqView *childView );
-   void removeChildView( KonqView *childView );
-   KonqView *childView( KParts::ReadOnlyPart *view );
--  KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-+  KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
- 
-   // dcop idl bug! it can't handle KonqMainWindow *&mainWindow
--  static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-+  static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
- 
-   // Total number of views
-   int viewCount() const { return m_mapViews.count(); }