SVN commit 466795 by coolo:

ported to new KDE libs


 M  +1 -1      cgi/kcmcgi/kcmcgi.cpp  
 M  +1 -1      fish/fish.cpp  
 M  +1 -0      floppy/kio_floppy.cpp  
 M  +1 -0      home/kdedmodule/homedirnotify.cpp  
 M  +1 -1      home/kdedmodule/homedirnotifymodule.cpp  
 M  +1 -0      mac/kio_mac.cpp  
 M  +2 -2      man/kmanpart.cpp  
 M  +1 -1      man/kmanpart.h  
 M  +1 -1      media/kfile-plugin/kfilemediaplugin.cpp  
 M  +2 -1      media/mediamanager/mediadirnotify.cpp  
 M  +1 -1      media/mediamanager/mediamanager.cpp  
 M  +1 -1      media/medianotifier/medianotifier.cpp  
 M  +1 -2      media/mounthelper/kio_media_mounthelper.cpp  
 M  +1 -1      remote/kdedmodule/remotedirnotify.cpp  
 M  +1 -1      remote/kdedmodule/remotedirnotifymodule.cpp  
 M  +1 -1      system/kdedmodule/systemdirnotify.cpp  
 M  +1 -1      system/kdedmodule/systemdirnotifymodule.cpp  
 M  +2 -2      trash/kfile-plugin/kfile_trash.cpp  
 M  +3 -1      trash/trashimpl.cpp  


--- trunk/KDE/kdebase/kioslave/cgi/kcmcgi/kcmcgi.cpp #466794:466795
@@ -37,7 +37,7 @@
 {
   KDE_EXPORT KCModule *create_cgi( QWidget *parent, const char * )
   {
-    KGlobal::locale()->insertCatalogue("kcmcgi");
+    KGlobal::locale()->insertCatalog("kcmcgi");
     return new KCMCgi( parent, "kcmcgi" );
   }
 }
--- trunk/KDE/kdebase/kioslave/fish/fish.cpp #466794:466795
@@ -123,7 +123,7 @@
 
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
-    KLocale::setMainCatalogue("kio_fish");
+    KLocale::setMainCatalog("kio_fish");
     KInstance instance("fish");
 
     myDebug( << "*** Starting fish " << endl);
--- trunk/KDE/kdebase/kioslave/floppy/kio_floppy.cpp #466794:466795
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 
 #include <qtextstream.h>
+#include <QDateTime>
 #include <q3cstring.h>
 #include <qfile.h>
 
--- trunk/KDE/kdebase/kioslave/home/kdedmodule/homedirnotify.cpp #466794:466795
@@ -24,6 +24,7 @@
 #include <kdirnotify_stub.h>
 //Added by qt3to4:
 #include <Q3ValueList>
+#include <Q3CString>
 
 #define MINIMUM_UID 500
 
--- trunk/KDE/kdebase/kioslave/home/kdedmodule/homedirnotifymodule.cpp #466794:466795
@@ -32,7 +32,7 @@
 extern "C" {
 	KDE_EXPORT KDEDModule *create_homedirnotify(const Q3CString &obj)
 	{
-		KGlobal::locale()->insertCatalogue("kio_home");
+		KGlobal::locale()->insertCatalog("kio_home");
 		return new HomeDirNotifyModule(obj);
 	}
 }
--- trunk/KDE/kdebase/kioslave/mac/kio_mac.cpp #466794:466795
@@ -28,6 +28,7 @@
 #include <Q3ValueList>
 #include <QTextStream>
 #include <Q3CString>
+#include <QDateTime>
 
 #include <sys/stat.h>
 #include <stdlib.h>
--- trunk/KDE/kdebase/kioslave/man/kmanpart.cpp #466794:466795
@@ -39,8 +39,8 @@
 KInstance* KManPartFactory::s_instance = 0L;
 KAboutData* KManPartFactory::s_about = 0L;
 
-KManPartFactory::KManPartFactory( QObject* parent, const char* name )
-   : KParts::Factory( parent, name )
+KManPartFactory::KManPartFactory( QObject* parent )
+   : KParts::Factory( parent )
 {}
 
 KManPartFactory::~KManPartFactory()
--- trunk/KDE/kdebase/kioslave/man/kmanpart.h #466794:466795
@@ -41,7 +41,7 @@
 {
    Q_OBJECT
    public:
-      KManPartFactory( QObject * parent = 0, const char * name = 0 );
+      KManPartFactory( QObject * parent = 0 );
       virtual ~KManPartFactory();
 
       virtual KParts::Part* createPartObject( QWidget * parentWidget, const char * widgetName ,
--- trunk/KDE/kdebase/kioslave/media/kfile-plugin/kfilemediaplugin.cpp #466794:466795
@@ -35,7 +35,7 @@
 
 KFileMediaPlugin::KFileMediaPlugin(QObject *parent, const char *name,
 		                     const QStringList& args)
-	: KFilePlugin(parent, name, args)
+	: KFilePlugin(parent, args)
 {
 	addMimeType( "media/audiocd" );
 	addMimeType( "media/hdd_mounted" );
--- trunk/KDE/kdebase/kioslave/media/mediamanager/mediadirnotify.cpp #466794:466795
@@ -25,6 +25,7 @@
 #include "medium.h"
 //Added by qt3to4:
 #include <Q3PtrList>
+#include <Q3CString>
 
 MediaDirNotify::MediaDirNotify(const MediaList &list)
 	: m_mediaList(list)
@@ -87,7 +88,7 @@
 
 	if (new_dir.isValid())
 	{
-		KDirNotify_stub notifier("*", "*");
+		KDirNotify_stub notifier(Q3CString("*"), Q3CString("*"));
 		notifier.FilesAdded( new_dir );
 	}
 }
--- trunk/KDE/kdebase/kioslave/media/mediamanager/mediamanager.cpp #466794:466795
@@ -240,7 +240,7 @@
 extern "C" {
     KDE_EXPORT KDEDModule *create_mediamanager(const Q3CString &obj)
     {
-        KGlobal::locale()->insertCatalogue("kio_media");
+        KGlobal::locale()->insertCatalog("kio_media");
         return new MediaManager(obj);
     }
 }
--- trunk/KDE/kdebase/kioslave/media/medianotifier/medianotifier.cpp #466794:466795
@@ -253,7 +253,7 @@
 	// UNLESS the user instructed otherwise.
 	if ( answer == KMessageBox::Yes )
 	{
-		( void ) new KRun( url );
+		( void ) new KRun( url, 0L );
 	}
 	
 	return true;
--- trunk/KDE/kdebase/kioslave/media/mounthelper/kio_media_mounthelper.cpp #466794:466795
@@ -198,8 +198,7 @@
 	                   "0.1");
 
 	KCmdLineArgs::addCmdLineOptions( options );
-	KGlobal::locale()->setMainCatalogue("kio_media");
-	KApplication::addCmdLineOptions();
+	KGlobal::locale()->setMainCatalog("kio_media");
 
 	if (KCmdLineArgs::parsedArgs()->count()==0) KCmdLineArgs::usage();
 	KApplication *app = new  MountHelper();
--- trunk/KDE/kdebase/kioslave/remote/kdedmodule/remotedirnotify.cpp #466794:466795
@@ -25,7 +25,7 @@
 #include <kdesktopfile.h>
 
 #include <kdirnotify_stub.h>
-
+#include <Q3CString>
 #include <qdir.h>
 
 RemoteDirNotify::RemoteDirNotify()
--- trunk/KDE/kdebase/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp #466794:466795
@@ -32,7 +32,7 @@
 extern "C" {
 	KDE_EXPORT KDEDModule *create_remotedirnotify(const Q3CString &obj)
 	{
-		KGlobal::locale()->insertCatalogue("kio_remote");
+		KGlobal::locale()->insertCatalog("kio_remote");
 		return new RemoteDirNotifyModule(obj);
 	}
 }
--- trunk/KDE/kdebase/kioslave/system/kdedmodule/systemdirnotify.cpp #466794:466795
@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
-
+#include <Q3CString>
 #include <kdirnotify_stub.h>
 
 #include <qdir.h>
--- trunk/KDE/kdebase/kioslave/system/kdedmodule/systemdirnotifymodule.cpp #466794:466795
@@ -32,7 +32,7 @@
 extern "C" {
 	KDE_EXPORT KDEDModule *create_systemdirnotify(const Q3CString &obj)
 	{
-		KGlobal::locale()->insertCatalogue("kio_system");
+		KGlobal::locale()->insertCatalog("kio_system");
 		return new SystemDirNotifyModule(obj);
 	}
 }
--- trunk/KDE/kdebase/kioslave/trash/kfile-plugin/kfile_trash.cpp #466794:466795
@@ -32,9 +32,9 @@
 K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
 
 KTrashPlugin::KTrashPlugin(QObject *parent, const char *name,
-        const QStringList &args) : KFilePlugin(parent, name, args)
+        const QStringList &args) : KFilePlugin(parent, args)
 {
-    KGlobal::locale()->insertCatalogue( "kio_trash" );
+    KGlobal::locale()->insertCatalog( "kio_trash" );
 
     kdDebug(7034) << "Trash file meta info plugin\n";
 
--- trunk/KDE/kdebase/kioslave/trash/trashimpl.cpp #466794:466795
@@ -156,7 +156,9 @@
 void TrashImpl::migrateOldTrash()
 {
     kdDebug() << k_funcinfo << endl;
-    const QString oldTrashDir = KGlobalSettings::trashPath();
+
+    KConfigGroup g( KGlobal::config(), "Paths" );
+    const QString oldTrashDir = g.readPathEntry( "Trash" );
     const Q3StrList entries = listDir( oldTrashDir );
     bool allOK = true;
     Q3StrListIterator entryIt( entries );