diff options
Diffstat (limited to 'knotes')
| -rw-r--r-- | knotes/knote.cpp | 68 | ||||
| -rw-r--r-- | knotes/knote.h | 2 | ||||
| -rw-r--r-- | knotes/knotealarmdlg.cpp | 4 | ||||
| -rw-r--r-- | knotes/knotealarmdlg.h | 2 | ||||
| -rw-r--r-- | knotes/knotebutton.cpp | 4 | ||||
| -rw-r--r-- | knotes/knotebutton.h | 2 | ||||
| -rw-r--r-- | knotes/knoteconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | knotes/knoteconfigdlg.h | 2 | ||||
| -rw-r--r-- | knotes/knoteedit.cpp | 82 | ||||
| -rw-r--r-- | knotes/knoteedit.h | 2 | ||||
| -rw-r--r-- | knotes/knotehostdlg.cpp | 4 | ||||
| -rw-r--r-- | knotes/knotehostdlg.h | 2 | ||||
| -rw-r--r-- | knotes/knotesalarm.cpp | 2 | ||||
| -rw-r--r-- | knotes/knotesalarm.h | 2 | ||||
| -rw-r--r-- | knotes/knotesapp.cpp | 78 | ||||
| -rw-r--r-- | knotes/knotesapp.h | 2 | ||||
| -rw-r--r-- | knotes/knotesnetrecv.cpp | 8 | ||||
| -rw-r--r-- | knotes/knotesnetrecv.h | 2 | ||||
| -rw-r--r-- | knotes/knotesnetsend.cpp | 10 | ||||
| -rw-r--r-- | knotes/knotesnetsend.h | 2 | ||||
| -rw-r--r-- | knotes/main.cpp | 2 | ||||
| -rw-r--r-- | knotes/resourcelocalconfig.h | 2 | ||||
| -rw-r--r-- | knotes/resourcemanager.h | 2 |
23 files changed, 144 insertions, 144 deletions
diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 2a78d718..69fb1d43 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -105,47 +105,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // create the menu items for the note - not the editor... // rename, mail, print, save as, insert date, alarm, close, delete, new note new TDEAction( i18n("New"), "document-new", 0, - TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); + this,TQ_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); new TDEAction( i18n("Rename..."), "text", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); + this, TQ_SLOT(slotRename()), actionCollection(), "rename_note" ); m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); + this, TQ_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); new TDEAction( i18n("Hide"), "window-close" , Key_Escape, - TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); + this, TQ_SLOT(slotClose()), actionCollection(), "hide_note" ); new TDEAction( i18n("Delete"), "knotes_delete", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); + this, TQ_SLOT(slotKill()), actionCollection(), "delete_note" ); new TDEAction( i18n("Insert Date"), "knotes_date", 0 , - TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" ); + this, TQ_SLOT(slotInsDate()), actionCollection(), "insert_date" ); new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 , - TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); + this, TQ_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); new TDEAction( i18n("Send..."), "network", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); + this, TQ_SLOT(slotSend()), actionCollection(), "send_note" ); new TDEAction( i18n("Mail..."), "mail-send", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); + this, TQ_SLOT(slotMail()), actionCollection(), "mail_note" ); new TDEAction( i18n("Save As..."), "document-save-as", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); - KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); + this, TQ_SLOT(slotSaveAs()), actionCollection(), "save_note" ); + KStdAction::print( this, TQ_SLOT(slotPrint()), actionCollection(), "print_note" ); new TDEAction( i18n("Preferences..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" ); + this, TQ_SLOT(slotPreferences()), actionCollection(), "configure_note" ); m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); + this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); m_keepAbove->setExclusiveGroup( "keepAB" ); m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); + this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); m_keepBelow->setExclusiveGroup( "keepAB" ); m_toDesktop = new TDEListAction( i18n("To Desktop"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); - connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) ); + this, TQ_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); + connect( m_toDesktop->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUpdateDesktopActions()) ); // invisible action to walk through the notes to make this configurable new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab, - TQT_TQOBJECT(this), TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); + this, TQ_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); // create the note header, button and label... m_label = new TQLabel( this ); @@ -155,17 +155,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * setName( m_journal->summary() ); // don't worry, no signals are connected at this stage yet m_button = new KNoteButton( "knotes_close", this ); - connect( m_button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()) ); + connect( m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()) ); // create the note editor m_editor = new KNoteEdit( actionCollection(), this ); m_editor->setNote( this ); m_editor->installEventFilter( this ); // receive events (for modified) m_editor->viewport()->installEventFilter( this ); - connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateViewport( int, int ))); + connect( m_editor, TQ_SIGNAL(contentsMoving( int, int )), this, TQ_SLOT(slotUpdateViewport( int, int ))); KXMLGUIBuilder builder( this ); - KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); + KXMLGUIFactory factory( &builder, this ); factory.addClient( this ); m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this )); @@ -600,9 +600,9 @@ void KNote::find( const TQString& pattern, long options ) delete m_find; m_find = new KFind( pattern, options, this ); - connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )), - TQT_TQOBJECT(this), TQT_SLOT(slotHighlight( const TQString &, int, int )) ); - connect( m_find, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) ); + connect( m_find, TQ_SIGNAL(highlight( const TQString &, int, int )), + this, TQ_SLOT(slotHighlight( const TQString &, int, int )) ); + connect( m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()) ); m_find->setData( plainText() ); slotFindNext(); @@ -816,8 +816,8 @@ void KNote::slotPreferences() // create a new preferences dialog... KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyConfig()) ); - connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyConfig()) ); + connect( this, TQ_SIGNAL(sigNameChanged()), dialog, TQ_SLOT(slotUpdateCaption()) ); dialog->show(); } @@ -1339,7 +1339,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return true; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_label) ) + if ( o == m_label ) { TQMouseEvent *e = (TQMouseEvent *)ev; @@ -1349,12 +1349,12 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) slotRename(); } if ( ev->type() == TQEvent::MouseButtonPress && - (e->button() == Qt::LeftButton || e->button() == Qt::MidButton)) + (e->button() == TQt::LeftButton || e->button() == TQt::MidButton)) { - e->button() == Qt::LeftButton ? KWin::raiseWindow( winId() ) + e->button() == TQt::LeftButton ? KWin::raiseWindow( winId() ) : KWin::lowerWindow( winId() ); - XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() ); + XUngrabPointer( tqt_xdisplay(), get_tqt_x_time() ); NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize ); wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::Move ); return true; @@ -1370,7 +1370,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) #endif if ( m_menu && ( ev->type() == TQEvent::MouseButtonPress ) - && ( e->button() == Qt::RightButton ) ) + && ( e->button() == TQt::RightButton ) ) { m_menu->popup( TQCursor::pos() ); return true; @@ -1379,9 +1379,9 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return false; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editor) ) { + if ( o == m_editor ) { if ( ev->type() == TQEvent::FocusOut ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(ev); + TQFocusEvent *fe = static_cast<TQFocusEvent*>(ev); if ( fe->reason() != TQFocusEvent::Popup && fe->reason() != TQFocusEvent::Mouse ) { updateFocus(); @@ -1398,11 +1398,11 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return false; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editor->viewport()) ) + if ( o == m_editor->viewport() ) { if ( m_edit_menu && ev->type() == TQEvent::MouseButtonPress && - ((TQMouseEvent *)ev)->button() == Qt::RightButton ) + ((TQMouseEvent *)ev)->button() == TQt::RightButton ) { m_edit_menu->popup( TQCursor::pos() ); return true; diff --git a/knotes/knote.h b/knotes/knote.h index 201c7f79..73ca8f4a 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -50,7 +50,7 @@ namespace KCal { class KNote : public TQFrame, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0, diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 4496da26..5e43a86a 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -49,7 +49,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok ) { TQVBox *page = makeVBoxMainWidget(); - TQGroupBox *group = new TQGroupBox( 3, Qt::Vertical, i18n("Scheduled Alarm"), page ); + TQGroupBox *group = new TQGroupBox( 3, TQt::Vertical, i18n("Scheduled Alarm"), page ); m_buttons = new TQButtonGroup( page ); m_buttons->hide(); @@ -72,7 +72,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c label_in->setEnabled( false ); // TODO in->hide(); //show it and enable it when feature will implement - connect( m_buttons, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotButtonChanged( int )) ); + connect( m_buttons, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotButtonChanged( int )) ); } diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h index b018418a..a64f2daa 100644 --- a/knotes/knotealarmdlg.h +++ b/knotes/knotealarmdlg.h @@ -45,7 +45,7 @@ namespace KCal { class KNoteAlarmDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index ff89b2de..47d64a3e 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -33,7 +33,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name ) : TQPushButton( parent, name ) { - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); m_flat = true; @@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p ) if ( !m_flat ) flags |= TQStyle::Style_MouseOver; - style().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); drawButtonLabel( p ); } diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h index 5d1739ae..1b5d4960 100644 --- a/knotes/knotebutton.h +++ b/knotes/knotebutton.h @@ -30,7 +30,7 @@ class TQResizeEvent; class KNoteButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT public: KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 ); diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index bd388c38..60f7a539 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -81,7 +81,7 @@ KNoteConfigDlg::~KNoteConfigDlg() void KNoteConfigDlg::slotUpdateCaption() { - KNote *note = ::tqqt_cast<KNote *>(sender()); + KNote *note = ::tqt_cast<KNote *>(sender()); if ( note ) setCaption( note->name() ); } diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h index a72859a1..97c4ae9e 100644 --- a/knotes/knoteconfigdlg.h +++ b/knotes/knoteconfigdlg.h @@ -29,7 +29,7 @@ class KNoteConfig; class KNoteConfigDlg : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: KNoteConfigDlg( KNoteConfig *config, const TQString &title, diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 1316bc3a..4ef1274d 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char setLinkUnderline( true ); setCheckSpellingEnabled(false); // create the actions for the RMB menu - undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(undo()), actions ); - redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(redo()), actions ); + undo = KStdAction::undo( this, TQ_SLOT(undo()), actions ); + redo = KStdAction::redo( this, TQ_SLOT(redo()), actions ); undo->setEnabled( isUndoAvailable() ); redo->setEnabled( isRedoAvailable() ); - 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 = KStdAction::cut( this, TQ_SLOT(cut()), actions ); + m_copy = KStdAction::copy( this, TQ_SLOT(copy()), actions ); + m_paste = KStdAction::paste( this, TQ_SLOT(paste()), actions ); m_cut->setEnabled( false ); m_copy->setEnabled( false ); m_paste->setEnabled( true ); - 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, TQ_SIGNAL(undoAvailable(bool)), this, TQ_SLOT(setEnabledUndo(bool)) ); + connect( this, TQ_SIGNAL(redoAvailable(bool)), this, TQ_SLOT(setEnabledRedo(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)) ); + connect( this, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT( slotCutEnabled( bool ) ) ); + connect( this, TQ_SIGNAL(copyAvailable(bool)), m_copy, TQ_SLOT(setEnabled(bool)) ); - new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions ); + new TDEAction( KStdGuiItem::clear(), 0, this, TQ_SLOT(clear()), actions, "edit_clear" ); + KStdAction::selectAll( this, TQ_SLOT(selectAll()), actions ); // create the actions modifying the text format m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0, @@ -77,23 +77,23 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", CTRL + Key_S, 0, 0, actions, "format_strikeout" ); - connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) ); - connect( m_textItalic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setItalic(bool)) ); - connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) ); - connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) ); + connect( m_textBold, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setBold(bool)) ); + connect( m_textItalic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setItalic(bool)) ); + connect( m_textUnderline, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setUnderline(bool)) ); + connect( m_textStrikeOut, TQ_SIGNAL(toggled(bool)), TQ_SLOT(textStrikeOut(bool)) ); m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L, - TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()), + this, TQ_SLOT(textAlignLeft()), actions, "format_alignleft" ); m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()), + this, TQ_SLOT(textAlignCenter()), actions, "format_aligncenter" ); m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R, - TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()), + this, TQ_SLOT(textAlignRight()), actions, "format_alignright" ); m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()), + this, TQ_SLOT(textAlignBlock()), actions, "format_alignblock" ); m_textAlignLeft->setExclusiveGroup( "align" ); @@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char m_textAlignBlock->setExclusiveGroup( "align" ); m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0, - TQT_TQOBJECT(this), TQT_SLOT(textList()), + this, TQ_SLOT(textList()), actions, "format_list" ); m_textList->setExclusiveGroup( "style" ); m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0, - TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()), + this, TQ_SLOT(textSuperScript()), actions, "format_super" ); m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0, - TQT_TQOBJECT(this), TQT_SLOT(textSubScript()), + this, TQ_SLOT(textSubScript()), actions, "format_sub" ); m_textSuper->setExclusiveGroup( "valign" ); @@ -120,38 +120,38 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char // There is no easy possibility to implement text indenting with TQTextEdit // // m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0, -// TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()), +// this, TQ_SLOT(textIncreaseIndent()), // actions, "format_increaseindent" ); // // m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0, -// TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()), +// this, TQ_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 TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this), - TQT_SLOT(textColor()), actions, "format_color" ); + m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, this, + TQ_SLOT(textColor()), actions, "format_color" ); m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(), actions, "format_font" ); - connect( m_textFont, TQT_SIGNAL(activated( const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) ); + connect( m_textFont, TQ_SIGNAL(activated( const TQString & )), + this, TQ_SLOT(setFamily( const TQString & )) ); m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(), actions, "format_size" ); - connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )), - TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) ); + connect( m_textSize, TQ_SIGNAL(fontSizeChanged( int )), + this, TQ_SLOT(setPointSize( int )) ); // TQTextEdit connections - connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )), - TQT_TQOBJECT(this), TQT_SLOT(fontChanged( const TQFont & )) ); - connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), - TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); - connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), - TQT_TQOBJECT(this), TQT_SLOT(alignmentChanged( int )) ); - connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), - TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); + connect( this, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect( this, TQ_SIGNAL(currentFontChanged( const TQFont & )), + this, TQ_SLOT(fontChanged( const TQFont & )) ); + connect( this, TQ_SIGNAL(currentColorChanged( const TQColor & )), + this, TQ_SLOT(colorChanged( const TQColor & )) ); + connect( this, TQ_SIGNAL(currentAlignmentChanged( int )), + this, TQ_SLOT(alignmentChanged( int )) ); + connect( this, TQ_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), + this, TQ_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); } KNoteEdit::~KNoteEdit() @@ -541,13 +541,13 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), - TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) ); + this, TQ_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); menu->insertSeparator(); - id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab())); + id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab())); menu->setItemChecked(id, !tabChangesFocus()); } diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h index caa2c51a..259cba82 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -37,7 +37,7 @@ class TDEFontSizeAction; class KNoteEdit : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: KNoteEdit( TDEActionCollection *actions, TQWidget *parent=0, const char *name=0 ); diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index 9d8fff97..15a32c66 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -60,8 +60,8 @@ KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const cha m_hostCombo->setHistoryItems( KNotesGlobalConfig::knownHosts(), true ); m_hostCombo->setFocus(); //m_hostCombo->completionObject()->setItems( KNotesGlobalConfig::hostCompletions() ); - connect( m_hostCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_hostCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); slotTextChanged( m_hostCombo->lineEdit()->text() ); } diff --git a/knotes/knotehostdlg.h b/knotes/knotehostdlg.h index 03a83dcb..81afc6c5 100644 --- a/knotes/knotehostdlg.h +++ b/knotes/knotehostdlg.h @@ -43,7 +43,7 @@ class KHistoryCombo; */ class KNoteHostDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index c2d1bd1c..99f05cd9 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -49,7 +49,7 @@ KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, cons { // TODO: fix timezone stuff? - connect( &m_checkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarms()) ); + connect( &m_checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarms()) ); m_checkTimer.start( 1000 * KNotesGlobalConfig::self()->checkInterval() ); // interval in seconds } diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h index 84bfff50..c173f880 100644 --- a/knotes/knotesalarm.h +++ b/knotes/knotesalarm.h @@ -44,7 +44,7 @@ namespace KCal { class KNotesAlarm : public TQObject { - Q_OBJECT + TQ_OBJECT public: KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 ); diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 4590e704..1f7e9b99 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -65,7 +65,7 @@ public: { m_keyChooser = new KKeyChooser( globals, this ); setMainWidget( m_keyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_keyChooser, TQ_SLOT(allDefault()) ); } void insert( TDEActionCollection *actions ) @@ -96,7 +96,7 @@ KNotesApp::KNotesApp() : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ), m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 ) { - connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) ); + connect( kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()) ); m_noteList.setAutoDelete( true ); m_noteActions.setAutoDelete( true ); @@ -112,25 +112,25 @@ KNotesApp::KNotesApp() // create the GUI... new TDEAction( i18n("New Note"), "document-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" ); + this, TQ_SLOT(newNote()), actionCollection(), "new_note" ); new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0, - TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); + this, TQ_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); new TDEAction( i18n("Show All Notes"), "knotes", 0, - TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); + this, TQ_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); new TDEAction( i18n("Hide All Notes"), "window-close", 0, - TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); + this, TQ_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); - m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotOpenFindDialog()), actionCollection() ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection() ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureAccels()), actionCollection() ); + m_findAction = KStdAction::find( this, TQ_SLOT(slotOpenFindDialog()), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT(slotPreferences()), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT(slotConfigureAccels()), actionCollection() ); //FIXME: no shortcut removing!? - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); + KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); setXMLFile( instance()->instanceName() + "appui.rc" ); m_guiBuilder = new KXMLGUIBuilder( this ); - m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) ); + m_guiFactory = new KXMLGUIFactory( m_guiBuilder, this ); m_guiFactory->addClient( this ); m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this )); @@ -147,19 +147,19 @@ KNotesApp::KNotesApp() m_noteGUI.setContent( doc ); // create accels for global shortcuts - m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" ); + m_globalAccel = new TDEGlobalAccel( this, "global accel" ); m_globalAccel->insert( "global_new_note", i18n("New Note"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true ); + this, TQ_SLOT(newNote()), true, true ); m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), true, true ); + this, TQ_SLOT(newNoteFromClipboard()), true, true ); m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), true, true ); + this, TQ_SLOT(hideAllNotes()), true, true ); m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "", TDEShortcut(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), true, true ); + this, TQ_SLOT(showAllNotes()), true, true ); m_globalAccel->readSettings(); @@ -174,10 +174,10 @@ KNotesApp::KNotesApp() // create the resource manager m_manager = new KNotesResourceManager(); - connect( m_manager, TQT_SIGNAL(sigRegisteredNote( KCal::Journal * )), - this, TQT_SLOT(createNote( KCal::Journal * )) ); - connect( m_manager, TQT_SIGNAL(sigDeregisteredNote( KCal::Journal * )), - this, TQT_SLOT(killNote( KCal::Journal * )) ); + connect( m_manager, TQ_SIGNAL(sigRegisteredNote( KCal::Journal * )), + this, TQ_SLOT(createNote( KCal::Journal * )) ); + connect( m_manager, TQ_SIGNAL(sigDeregisteredNote( KCal::Journal * )), + this, TQ_SLOT(killNote( KCal::Journal * )) ); // read the notes m_manager->load(); @@ -196,12 +196,12 @@ KNotesApp::KNotesApp() // set up the alarm reminder - do it after loading the notes because this // is used as a check if updateNoteActions has to be called for a new note - m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) ); + m_alarm = new KNotesAlarm( m_manager, this ); // create the socket and possibly start listening for connections m_listener = new TDEServerSocket(); m_listener->setResolutionEnabled( true ); - connect( m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(acceptConnection()) ); + connect( m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(acceptConnection()) ); updateNetworkListener(); if ( m_noteList.count() == 0 && !kapp->isRestored() ) @@ -486,7 +486,7 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e ) switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: if ( m_noteList.count() == 1 ) { TQDictIterator<KNote> it( m_noteList ); @@ -495,10 +495,10 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e ) else if ( m_note_menu->count() > 0 ) m_note_menu->popup( e->globalPos() ); break; - case Qt::MidButton: + case TQt::MidButton: newNote(); break; - case Qt::RightButton: + case TQt::RightButton: m_context_menu->popup( e->globalPos() ); default: break; } @@ -509,7 +509,7 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e ) void KNotesApp::slotShowNote() { // tell the WM to give this note focus - showNote( TQString::fromUtf8( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ) ); + showNote( TQString::fromUtf8( sender()->name() ) ); } void KNotesApp::slotWalkThroughNotes() @@ -575,8 +575,8 @@ void KNotesApp::slotPreferences() // create a new preferences dialog... KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this, "KNotes Settings" ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateNetworkListener()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateStyle()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateNetworkListener()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateStyle()) ); dialog->show(); } @@ -657,14 +657,14 @@ void KNotesApp::createNote( KCal::Journal *journal ) KNote *newNote = new KNote( m_noteGUI, journal, 0, journal->uid().utf8() ); m_noteList.insert( newNote->noteId(), newNote ); - connect( newNote, TQT_SIGNAL(sigRequestNewNote()), TQT_SLOT(newNote()) ); - connect( newNote, TQT_SIGNAL(sigShowNextNote()), TQT_SLOT(slotWalkThroughNotes()) ); - connect( newNote, TQT_SIGNAL(sigKillNote( KCal::Journal* )), - TQT_SLOT(slotNoteKilled( KCal::Journal* )) ); - connect( newNote, TQT_SIGNAL(sigNameChanged()), TQT_SLOT(updateNoteActions()) ); - connect( newNote, TQT_SIGNAL(sigDataChanged(const TQString &)), TQT_SLOT(saveNotes(const TQString &)) ); - connect( newNote, TQT_SIGNAL(sigColorChanged()), TQT_SLOT(updateNoteActions()) ); - connect( newNote, TQT_SIGNAL(sigFindFinished()), TQT_SLOT(slotFindNext()) ); + connect( newNote, TQ_SIGNAL(sigRequestNewNote()), TQ_SLOT(newNote()) ); + connect( newNote, TQ_SIGNAL(sigShowNextNote()), TQ_SLOT(slotWalkThroughNotes()) ); + connect( newNote, TQ_SIGNAL(sigKillNote( KCal::Journal* )), + TQ_SLOT(slotNoteKilled( KCal::Journal* )) ); + connect( newNote, TQ_SIGNAL(sigNameChanged()), TQ_SLOT(updateNoteActions()) ); + connect( newNote, TQ_SIGNAL(sigDataChanged(const TQString &)), TQ_SLOT(saveNotes(const TQString &)) ); + connect( newNote, TQ_SIGNAL(sigColorChanged()), TQ_SLOT(updateNoteActions()) ); + connect( newNote, TQ_SIGNAL(sigFindFinished()), TQ_SLOT(slotFindNext()) ); // don't call this during startup for each and every loaded note if ( m_alarm ) @@ -693,8 +693,8 @@ void KNotesApp::acceptConnection() if ( s ) { KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s ); - connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT(newNote( const TQString &, const TQString & )) ); + connect( recv, TQ_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), + this, TQ_SLOT(newNote( const TQString &, const TQString & )) ); } } @@ -725,7 +725,7 @@ void KNotesApp::updateNoteActions() for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it ) { TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"), - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()), + TDEShortcut(), this, TQ_SLOT(slotShowNote()), (TQObject *)0, it.current()->noteId().utf8() ); TDEIconEffect effect; diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h index 649b4b0b..a6acb034 100644 --- a/knotes/knotesapp.h +++ b/knotes/knotesapp.h @@ -55,7 +55,7 @@ namespace KNetwork { class KNotesApp : public TQLabel, public KSessionManaged, virtual public KXMLGUIClient, virtual public KNotesAppIface { - Q_OBJECT + TQ_OBJECT public: KNotesApp(); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 48bb791f..d1ae1237 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -70,15 +70,15 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( TDEBufferedSocket *s ) .arg( date ); // Setup the communications - connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) ); - connect( m_sock, TQT_SIGNAL(closed()), TQT_SLOT(slotConnectionClosed()) ); - connect( m_sock, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); + connect( m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotDataAvailable()) ); + connect( m_sock, TQ_SIGNAL(closed()), TQ_SLOT(slotConnectionClosed()) ); + connect( m_sock, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) ); m_sock->enableRead( true ); // Setup the timer m_timer = new TQTimer( this, "m_timer" ); - connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotReceptionTimeout()) ); + connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotReceptionTimeout()) ); m_timer->start( MAXTIME, true ); } diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h index 927abac8..85647fe2 100644 --- a/knotes/knotesnetrecv.h +++ b/knotes/knotesnetrecv.h @@ -43,7 +43,7 @@ namespace KNetwork { class KNotesNetworkReceiver : public TQObject { - Q_OBJECT + TQ_OBJECT public: KNotesNetworkReceiver( KNetwork::TDEBufferedSocket * ); diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index 26d2b8f7..55dc75c3 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port ) // TQObject:: prefix needed, otherwise the KStreamSocket::connect() // mehtod is called!!! - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )), - TQT_SLOT(slotConnected( const KResolverEntry& )) ); - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) ); - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) ); + TQObject::connect( this, TQ_SIGNAL(connected( const KResolverEntry& )), + TQ_SLOT(slotConnected( const KResolverEntry& )) ); + TQObject::connect( this, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) ); + TQObject::connect( this, TQ_SIGNAL(closed()), TQ_SLOT(slotClosed()) ); + TQObject::connect( this, TQ_SIGNAL(readyWrite()), TQ_SLOT(slotReadyWrite()) ); } void KNotesNetworkSender::setSenderId( const TQString& sender ) diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h index ba867911..7d7c6dad 100644 --- a/knotes/knotesnetsend.h +++ b/knotes/knotesnetsend.h @@ -42,7 +42,7 @@ using namespace KNetwork; class KNotesNetworkSender : public KNetwork::TDEBufferedSocket { - Q_OBJECT + TQ_OBJECT public: KNotesNetworkSender( const TQString& host, int port ); diff --git a/knotes/main.cpp b/knotes/main.cpp index e809a8f7..8b85abe3 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -122,7 +122,7 @@ int main( int argc, char* argv[] ) KUniqueApplication::addCmdLineOptions(); Application app; - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); remove_sm_from_client_leader(); diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h index ab78cd68..680f5146 100644 --- a/knotes/resourcelocalconfig.h +++ b/knotes/resourcelocalconfig.h @@ -27,7 +27,7 @@ class KURLRequester; class ResourceLocalConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h index 423ee7a9..fc82b9a0 100644 --- a/knotes/resourcemanager.h +++ b/knotes/resourcemanager.h @@ -49,7 +49,7 @@ namespace KCal { class KNotesResourceManager : public TQObject, public KRES::ManagerObserver<ResourceNotes> { - Q_OBJECT + TQ_OBJECT public: KNotesResourceManager(); |