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

List:       kde-commits
Subject:    branches/KDE/3.5/kdesdk/kbabel/catalogmanager
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2005-09-18 22:49:14
Message-ID: 1127083754.735191.31780.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 461874 by goutte:

- use of KIO::Netaccess functions with parent window parameters
- some more code simplification


 M  +13 -14    catalogmanagerview.cpp  


--- branches/KDE/3.5/kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp \
#461873:461874 @@ -69,6 +69,7 @@
 #include <kprogress.h>
 #include <kwin.h>
 #include <ktar.h>
+#include <kdeversion.h>
 
 #include <qfileinfo.h>
 #include <qdir.h>
@@ -420,11 +421,15 @@
 
 void CatalogManagerView::loadMarks()
 {
-    const KURL url = KFileDialog::getOpenURL("","*.marklist", this);
+    const KURL url = KFileDialog::getOpenURL( QString(),"*.marklist", this );
     if( url.isEmpty() ) return;
 
     QString filename;
+#if KDE_IS_VERSION( 3, 2, 90 )
+    if (!KIO::NetAccess::download( url, filename, this ) )
+#else
     if( !KIO::NetAccess::download( url, filename ) )
+#endif
     {
 	KMessageBox::error(this,i18n(
 	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
@@ -495,7 +500,7 @@
     const KURL url = KFileDialog::getSaveURL( QString(), "*.marklist", this );
     if( url.isEmpty() ) return;
 
-    if (KIO::NetAccess::exists(url))
+    if ( KIO::NetAccess::exists( url, false, this ) )
     {
         if(KMessageBox::warningContinueCancel(this,QString("<qt>%1</qt>").arg(i18n("The \
                file %1 already exists. "
 	            "Do you want to overwrite \
it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) \
@@ -1438,7 +1443,7 @@  
    if(index>=0 && item && item->isDir())
    {
-      QString cmd=_settings.dirCommands[(uint)index];
+      QString cmd=*(_settings.dirCommands).at(index);
       cmd.replace("@PACKAGE@",item->name());
       cmd.replace("@PODIR@",item->poFile());
       cmd.replace("@POTDIR@",item->potFile());
@@ -1470,7 +1475,7 @@
    {
       CatManListItem* parent = (CatManListItem*)item->parent();
 
-      QString cmd=_settings.fileCommands[(uint)index];
+      QString cmd=*(_settings.fileCommands).at(index);
       cmd.replace("@PACKAGE@",item->name());
       cmd.replace("@POFILE@",item->poFile());
       cmd.replace("@POTFILE@",item->potFile());
@@ -2263,7 +2268,7 @@
 
 void CatalogManagerView::fileInfoRead( QString filename )
 {
-    if( _readInfoFileList.contains( filename ) ) {
+    if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) {
 	emit progress( ++_readInfoCount);
 	_readInfoFileList.remove( filename );
     }
@@ -2304,15 +2309,8 @@
    _fileCommandsMenu->insertItem(i18n("Log Window"),this,SLOT(showLog()));
 
 
-   bool pathChanged=false;
-   if(oldSettings.poBaseDir!=_settings.poBaseDir)
-   {
-      pathChanged=true;
-   }
-   else if(oldSettings.potBaseDir!=_settings.potBaseDir)
-   {
-      pathChanged=true;
-   }
+   const bool pathChanged = (oldSettings.poBaseDir!=_settings.poBaseDir)
+           || (oldSettings.potBaseDir!=_settings.potBaseDir);
    if(pathChanged)
    {
       if( !isActive() ) {
@@ -2955,3 +2953,4 @@
 }
 
 #include "catalogmanagerview.moc"
+// kate: space-indent on; indent-width 4; replace-tabs on;


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