[Knode-devel] kdepim

[Stephan Binner]

CVS commit by binner: 

ikonify


  M +1 -1      kalarm/mainwindow.cpp   1.90
  M +2 -1      kalarm/messagewin.cpp   1.85
  M +1 -1      kmail/kfileio.cpp   1.41
  M +1 -1      knode/kncomposer.cpp   1.193


--- kdepim/kalarm/mainwindow.cpp  #1.89:1.90
@@ -344,5 +344,5 @@ void KAlarmMainWindow::initActions()
         theApp()->actionPreferences()->plug(submenu);
 
-        menu->insertItem(KStdGuiItem::help().text(), helpMenu());
+        menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), helpMenu());
 
         // Set up the toolbar

--- kdepim/kalarm/messagewin.cpp  #1.84:1.85
@@ -61,4 +61,5 @@
 #include <kio/netaccess.h>
 #include <knotifyclient.h>
+#include <kpushbutton.h>
 #if KDE_VERSION >= 290
 #include <arts/kartsdispatcher.h>
@@ -437,5 +438,5 @@ QSize MessageWin::initView()
 
         // Close button
-        QPushButton* okButton = new QPushButton(KStdGuiItem::close().text(), topWidget);
+        KPushButton* okButton = new KPushButton(KStdGuiItem::close(), topWidget);
         // Prevent accidental acknowledgement of the message if the user is typing when the window appears
         okButton->clearFocus();

--- kdepim/kmail/kfileio.cpp  #1.40:1.41
@@ -197,5 +197,5 @@ bool kBytesToFile(const char* aBuffer, i
              i18n("Failed to make a backup copy of %1.\nContinue anyway?")
              .arg(aFileName),
-             i18n("Save to File"), KStdGuiItem::save().text() );
+             i18n("Save to File"), KStdGuiItem::save() );
         if (rc != KMessageBox::Continue) return FALSE;
       }

--- kdepim/knode/kncomposer.cpp  #1.192:1.193
@@ -869,5 +869,5 @@ void KNComposer::closeEvent(QCloseEvent 
   else {
     switch ( KMessageBox::warningYesNoCancel( this, i18n("Do you want to save this article in the draft folder?"),
-                                              QString::null, KStdGuiItem::save().text(), i18n("&Discard"))) {
+                                              QString::null, KStdGuiItem::save(), i18n("&Discard"))) {
       case KMessageBox::Yes :
         r_esult=CRsave;