diff options
| author | Timothy Pearson <[email protected]> | 2013-02-04 14:02:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-04 14:02:36 -0600 |
| commit | c125e4cd2946b1fd0651c27fd998b58bab7152a1 (patch) | |
| tree | a215683b59f6028db5718dbc0c33792cc85c49b1 /src/optiondialog.cpp | |
| parent | 533c3127e1498430584d456034fe2558101d99cb (diff) | |
| download | kdiff3-c125e4cd2946b1fd0651c27fd998b58bab7152a1.tar.gz kdiff3-c125e4cd2946b1fd0651c27fd998b58bab7152a1.zip | |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'src/optiondialog.cpp')
| -rw-r--r-- | src/optiondialog.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index e463b38..512357b 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -508,7 +508,7 @@ void OptionDialog::setupOtherOptions() void OptionDialog::setupFontPage( void ) { TQFrame *page = addPage( i18n("Font"), i18n("Editor & Diff Output Font" ), - BarIcon("fonts", KIcon::SizeMedium ) ); + BarIcon("fonts", TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); @@ -540,7 +540,7 @@ void OptionDialog::setupFontPage( void ) void OptionDialog::setupColorPage( void ) { TQFrame *page = addPage( i18n("Color"), i18n("Colors Settings"), - BarIcon("colorize", KIcon::SizeMedium ) ); + BarIcon("colorize", TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); TQGridLayout *gbox = new TQGridLayout( 7, 2 ); @@ -668,7 +668,7 @@ void OptionDialog::setupColorPage( void ) void OptionDialog::setupEditPage( void ) { TQFrame *page = addPage( i18n("Editor"), i18n("Editor Behavior"), - BarIcon("edit", KIcon::SizeMedium ) ); + BarIcon("edit", TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); TQGridLayout *gbox = new TQGridLayout( 4, 2 ); @@ -730,7 +730,7 @@ void OptionDialog::setupEditPage( void ) void OptionDialog::setupDiffPage( void ) { TQFrame *page = addPage( i18n("Diff"), i18n("Diff Settings"), - BarIcon("misc", KIcon::SizeMedium ) ); + BarIcon("misc", TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); TQGridLayout *gbox = new TQGridLayout( 3, 2 ); @@ -798,7 +798,7 @@ void OptionDialog::setupDiffPage( void ) void OptionDialog::setupMergePage( void ) { TQFrame *page = addPage( i18n("Merge"), i18n("Merge Settings"), - BarIcon("misc", KIcon::SizeMedium ) ); + BarIcon("misc", TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page ); topLayout->setMargin( 5 ); topLayout->setSpacing( spacingHint() ); @@ -981,7 +981,7 @@ void OptionDialog::setupMergePage( void ) void OptionDialog::setupDirectoryMergePage( void ) { TQFrame *page = addPage( i18n("Directory Merge"), i18n("Directory Merge"), - BarIcon("folder", KIcon::SizeMedium ) ); + BarIcon("folder", TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); TQGridLayout *gbox = new TQGridLayout( 11, 2 ); @@ -1211,7 +1211,7 @@ void OptionDialog::setupRegionalPage( void ) new Utf8BOMCodec(); TQFrame *page = addPage( i18n("Regional Settings"), i18n("Regional Settings"), - BarIcon("locale"/*"charset"*/, KIcon::SizeMedium ) ); + BarIcon("locale"/*"charset"*/, TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); TQGridLayout *gbox = new TQGridLayout( 3, 2 ); @@ -1441,7 +1441,7 @@ static char* countryMap[]={ void OptionDialog::setupIntegrationPage( void ) { TQFrame *page = addPage( i18n("Integration"), i18n("Integration Settings"), - BarIcon("launch"/*"charset"*/, KIcon::SizeMedium ) ); + BarIcon("launch"/*"charset"*/, TDEIcon::SizeMedium ) ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() ); TQGridLayout *gbox = new TQGridLayout( 3, 3 ); @@ -1537,7 +1537,7 @@ void OptionDialog::slotEncodingChanged() void OptionDialog::setupKeysPage( void ) { //TQVBox *page = addVBoxPage( i18n("Keys"), i18n("KeyDialog" ), - // BarIcon("fonts", KIcon::SizeMedium ) ); + // BarIcon("fonts", TDEIcon::SizeMedium ) ); //TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); // new TDEFontChooser( page,"font",false/*onlyFixed*/,TQStringList(),false,6 ); |