diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
| commit | e69e8b1d09fb579316595b4e6a850e717358a8b1 (patch) | |
| tree | a24fc20865f65772f530d16177520190594ffdd2 /kolourpaint/kpmainwindow_text.cpp | |
| parent | eecec9afb81fdebb0f22e9da22635874c403f854 (diff) | |
| download | tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip | |
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kolourpaint/kpmainwindow_text.cpp')
| -rw-r--r-- | kolourpaint/kpmainwindow_text.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index 233ba5b5..859e33f0 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -50,22 +50,22 @@ void kpMainWindow::setupTextToolBarActions () KActionCollection *ac = actionCollection (); m_actionTextFontFamily = new KFontAction (i18n ("Font Family"), 0/*shortcut*/, - this, TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); + TQT_TQOBJECT(this), TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); m_actionTextFontSize = new KFontSizeAction (i18n ("Font Size"), 0/*shortcut*/, - this, TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); + TQT_TQOBJECT(this), TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); m_actionTextBold = new KToggleAction (i18n ("Bold"), "text_bold"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextBoldChanged ()), ac, "text_bold"); + TQT_TQOBJECT(this), TQT_SLOT (slotTextBoldChanged ()), ac, "text_bold"); m_actionTextItalic = new KToggleAction (i18n ("Italic"), "text_italic"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextItalicChanged ()), ac, "text_italic"); + TQT_TQOBJECT(this), TQT_SLOT (slotTextItalicChanged ()), ac, "text_italic"); m_actionTextUnderline = new KToggleAction (i18n ("Underline"), "text_under"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); + TQT_TQOBJECT(this), TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); m_actionTextStrikeThru = new KToggleAction (i18n ("Strike Through"), "text_strike"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); + TQT_TQOBJECT(this), TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); readAndApplyTextSettings (); @@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings () KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText); KConfigBase *cfg = cfgGroupSaver.config (); - m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times"))); + m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times"))); m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14)); m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false)); m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false)); |