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

List:       kde-commits
Subject:    branches/KDE/3.5/kdesdk/kbabel/kbabel
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2006-02-27 10:22:13
Message-ID: 1141035733.914120.31359.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 514059 by goutte:

Change the findInstance private member function not to use QCString anymore.


 M  +20 -16    main.cpp  


--- branches/KDE/3.5/kdesdk/kbabel/kbabel/main.cpp #514058:514059
@@ -1,10 +1,9 @@
 /* ****************************************************************************
   This file is part of KBabel
 
-  Copyright (C) 1999-2001 by Matthias Kiefer
-                            <matthias.kiefer@gmx.de>
-		2002-2005  by Stanislav Visnovsky
-			    <visnovsky@kde.org>
+  Copyright (C) 1999-2001 by Matthias Kiefer <matthias.kiefer@gmx.de>
+		2002-2005 by Stanislav Visnovsky <visnovsky@kde.org>
+  Copyright (C) 2006 by Nicolas GOUTTE <goutte@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -75,7 +74,7 @@
 	int ignoreAccelMarker, int ignoreContextInfo, int ask, int askForNextFile, int \
askForSave);  virtual void spellcheck(QStringList fileList);
 private:
-    KBabelMW* findInstance( QCString file, QString project, QCString package);
+    KBabelMW* findInstance( const KURL& url, const QString& project, const QString& \
package) const;  };
 
 
@@ -351,11 +350,12 @@
 
 void KBabelInterface::gotoFileEntry(QCString url, QCString m)
 {
-    QString msgid = QString::fromUtf8(m);
-    KBabelMW *kb = findInstance( url, KBABEL_DEFAULTPROJECT, QCString() );
+    const KURL u( QString::fromLocal8Bit( url ) );
+    KBabelMW *kb = findInstance( u, KBABEL_DEFAULTPROJECT, QString() );
 
     if(!kb) return;
 
+    QString msgid = QString::fromUtf8(m);
     int index = kb->m_view->catalog()->indexForMsgid(msgid);
     if(index >= 0)
     {
@@ -373,7 +373,9 @@
 
 void KBabelInterface::gotoFileEntry(QCString url, QCString package, int m, QCString \
projectFile)  {
-    KBabelMW *kb = findInstance( url, projectFile, package );
+    const KURL u ( QString::fromLocal8Bit( url ) );
+    const QString p ( QString::fromUtf8( package ) ); // ### VERIFY encoding!
+    KBabelMW *kb = findInstance( u, projectFile, p );
 
     if(!kb) return;
 
@@ -390,7 +392,8 @@
 {
     kdDebug(KBABEL) << "findInFile (" <<fileSource<< "): " << url << " for " << \
findStr << endl;  
-    KBabelMW *kb = findInstance(url, KBABEL_DEFAULTPROJECT, QCString());
+    const KURL u( QString::fromLocal8Bit( url ) );
+    KBabelMW *kb = findInstance( u, KBABEL_DEFAULTPROJECT, QString() );
 
     if(!kb) return false;
 
@@ -420,7 +423,8 @@
 {
     kdDebug(KBABEL) << "replaceInFile (" <<fileSource<< "): " << url << " for " << \
findStr << endl;  
-    KBabelMW *kb = findInstance( url, KBABEL_DEFAULTPROJECT, QCString() );
+    const KURL u ( QString::fromLocal8Bit( url ) );
+    KBabelMW *kb = findInstance( u, KBABEL_DEFAULTPROJECT, QString() );
 
     if( !kb ) return false;
 
@@ -447,22 +451,21 @@
 
 void KBabelInterface::spellcheck(QStringList fileList)
 {
-    QCString nullString;
-    KBabelMW *kb = findInstance(nullString, KBABEL_DEFAULTPROJECT, nullString);
+    // ### FIXME: the default project might use the wrong language!
+    KBabelMW *kb = findInstance( KURL(), KBABEL_DEFAULTPROJECT, QString() );
     kb->show();
     kb->spellcheckMoreFiles( fileList );
 }
 
-KBabelMW* KBabelInterface::findInstance( QCString url, QString project, QCString \
package) +KBabelMW* KBabelInterface::findInstance( const KURL& url, const QString& \
project, const QString& package) const  {
     kdDebug () << "Suspending DCOP" << endl;
     kapp->dcopClient()->suspend();
 
-    const KURL u ( QString::fromLocal8Bit ( url ) );
     KBabelMW *kb = 0;
     if( !url.isEmpty() )
     {
-	kb = KBabelMW::winForURL(u,project);
+	kb = KBabelMW::winForURL( url, project );
 
 	if(kb)
 	{
@@ -483,7 +486,8 @@
 	}
 
         kb->show();
-        if( !url.isEmpty() ) kb->open(u,QString::fromUtf8(package),false);
+        if ( !url.isEmpty() )
+            kb->open( url, package, false );
     }
 
     kdDebug () << "Resuming DCOP" << endl;


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