remaining snapshot porting

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

konsole/TEWidget.cpp

@@ -2249,7 +2249,7 @@ void TEWidget::drop_menu_activated(QAction* action)
          {
             KUrl url;
             url.setPath( dropText );
-            dropText = url.directory( true, false ); // remove filename
+            dropText = url.directory( KUrl::ObeyTrailingSlash ); // remove filename
          }
       }
       KRun::shellQuote(dropText);

konsole/konsole.cpp

@@ -78,6 +78,7 @@ Time to start a requirement list.
 #include <qcheckbox.h>
 #include <qimage.h>
 #include <qlayout.h>
+#include <qpainter.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
@@ -102,7 +103,6 @@ Time to start a requirement list.
 #include <kfontdialog.h>
 #include <kkeydialog.h>
 #include <kstandarddirs.h>
-#include <qpainter.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <krootpixmap.h>
@@ -118,6 +118,11 @@ Time to start a requirement list.
 #include <kacceleratormanager.h>
 
 #include <kaction.h>
+#include <kactionmenu.h>
+#include <kactioncollection.h>
+#include <kselectaction.h>
+#include <ktoggleaction.h>
+#include <ktogglefullscreenaction.h>
 #include <kshell.h>
 #include <qlabel.h>
 #include <kmenu.h>

konsole/konsole_part.cpp

@@ -50,7 +50,10 @@
 #include <kmenu.h>
 #include <krootpixmap.h>
 #include <kconfig.h>
-#include <kaction.h>
+#include <kactioncollection.h>
+#include <kactionmenu.h>
+#include <kselectaction.h>
+#include <ktoggleaction.h>
 #include <kauthorized.h>
 
 // We can't use the ARGB32 visual when embedded in another application
@@ -91,12 +94,12 @@ konsoleFactory::~konsoleFactory()
   s_aboutData = 0;
 }
 
-KParts::Part *konsoleFactory::createPartObject(QWidget *parentWidget, const char *widgetName,
-                                         QObject *parent, const char *name, const char *classname,
+KParts::Part *konsoleFactory::createPartObject(QWidget *parentWidget,
+                                         QObject *parent, const char *classname,
                                          const QStringList&)
 {
 //  kDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
-  KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
+  KParts::Part *obj = new konsolePart(parentWidget, parent, classname);
   return obj;
 }
 
@@ -112,7 +115,7 @@ KInstance *konsoleFactory::instance()
 
 #define DEFAULT_HISTORY_SIZE 1000
 
-konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject *parent, const char *name, const char *classname)
+konsolePart::konsolePart(QWidget *_parentWidget, QObject *parent, const char *classname)
   : KParts::ReadOnlyPart(parent)
 ,te(0)
 ,se(0)
@@ -151,7 +154,6 @@ konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject
   if (shell == NULL || *shell == '\0') shell = "/bin/sh";
   eargs.append(shell);
   te = new TEWidget(parentWidget);
-  te->setObjectName(widgetName);
   te->setMinimumSize(150,70);    // allow resizing, cause resize in TEWidget
 
   setWidget(te);

konsole/konsole_part.h

@@ -53,8 +53,8 @@ public:
     konsoleFactory();
     virtual ~konsoleFactory();
 
-    virtual KParts::Part* createPartObject(QWidget *parentWidget = 0, const char *widgetName = 0,
-                                     QObject* parent = 0, const char* name = 0,
+    virtual KParts::Part* createPartObject(QWidget *parentWidget = 0,
+                                     QObject* parent = 0,
                                      const char* classname = "KParts::Part",
                                      const QStringList &args = QStringList());
 
@@ -71,7 +71,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface
 {
     Q_OBJECT
 	public:
-    konsolePart(QWidget *parentWidget, const char *widgetName, QObject * parent, const char *name, const char *classname = 0);
+    konsolePart(QWidget *parentWidget, QObject * parent, const char *classname = 0);
     virtual ~konsolePart();
 
 Q_SIGNALS:

konsole/konsolebookmarkmenu.cpp

@@ -18,7 +18,7 @@
 
 #include <kmenu.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <kactionmenu.h>
 
 #include "konsole.h"
 #include "konsolebookmarkmenu.h"

settings/kcmkonsole.cpp

@@ -38,7 +38,7 @@
 typedef KGenericFactory<KCMKonsole, QWidget> ModuleFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") )
 
-KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&)
+KCMKonsole::KCMKonsole(QWidget * parent, const QStringList&)
 :KCModule(ModuleFactory::instance(), parent)
 {
     

settings/kcmkonsole.h

@@ -31,7 +31,7 @@ class KCMKonsole
 	Q_OBJECT
 
 public:
-	KCMKonsole (QWidget *parent = 0, const char *name = 0, 
+	KCMKonsole (QWidget *parent = 0,
                       const QStringList& = QStringList());
 	
 	void load();