[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/kioslave
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2006-05-08 13:44:17
Message-ID: 1147095857.167942.4746.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 538634 by aseigo:
snapshot porting
M +1 -1 fish/fish.cpp
M +1 -1 mac/kio_mac.cpp
M +5 -5 man/kmanpart.cpp
M +3 -3 man/kmanpart.h
M +2 -2 media/kcmodule/main.cpp
M +1 -1 media/kcmodule/main.h
M +1 -2 media/kfile-plugin/kfilemediaplugin.cpp
M +1 -2 media/kfile-plugin/kfilemediaplugin.h
M +5 -5 settings/kio_settings.cc
M +2 -2 trash/kfile-plugin/kfile_trash.cpp
M +1 -1 trash/kfile-plugin/kfile_trash.h
--- trunk/KDE/kdebase/kioslave/fish/fish.cpp #538633:538634
@@ -1396,7 +1396,7 @@
if (!url.hasPath()) {
sendCommand(FISH_PWD);
} else {
- sendCommand(FISH_STAT,E(url.path(-1)));
+ sendCommand(FISH_STAT,E(url.path(KUrl::RemoveTrailingSlash)));
}
run();
}
--- trunk/KDE/kdebase/kioslave/mac/kio_mac.cpp #538633:538634
@@ -226,7 +226,7 @@
//prepareHP() called from get() listDir() and stat()
//(re)mounts the partition and changes to the appropriate directory
QString MacProtocol::prepareHP(const KUrl& url) {
- QString path = url.path(-1);
+ QString path = url.path(KUrl::RemoveTrailingSlash);
if (path.left(1) == "/") {
path = path.mid(1); // strip leading slash
}
--- trunk/KDE/kdebase/kioslave/man/kmanpart.cpp #538633:538634
@@ -50,10 +50,10 @@
delete s_about;
}
-KParts::Part* KManPartFactory::createPartObject( QWidget * parentWidget, const char* \
/*widgetName*/, QObject *,
- const char* name, const char* /*className*/,const \
QStringList & ) +KParts::Part* KManPartFactory::createPartObject( QWidget * \
parentWidget, QObject *, + const char* \
/*className*/,const QStringList & ) {
- KManPart* part = new KManPart(parentWidget, name );
+ KManPart* part = new KManPart(parentWidget);
return part;
}
@@ -69,8 +69,8 @@
}
-KManPart::KManPart( QWidget * parent, const char * name )
-: KHTMLPart( parent, name )
+KManPart::KManPart( QWidget * parent )
+: KHTMLPart( parent )
,m_job(0)
{
KInstance * instance = new KInstance( "kmanpart" );
--- trunk/KDE/kdebase/kioslave/man/kmanpart.h #538633:538634
@@ -44,8 +44,8 @@
KManPartFactory( QObject * parent = 0 );
virtual ~KManPartFactory();
- virtual KParts::Part* createPartObject( QWidget * parentWidget, const char * \
widgetName ,
- QObject* parent, const char* name, const char * \
classname, + virtual KParts::Part* createPartObject( QWidget * parentWidget,
+ QObject* parent, const char * classname,
const QStringList &args);
static KInstance * instance();
@@ -60,7 +60,7 @@
{
Q_OBJECT
public:
- KManPart( QWidget * parent, const char * name = 0L );
+ KManPart( QWidget * parent );
KParts::BrowserExtension * extension() {return m_extension;};
public Q_SLOTS:
--- trunk/KDE/kdebase/kioslave/media/kcmodule/main.cpp #538633:538634
@@ -38,8 +38,8 @@
K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
-MediaModule::MediaModule( QWidget *parent, const char *name, const QStringList& )
- : KCModule(MediaFactory::instance(), parent/*, name*/ )
+MediaModule::MediaModule( QWidget *parent, const QStringList& )
+ : KCModule(MediaFactory::instance(), parent )
{
QVBoxLayout *layout = new QVBoxLayout( this );
layout->setSpacing( KDialog::spacingHint() );
--- trunk/KDE/kdebase/kioslave/media/kcmodule/main.h #538633:538634
@@ -27,7 +27,7 @@
Q_OBJECT
public:
- MediaModule( QWidget *parent, const char *name, const QStringList& );
+ MediaModule( QWidget *parent, const QStringList& );
virtual void load();
virtual void save();
--- trunk/KDE/kdebase/kioslave/media/kfile-plugin/kfilemediaplugin.cpp #538633:538634
@@ -33,8 +33,7 @@
typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media"))
-KFileMediaPlugin::KFileMediaPlugin(QObject *parent, const char *name,
- const QStringList& args)
+KFileMediaPlugin::KFileMediaPlugin(QObject *parent, const QStringList& args)
: KFilePlugin(parent, args)
{
addMimeType( "media/audiocd" );
--- trunk/KDE/kdebase/kioslave/media/kfile-plugin/kfilemediaplugin.h #538633:538634
@@ -29,8 +29,7 @@
{
Q_OBJECT
public:
- KFileMediaPlugin(QObject *parent, const char *name,
- const QStringList &args);
+ KFileMediaPlugin(QObject *parent, const QStringList &args);
bool readInfo(KFileMetaInfo &info, uint what = KFileMetaInfo::Fastest);
--- trunk/KDE/kdebase/kioslave/settings/kio_settings.cc #538633:538634
@@ -169,7 +169,7 @@
{
KIO::UDSEntry entry;
- QString servicePath( url.path(1) );
+ QString servicePath( url.path( KUrl::AddTrailingSlash ) );
servicePath.remove(0, 1); // remove starting '/'
if ( m_runMode == SettingsMode)
@@ -187,7 +187,7 @@
// newUrl.setPath(locate("apps", service->desktopEntryPath()));
// createFileEntry(entry, service->name(), newUrl, "application/x-desktop", \
service->icon());
- createFileEntry(entry, service->name(), url.url(1)+service->desktopEntryName(),
+ createFileEntry(entry, service->name(), url.url( KUrl::AddTrailingSlash \
)+service->desktopEntryName(),
"application/x-desktop", service->icon(), locate("apps", \
service->desktopEntryPath()) ); } else {
error(KIO::ERR_SLAVE_DEFINED,i18n("Unknown settings folder"));
@@ -203,7 +203,7 @@
void SettingsProtocol::listDir(const KUrl& url)
{
- QString groupPath = url.path(1);
+ QString groupPath = url.path( KUrl::AddTrailingSlash );
groupPath.remove(0, 1); // remove starting '/'
if ( m_runMode == SettingsMode)
@@ -264,8 +264,8 @@
} else {
KService::Ptr s(KService::Ptr::staticCast(e));
- kDebug() << "SettingsProtocol: adding file entry " << url.url(1)+s->name() << \
endl;
- createFileEntry(entry,s->name(),url.url(1)+s->desktopEntryName(), \
"application/x-desktop",s->icon(),locate("apps", s->desktopEntryPath())); \
+ kDebug() << "SettingsProtocol: adding file entry " << url.url( \
KUrl::AddTrailingSlash )+s->name() << endl; \
+ createFileEntry(entry,s->name(),url.url( KUrl::AddTrailingSlash \
)+s->desktopEntryName(), "application/x-desktop",s->icon(),locate("apps", \
s->desktopEntryPath())); }
listEntry(entry, false);
--- trunk/KDE/kdebase/kioslave/trash/kfile-plugin/kfile_trash.cpp #538633:538634
@@ -31,8 +31,8 @@
K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
-KTrashPlugin::KTrashPlugin(QObject *parent, const char *name,
- const QStringList &args) : KFilePlugin(parent, args)
+KTrashPlugin::KTrashPlugin(QObject *parent, const QStringList &args)
+ : KFilePlugin(parent, args)
{
KGlobal::locale()->insertCatalog( "kio_trash" );
--- trunk/KDE/kdebase/kioslave/trash/kfile-plugin/kfile_trash.h #538633:538634
@@ -31,7 +31,7 @@
Q_OBJECT
public:
- KTrashPlugin(QObject *parent, const char *name, const QStringList& args);
+ KTrashPlugin(QObject *parent, const QStringList& args);
virtual bool readInfo(KFileMetaInfo& info, uint what);
private:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic