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

List:       kde-commits
Subject:    KDE/kdeutils/khexedit
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-06 15:51:38
Message-ID: 1152201098.095821.4407.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 559112 by mlaurent:

Fix compile


 M  +2 -2      converterdialog.cc  
 M  +1 -1      fileinfodialog.cc  
 M  +10 -10    optiondialog.cc  


--- trunk/KDE/kdeutils/khexedit/converterdialog.cc #559111:559112
@@ -23,7 +23,7 @@
 #include <QLayout>
 
 #include <klocale.h>
-
+#include <kstdguiitem.h>
 #include "converterdialog.h"
 #include "hexvalidator.h"
 
@@ -79,7 +79,7 @@
   setMainWidget( page );
 
   setDefaultButton( Cancel );
-  enableButtonSeparator( true );
+  showButtonSeparator( true );
   setWindowModality( isModal() ? Qt::WindowModal : Qt::NonModal );
 
   QGridLayout *topLayout = new QGridLayout( page );
--- trunk/KDE/kdeutils/khexedit/fileinfodialog.cc #559111:559112
@@ -79,7 +79,7 @@
     setDefaultButton( User1 );
     setButtonText( User1, i18n("&Update") );
     setModal( true );
-    enableButtonSeparator( true );
+    showButtonSeparator( true );
   setHelp( "khexedit/khexedit.html", QString::null );
 
   QString text;
--- trunk/KDE/kdeutils/khexedit/optiondialog.cc #559111:559112
@@ -22,7 +22,7 @@
 #include <QLineEdit>
 #include <q3vbox.h>
 #include <Q3VButtonGroup>
-
+#include <kicon.h>
 #include <qpainter.h>
 
 #include <QCheckBox>
@@ -108,10 +108,10 @@
 void COptionDialog::setupLayoutPage( void )
 {
   QString text;
-  
+
   mLayoutPage = new KPageWidgetItem( new QFrame(), i18n("Layout") );
   mLayoutPage->setHeader( i18n("Data Layout in Editor" ) );
-  mLayoutPage->setIcon( BarIcon("khexedit", K3Icon::SizeMedium ) ); 
+  mLayoutPage->setIcon( KIcon( BarIcon("khexedit", K3Icon::SizeMedium ) ));
   addPage( mLayoutPage );
 
   QGridLayout *gbox = new QGridLayout( mLayoutPage->widget() );
@@ -272,10 +272,10 @@
 void COptionDialog::setupCursorPage( void )
 {
   QString text;
-  
+
   KPageWidgetItem *mCursorPage = new KPageWidgetItem( new QFrame(), i18n("Cursor") );
   mCursorPage->setHeader( i18n("Cursor Behavior (only valid for editor)" ) );
-  mCursorPage->setIcon( BarIcon("mouse", K3Icon::SizeMedium ) ); 
+  mCursorPage->setIcon(KIcon(  BarIcon("mouse", K3Icon::SizeMedium ) ));
   addPage( mCursorPage );
 
   QVBoxLayout *topLayout = new QVBoxLayout( mCursorPage->widget() );
@@ -346,7 +346,7 @@
 
   KPageWidgetItem *mColorPage = new KPageWidgetItem( new QFrame(), i18n("Colors") );
   mColorPage->setHeader( i18n("Editor Colors (system selection color is always used)" ) );
-  mColorPage->setIcon( BarIcon("colorize", K3Icon::SizeMedium ) ); 
+  mColorPage->setIcon(KIcon(  BarIcon("colorize", K3Icon::SizeMedium ) ));
   addPage( mColorPage );
 
   QVBoxLayout *topLayout = new QVBoxLayout( mColorPage->widget() );
@@ -402,7 +402,7 @@
 
   KPageWidgetItem *mFontPage = new KPageWidgetItem( new QFrame(), i18n("Font") );
   mFontPage->setHeader( i18n("Font Selection (editor can only use a fixed font)") );
-  mFontPage->setIcon( BarIcon("fonts", K3Icon::SizeMedium ) ); 
+  mFontPage->setIcon(KIcon(  BarIcon("fonts", K3Icon::SizeMedium ) ) );
   addPage( mFontPage );
 
   QVBoxLayout *topLayout = new QVBoxLayout( mFontPage->widget() );
@@ -461,7 +461,7 @@
 
   KPageWidgetItem *mFilePage = new KPageWidgetItem( new QFrame(), i18n("Files") );
   mFilePage->setHeader( i18n("File Management") );
-  mFilePage->setIcon( BarIcon("kmultiple", K3Icon::SizeMedium ) ); 
+  mFilePage->setIcon(KIcon(  BarIcon("kmultiple", K3Icon::SizeMedium ) ) );
   addPage( mFilePage );
 
   QVBoxLayout *topLayout = new QVBoxLayout( mFilePage->widget() );
@@ -559,9 +559,9 @@
 
   KPageWidgetItem *mMiscPage = new KPageWidgetItem( new QFrame(), i18n("Miscellaneous") );
   mMiscPage->setHeader( i18n("Various Properties") );
-  mMiscPage->setIcon( BarIcon("gear", K3Icon::SizeMedium ) ); 
+  mMiscPage->setIcon(KIcon(  BarIcon("gear", K3Icon::SizeMedium ) ) );
   addPage( mMiscPage );
-  
+
   QVBoxLayout *topLayout = new QVBoxLayout( mMiscPage->widget() );
   topLayout->setSpacing( spacingHint() );
   topLayout->setMargin( 0 );
[prev in list] [next in list] [prev in thread] [next in thread]