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

List:       kde-commits
Subject:    koffice/tools
From:       Fredrik Edemar <f_edemar () linux ! se>
Date:       2006-05-17 22:10:53
Message-ID: 1147903853.058842.8353.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 542002 by fedemar:

Fix warnings


 M  +2 -2      kfile-plugins/abiword/kfile_abiword.cpp  
 M  +1 -1      kfile-plugins/gnumeric/kfile_gnumeric.cpp  
 M  +1 -1      kfile-plugins/koffice/kfile_koffice.cpp  
 M  +2 -2      kfile-plugins/ooo/kfile_ooo.cpp  
 M  +3 -3      thesaurus/main.cc  
 M  +3 -3      thumbnail/clipartcreator.cpp  
 M  +3 -3      thumbnail/kofficecreator.cpp  


--- trunk/koffice/tools/kfile-plugins/abiword/kfile_abiword.cpp #542001:542002
@@ -59,14 +59,14 @@
     setHint(item, KFileMimeTypeInfo::Description);
 }
 
-bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what)
+bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 {
     if ( info.path().isEmpty() ) // remote file
         return false;
 
     //Find the last extension
     QString strExt;
-    const int result=info.path().findRev('.');
+    const int result=info.path().lastIndexOf('.');
     if (result>=0)
     {
         strExt=info.path().mid(result);
--- trunk/koffice/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp #542001:542002
@@ -59,7 +59,7 @@
     setHint(item, KFileMimeTypeInfo::Description);
 }
 
-bool GnumericPlugin::readInfo( KFileMetaInfo& info, uint what)
+bool GnumericPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 {
     if ( info.path().isEmpty() ) // remote file
         return false;
--- trunk/koffice/tools/kfile-plugins/koffice/kfile_koffice.cpp #542001:542002
@@ -73,7 +73,7 @@
     setHint(item, KFileMimeTypeInfo::Description);
 }
 
-bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint what)
+bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 {
     if ( info.path().isEmpty() ) // remote file
         return false;
--- trunk/koffice/tools/kfile-plugins/ooo/kfile_ooo.cpp #542001:542002
@@ -415,7 +415,7 @@
   for (int i = childs.length(); i >= 0; --i){
 	  metaKeyNode.removeChild( childs.item(i) );
   }
-  QStringList keywordList = QStringList::split(",", \
info[DocumentInfo][metakeyword].value().toString().trimmed(), false); +  QStringList \
keywordList = info[DocumentInfo][metakeyword].value().toString().trimmed().split( \
",", QString::SkipEmptyParts );  for ( QStringList::Iterator it = \
keywordList.begin(); it != keywordList.end(); ++it ) {  QDomElement elem = \
doc.createElement(metakeyword);  metaKeyNode.appendChild(elem);
@@ -573,7 +573,7 @@
 					    const QString & ,     /* group */
 					    const QString &key,
 					    QObject * parent,
-					    const char * name ) const
+					    const char * /*name*/ ) const
 {
 	if (key == dclanguage)
 		return new QRegExpValidator(QRegExp("[a-zA-Z-]{1,5}"),
--- trunk/koffice/tools/thesaurus/main.cc #542001:542002
@@ -280,12 +280,12 @@
         // not called from an application like KWord, so make it possible
         // to replace text:
         m_replacement = true;
-        m_dialog->setButtonOK(i18n("&Replace"));
+        m_dialog->setButtonGuiItem( KDialog::Ok, i18n("&Replace"));
     } else if ( command == "thesaurus_standalone" ) {
         // not called from any application, but from KThesaurus
         m_replacement = false;
-        m_dialog->showButtonOK(false);
-        m_dialog->setButtonCancel(i18n("&Close"));
+        m_dialog->showButton( KDialog::Ok, false);
+        m_dialog->setButtonGuiItem( KDialog::Cancel, i18n("&Close"));
         m_replace->setEnabled(false);
         m_replace_label->setEnabled(false);
     } else {
--- trunk/koffice/tools/thumbnail/clipartcreator.cpp #542001:542002
@@ -37,7 +37,7 @@
     }
 }
 
-bool ClipartCreator::create(const QString &path, int width, int height, QImage &img)
+bool ClipartCreator::create(const QString &path, int /*width*/, int /*height*/, \
QImage &img)  {
     QPixmap pixmap;
     KoPicture picture;
@@ -48,11 +48,11 @@
 
         QPainter p;
         p.begin( &pixmap );
-        p.setBackgroundColor( Qt::white );
+        p.setBackground( Qt::white );
 
         picture.draw(p, 0, 0, pixmap.width(), pixmap.height());
         p.end();
-        img = pixmap.convertToImage();
+        img = pixmap.toImage();
         return true;
     }
     else
--- trunk/koffice/tools/thumbnail/kofficecreator.cpp #542001:542002
@@ -88,8 +88,8 @@
         return false;
     m_completed = false;
     startTimer(5000);
-    while (!m_completed)
-        kapp->processOneEvent();
+//     while (!m_completed)
+//         kapp->processOneEvent();
     QAbstractEventDispatcher::instance()->unregisterTimers(this);
 
     // render the page on a bigger pixmap and use smoothScale,
@@ -104,7 +104,7 @@
         pix = m_doc->generatePreview(QSize(400, 400));
     }
 
-    img = pix.convertToImage();
+    img = pix.toImage();
     return true;
 }
 


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