[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kioslave
From:       Laurent Montel <montel () kde ! org>
Date:       2005-11-01 17:07:18
Message-ID: 1130864838.364265.18706.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 476615 by mlaurent:

Compile/link


 M  +2 -4      home/kio_home.cpp  
 M  +2 -4      home/kio_home.h  
 M  +2 -2      system/kio_system.cpp  
 M  +2 -4      system/kio_system.h  
 M  +2 -2      thumbnail/exrcreator.cpp  


--- trunk/KDE/kdebase/kioslave/home/kio_home.cpp #476614:476615
@@ -29,8 +29,6 @@
 
 
 #include "kio_home.h"
-//Added by qt3to4:
-#include <Q3CString>
 
 static const KCmdLineOptions options[] =
 {
@@ -61,8 +59,8 @@
 }
 
 
-HomeProtocol::HomeProtocol(const Q3CString &protocol,
-                               const Q3CString &pool, const Q3CString &app)
+HomeProtocol::HomeProtocol(const QByteArray &protocol,
+                               const QByteArray &pool, const QByteArray &app)
 	: ForwardingSlaveBase(protocol, pool, app)
 {
 }
--- trunk/KDE/kdebase/kioslave/home/kio_home.h #476614:476615
@@ -22,14 +22,12 @@
 
 #include <kio/forwardingslavebase.h>
 #include "homeimpl.h"
-//Added by qt3to4:
-#include <Q3CString>
 
 class HomeProtocol : public KIO::ForwardingSlaveBase
 {
 public:
-	HomeProtocol(const Q3CString &protocol, const Q3CString &pool,
-	             const Q3CString &app);
+	HomeProtocol(const QByteArray &protocol, const QByteArray &pool,
+	             const QByteArray &app);
 	virtual ~HomeProtocol();
 
 	virtual bool rewriteURL(const KURL &url, KURL &newUrl);
--- trunk/KDE/kdebase/kioslave/system/kio_system.cpp #476614:476615
@@ -62,8 +62,8 @@
 }
 
 
-SystemProtocol::SystemProtocol(const Q3CString &protocol,
-                               const Q3CString &pool, const Q3CString &app)
+SystemProtocol::SystemProtocol(const QByteArray &protocol,
+                               const QByteArray &pool, const QByteArray &app)
 	: ForwardingSlaveBase(protocol, pool, app)
 {
 }
--- trunk/KDE/kdebase/kioslave/system/kio_system.h #476614:476615
@@ -23,14 +23,12 @@
 #include <kio/forwardingslavebase.h>
 
 #include "systemimpl.h"
-//Added by qt3to4:
-#include <Q3CString>
 
 class SystemProtocol : public KIO::ForwardingSlaveBase
 {
 public:
-	SystemProtocol(const Q3CString &protocol, const Q3CString &pool,
-	               const Q3CString &app);
+	SystemProtocol(const QByteArray &protocol, const QByteArray &pool,
+	               const QByteArray &app);
 	virtual ~SystemProtocol();
 	
 	virtual bool rewriteURL(const KURL &url, KURL &newUrl);
--- trunk/KDE/kdebase/kioslave/thumbnail/exrcreator.cpp #476614:476615
@@ -63,8 +63,8 @@
 	// to honouring it in here.
 	kdDebug() << "EXRcreator - using original image" << endl;
 	KConfig * config = KGlobal::config();
-	KConfigGroupSaver cgs( config, "PreviewSettings" );
-	unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
+	KConfigGroup configGroup( config, "PreviewSettings" );
+	unsigned long long maxSize = configGroup.readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
 	unsigned long long fileSize = QFile( path ).size();
 	if ( (fileSize > 0) && (fileSize < maxSize) ) {
 	    if (!img.load( path )) {
[prev in list] [next in list] [prev in thread] [next in thread]