From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knotes/knoteedit.cpp | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'knotes/knoteedit.cpp') diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 2796c2975..55f1c6ff0 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char setLinkUnderline( true ); setCheckSpellingEnabled(false); // create the actions for the RMB menu - undo = KStdAction::undo( this, TQT_SLOT(undo()), actions ); - redo = KStdAction::redo( this, TQT_SLOT(redo()), actions ); + undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(undo()), actions ); + redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(redo()), actions ); undo->setEnabled( isUndoAvailable() ); redo->setEnabled( isRedoAvailable() ); - m_cut = KStdAction::cut( this, TQT_SLOT(cut()), actions ); - m_copy = KStdAction::copy( this, TQT_SLOT(copy()), actions ); - m_paste = KStdAction::paste( this, TQT_SLOT(paste()), actions ); + m_cut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cut()), actions ); + m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actions ); + m_paste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(paste()), actions ); m_cut->setEnabled( false ); m_copy->setEnabled( false ); m_paste->setEnabled( true ); - connect( this, TQT_SIGNAL(undoAvailable(bool)), this, TQT_SLOT(setEnabledUndo(bool)) ); - connect( this, TQT_SIGNAL(redoAvailable(bool)), this, TQT_SLOT(setEnabledRedo(bool)) ); + connect( this, TQT_SIGNAL(undoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledUndo(bool)) ); + connect( this, TQT_SIGNAL(redoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledRedo(bool)) ); - connect( this, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT( slotCutEnabled( bool ) ) ); + connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( bool ) ) ); connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) ); - new KAction( KStdGuiItem::clear(), 0, this, TQT_SLOT(clear()), actions, "edit_clear" ); - KStdAction::selectAll( this, TQT_SLOT(selectAll()), actions ); + new KAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" ); + KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions ); // create the actions modifying the text format m_textBold = new KToggleAction( i18n("Bold"), "text_bold", CTRL + Key_B, 0, 0, @@ -83,17 +83,17 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) ); m_textAlignLeft = new KToggleAction( i18n("Align Left"), "text_left", ALT + Key_L, - this, TQT_SLOT(textAlignLeft()), + TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()), actions, "format_alignleft" ); m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later m_textAlignCenter = new KToggleAction( i18n("Align Center"), "text_center", ALT + Key_C, - this, TQT_SLOT(textAlignCenter()), + TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()), actions, "format_aligncenter" ); m_textAlignRight = new KToggleAction( i18n("Align Right"), "text_right", ALT + Key_R, - this, TQT_SLOT(textAlignRight()), + TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()), actions, "format_alignright" ); m_textAlignBlock = new KToggleAction( i18n("Align Block"), "text_block", ALT + Key_B, - this, TQT_SLOT(textAlignBlock()), + TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()), actions, "format_alignblock" ); m_textAlignLeft->setExclusiveGroup( "align" ); @@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char m_textAlignBlock->setExclusiveGroup( "align" ); m_textList = new KToggleAction( i18n("List"), "enum_list", 0, - this, TQT_SLOT(textList()), + TQT_TQOBJECT(this), TQT_SLOT(textList()), actions, "format_list" ); m_textList->setExclusiveGroup( "style" ); m_textSuper = new KToggleAction( i18n("Superscript"), "text_super", 0, - this, TQT_SLOT(textSuperScript()), + TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()), actions, "format_super" ); m_textSub = new KToggleAction( i18n("Subscript"), "text_sub", 0, - this, TQT_SLOT(textSubScript()), + TQT_TQOBJECT(this), TQT_SLOT(textSubScript()), actions, "format_sub" ); m_textSuper->setExclusiveGroup( "valign" ); @@ -120,38 +120,38 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char // There is no easy possibility to implement text indenting with TQTextEdit // // m_textIncreaseIndent = new KAction( i18n("Increase Indent"), "format_increaseindent", 0, -// this, TQT_SLOT(textIncreaseIndent()), +// TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()), // actions, "format_increaseindent" ); // // m_textDecreaseIndent = new KAction( i18n("Decrease Indent"), "format_decreaseindent", 0, -// this, TQT_SLOT(textDecreaseIndent()), +// TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()), // actions, "format_decreaseindent" ); TQPixmap pix( ICON_SIZE, ICON_SIZE ); pix.fill( black ); // just a dummy, gets updated before widget is shown - m_textColor = new KAction( i18n("Text Color..."), pix, 0, this, + m_textColor = new KAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this), TQT_SLOT(textColor()), actions, "format_color" ); m_textFont = new KFontAction( i18n("Text Font"), "text", KKey(), actions, "format_font" ); connect( m_textFont, TQT_SIGNAL(activated( const TQString & )), - this, TQT_SLOT(setFamily( const TQString & )) ); + TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) ); m_textSize = new KFontSizeAction( i18n("Text Size"), KKey(), actions, "format_size" ); connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )), - this, TQT_SLOT(setPointSize( int )) ); + TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) ); // TQTextEdit connections connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )), - this, TQT_SLOT(fontChanged( const TQFont & )) ); + TQT_TQOBJECT(this), TQT_SLOT(fontChanged( const TQFont & )) ); connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), - this, TQT_SLOT(colorChanged( const TQColor & )) ); + TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), - this, TQT_SLOT(tqalignmentChanged( int )) ); + TQT_TQOBJECT(this), TQT_SLOT(tqalignmentChanged( int )) ); connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), - this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); + TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); } KNoteEdit::~KNoteEdit() @@ -541,7 +541,7 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ), - this, TQT_SLOT( checkSpelling() ) ); + TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); -- cgit v1.2.1