diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
| commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
| tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /konq-plugins/kimgalleryplugin/imgallerydialog.cpp | |
| parent | 0642ee50634d90e255c6f45194f6a47dc1157cde (diff) | |
| download | tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kimgalleryplugin/imgallerydialog.cpp')
| -rw-r--r-- | konq-plugins/kimgalleryplugin/imgallerydialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index d5fe29a..77758b1 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -65,7 +65,7 @@ void KIGPDialog::slotDefault() m_imageName->setChecked(true); m_imageSize->setChecked(false); m_imageProperty->setChecked(false); - m_fontName->setCurrentText( KGlobalSettings::generalFont().family() ); + m_fontName->setCurrentText( TDEGlobalSettings::generalFont().family() ); m_fontSize->setValue(14); m_foregroundColor->setColor( TQColor( "#d0ffd0") ); m_backgroundColor->setColor( TQColor("#333333") ); @@ -127,7 +127,7 @@ void KIGPDialog::setupLookPage(const TQString& path) { TQStringList standardFonts; KFontChooser::getFontList(standardFonts, 0); m_fontName->insertStringList( standardFonts ); - m_fontName->setCurrentText( m_config->readEntry("FontName", KGlobalSettings::generalFont().family() ) ); + m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) ); label = new TQLabel( i18n("Fon&t name:"), page ); label->setBuddy( m_fontName ); |