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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/plugins/javascript
From:       Duncan Mac-Vicar Prett <duncan () kde ! org>
Date:       2007-03-18 10:57:08
Message-ID: 1174215428.347657.9270.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 643749 by dmacvicar:

Port some changed APIs



 M  +1 -1      javascriptconfig.cpp  
 M  +1 -1      javascriptfile.cpp  
 M  +2 -2      javascriptpreferences.cpp  
 M  +1 -1      wrappers/jsobjectlist.h  
 M  +2 -2      wrappers/kopetemessageimp.cpp  


--- trunk/KDE/kdenetwork/kopete/plugins/javascript/javascriptconfig.cpp #643748:643749
@@ -253,7 +253,7 @@
 	}
 
 	KZip archive( archiveName );
-	if ( !archive.open(IO_ReadOnly) )
+	if ( !archive.open(QIODevice::ReadOnly) )
 	{
 		KMessageBox::queuedMessageBox(
 			Kopete::UI::Global::mainWidget(),
--- trunk/KDE/kdenetwork/kopete/plugins/javascript/javascriptfile.cpp #643748:643749
@@ -28,7 +28,7 @@
 		QString localScriptsDir( KStandardDirs::locateLocal("data", QString::fromLatin1("kopete/scripts")) );
 		QFile f( localScriptsDir + '/' +  id + '/' + fileName );
 
-		if ( f.open( IO_ReadOnly ) )
+		if ( f.open( QIODevice::ReadOnly ) )
 		{
 			QTextStream stream( &f );
 			m_script = stream.read();
--- trunk/KDE/kdenetwork/kopete/plugins/javascript/javascriptpreferences.cpp #643748:643749
@@ -272,7 +272,7 @@
 	QString scriptName = nameDialog->scriptName->text();
 	if( !scriptName.isEmpty() )
 	{
-		KURL url( nameDialog->scriptPath->url() );
+		KUrl url( nameDialog->scriptPath->url() );
 
 		QString id = QString::number( time( NULL ) );
 		QString localScriptsDir( locateLocal("data", QString::fromLatin1("kopete/scripts")) );
@@ -285,7 +285,7 @@
 			d.mkdir( scriptDir );
 
 		QFile f( scriptDir + '/' + url.fileName() );
-		if( f.open( IO_WriteOnly ) )
+		if( f.open( QIODevice::WriteOnly ) )
 		{
 			QTextStream stream( &f );
 			stream << fileContents( nameDialog->scriptPath->url() );
--- trunk/KDE/kdenetwork/kopete/plugins/javascript/wrappers/jsobjectlist.h #643748:643749
@@ -63,7 +63,7 @@
 
 	void addObject( const QString &name, ObjectT *object )
 	{
-		//kdDebug() << k_funcinfo << "Adding object " << name << endl;
+		//kDebug() << k_funcinfo << "Adding object " << name << endl;
 		if( !objectList[name] )
 		{
 			KJS::List arg;
--- trunk/KDE/kdenetwork/kopete/plugins/javascript/wrappers/kopetemessageimp.cpp #643748:643749
@@ -92,13 +92,13 @@
 	JSOpaqueProxy *op = JSProxy::toOpaqueProxy( object.imp() );
 	if ( !op )
 	{
-		kdWarning() << "MyCustomObjectImp::call() failed, not a JSOpaqueProxy" << endl;
+		kWarning() << "MyCustomObjectImp::call() failed, not a JSOpaqueProxy" << endl;
 		return 0;
 	}
 
 	if ( op->typeName() != "MyCustomObject" )
 	{
-		kdWarning() << "MyCustomObjectImp::call() failed, type is " << op->typeName() << endl;
+		kWarning() << "MyCustomObjectImp::call() failed, type is " << op->typeName() << endl;
 		return 0;
 	}
 
[prev in list] [next in list] [prev in thread] [next in thread]