diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /karbon/tools/vtexttool.cc | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'karbon/tools/vtexttool.cc')
| -rw-r--r-- | karbon/tools/vtexttool.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index cb2a9b3f..a08b7f3c 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -325,7 +325,7 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) mainLayout->add( m_tabWidget = new TQTabWidget( base ) ); - m_tabWidget->setFont( TQFont( KGlobalSettings::generalFont().family() , 8 ) ); + m_tabWidget->setFont( TQFont( TDEGlobalSettings::generalFont().family() , 8 ) ); TQWidget* textWidget = new TQWidget( m_tabWidget ); @@ -376,7 +376,7 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) m_tabWidget->addTab( fxWidget, i18n( "Effects" ) ); - m_fontCombo->setCurrentText( KGlobalSettings::generalFont().family() ); + m_fontCombo->setCurrentText( TDEGlobalSettings::generalFont().family() ); m_fontSize->setValue( 12 ); m_fontSize->setSuffix( " pt" ); |