diff options
Diffstat (limited to 'knotes')
35 files changed, 169 insertions, 157 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog index c5cfb84f..fb391828 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -3,7 +3,7 @@ ChangeLog for KNotes 2006/07/10 Michael Brade <brade@kde.org> - * added DCOP methods to get and change geometry: + * added DCOP methods to get and change tqgeometry: height(), width(), move(), resize() 2006/06/10 Michael Brade <brade@kde.org> @@ -182,7 +182,7 @@ ChangeLog for KNotes * when there is no note after restoring a session, still show the "No Notes" item in the notes menu * each note now has its own KXMLGUIBilder to get rid of the reparent-call, - the builder's parent will be the widgets' parent + the builder's tqparent will be the widgets' tqparent * fixed #87696: allow default sizes as small as 50x50 pixels 2004/08/20 Michael Brade <brade@kde.org> @@ -347,7 +347,7 @@ ChangeLog for KNotes 2004/03/15 Michael Brade <brade@kde.org> * removed const from KNotesApp::slotPreferences to make it possible to - set KNotesApp as parent of the config dialog -> fixes jumping to another + set KNotesApp as tqparent of the config dialog -> fixes jumping to another desktop when opening the config dialog 2004/03/13 Michael Brade <brade@kde.org> @@ -499,7 +499,7 @@ ChangeLog for KNotes * removed really old icons * made KNoteButtons always square * show the rich text actions only for actual rich text notes - * don't emit the bold/italic/underline signals when moving the cursor + * don't emit the bold/italic/underline Q_SIGNALS when moving the cursor or selecting text, otherwise this will change the selected text! 2002/10/15 Michael Brade <brade@kde.org> @@ -616,7 +616,7 @@ ChangeLog for KNotes 2001/06/23 Michael Brade <brade@informatik.uni-muenchen.de> * fixed #18086 (add a size grip for the notes) - * update the title layout if the font was changed + * update the title tqlayout if the font was changed 2001/06/17 Michael Brade <brade@informatik.uni-muenchen.de> @@ -631,7 +631,7 @@ ChangeLog for KNotes - removed the size setting from the local note config dialog - #20172: separate font settings for title and body * don't reload the display setting if changing e.g. only the color - - the note's geometry could have been changed already + the note's tqgeometry could have been changed already * fixed some bugs introduced by the QTextEdit port 2001/06/10 Michael Brade <brade@informatik.uni-muenchen.de> @@ -811,7 +811,7 @@ ChangeLog for KNotes KNotes rewrite: - changed config file to use KConfig - - use KDockWindow and KUniqueApplication + - use KTQt::DockWindow and KUniqueApplication - Changed structure to make smaller files 2000/01/30 Charles Samuels <charles@kde.org> @@ -863,7 +863,7 @@ Tue Aug 3 02:23:09 1999 Carsten Pfeiffer <pfeiffer@kde.org> * added possibility to play a sound when an alarm is activated, configurable in the defaults dialog * replaced the custom spinboxes with QSpinBoxes and made the dialog use - layout management (still not perfect, yet) + tqlayout management (still not perfect, yet) 1999-06-07 Petter Reinholdtsen <pere@td.org.uit.no> * knotes.cpp: Changed text Quit to Exit to match KDE style guide. @@ -883,7 +883,7 @@ Tue Aug 3 02:23:09 1999 Carsten Pfeiffer <pfeiffer@kde.org> Tue Feb 16 09:34:25 1999 David Faure <faure@kde.org> * Added option "dock in panel" (to disable docking) - Docking is automatically re-enabled if the last note is deleted + TQt::Docking is automatically re-enabled if the last note is deleted * Move options submenu to toplevel RMB menu (too many submenus!) * Re-added "Quit" menu entry (in order to quit when docking is off) @@ -922,7 +922,7 @@ Mon Nov 17 21:32:28 1997 Didier Belot <dib@avo.fr> Sat Nov 22 13:13:05 1997 Matthias Ettrich <ettrich@kde.org> - * sessionmanagement: uses kwm properties now, not only geometry info + * sessionmanagement: uses kwm properties now, not only tqgeometry info * look: pretty thin border. KPostit does no longer inherit QMultiline but simply QFrame. New class: KPostitMultilineEdit. New QMessage box for warning. Icon+Miniicon. diff --git a/knotes/KNotesAppIface.h b/knotes/KNotesAppIface.h index 7ddfdc28..ad24a58b 100644 --- a/knotes/KNotesAppIface.h +++ b/knotes/KNotesAppIface.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,8 +49,8 @@ k_dcop: * @param text the body of the new note * @return the new notes' id */ - virtual TQString newNote( const TQString& name = TQString::null, - const TQString& text = TQString::null ) = 0; + virtual TQString newNote( const TQString& name = TQString(), + const TQString& text = TQString() ) = 0; /** * Create a new note and inserts the current text in the clipboard @@ -60,7 +60,7 @@ k_dcop: * KNotes will choose an appropriate name * @return the new notes' id */ - virtual TQString newNoteFromClipboard( const TQString& name = TQString::null ) = 0; + virtual TQString newNoteFromClipboard( const TQString& name = TQString() ) = 0; /** * Deletes a note forever. @@ -98,14 +98,14 @@ k_dcop: /** * Returns the foreground/text color of a note. * @param noteId the id of the note in question - * @return the foreground/text color as a QString + * @return the foreground/text color as a TQString */ virtual TQString fgColor( const TQString& noteId ) const = 0; /** * Returns the background color of a note. * @param noteId the id of the note in question - * @return the background color as a QString + * @return the background color as a TQString */ virtual TQString bgColor( const TQString& noteId ) const = 0; @@ -121,14 +121,14 @@ k_dcop: /** * Returns the title/name of a note. * @param noteId the id of the note in question - * @return the name as a QString + * @return the name as a TQString */ virtual TQString name( const TQString& noteId ) const = 0; /** * Returns the text of a note. * @param noteId the id of the note in question - * @return the body as a QString + * @return the body as a TQString */ virtual TQString text( const TQString& noteId ) const = 0; diff --git a/knotes/KNotesIface.h b/knotes/KNotesIface.h index dc9cd41d..1fba1860 100644 --- a/knotes/KNotesIface.h +++ b/knotes/KNotesIface.h @@ -39,8 +39,8 @@ k_dcop: * @param text the body of the new note * @return the new notes' id */ - virtual TQString newNote( const TQString& name = TQString::null, - const TQString& text = TQString::null ) = 0; + virtual TQString newNote( const TQString& name = TQString(), + const TQString& text = TQString() ) = 0; /** * Create a new note and inserts the current text in the clipboard @@ -50,7 +50,7 @@ k_dcop: * KNotes will choose an appropriate name * @return the new notes' id */ - virtual TQString newNoteFromClipboard( const TQString& name = TQString::null ) = 0; + virtual TQString newNoteFromClipboard( const TQString& name = TQString() ) = 0; /** * Deletes a note forever. @@ -88,14 +88,14 @@ k_dcop: /** * Returns the title/name of a note. * @param noteId the id of the note in question - * @return the name as a QString + * @return the name as a TQString */ virtual TQString name( const TQString& noteId ) const = 0; /** * Returns the text of a note. * @param noteId the id of the note in question - * @return the body as a QString + * @return the body as a TQString */ virtual TQString text( const TQString& noteId ) const = 0; }; diff --git a/knotes/knote.cpp b/knotes/knote.cpp index d4ce67b5..0f0ec426 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -81,10 +81,10 @@ extern Time qt_x_time; int KNote::s_ppOffset = 0; -KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *name ) - : TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ), +KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ), m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ), - m_config( 0 ), m_journal( j ), m_find( 0 ), + m_config( 0 ), m_journal( j ), m_tqfind( 0 ), m_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ), m_busy( 0 ), m_deleteWhenIdle( false ), m_blockEmitDataChanged( false ) { @@ -266,7 +266,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * bool closeLeft = false; m_kwinConf->setGroup( "Style" ); if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) ) - closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1; + closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).tqfind( 'X' ) > -1; TQPixmap pushpin_pix; if ( closeLeft ) @@ -564,7 +564,7 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg ) // set the color for the selection used to highlight the find stuff TQColor sel = palette().color( TQPalette::Active, TQColorGroup::Base ).dark(); - if ( sel == Qt::black ) + if ( sel == TQt::black ) sel = palette().color( TQPalette::Active, TQColorGroup::Base ).light(); m_editor->setSelectionAttributes( 1, sel, true ); @@ -577,33 +577,33 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg ) emit sigColorChanged(); } -void KNote::find( const TQString& pattern, long options ) +void KNote::tqfind( const TQString& pattern, long options ) { - delete m_find; - m_find = new KFind( pattern, options, this ); + delete m_tqfind; + m_tqfind = new KFind( pattern, options, this ); - connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )), + connect( m_tqfind, TQT_SIGNAL(highlight( const TQString &, int, int )), this, TQT_SLOT(slotHighlight( const TQString &, int, int )) ); - connect( m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) ); + connect( m_tqfind, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) ); - m_find->setData( plainText() ); + m_tqfind->setData( plainText() ); slotFindNext(); } void KNote::slotFindNext() { // TODO: honor FindBackwards - // TODO: dialogClosed() -> delete m_find + // TODO: dialogClosed() -> delete m_tqfind // Let KFind inspect the text fragment, and display a dialog if a match is found - KFind::Result res = m_find->find(); + KFind::Result res = m_tqfind->tqfind(); if ( res == KFind::NoMatch ) // i.e. at end-pos { m_editor->removeSelection( 1 ); emit sigFindFinished(); - delete m_find; - m_find = 0; + delete m_tqfind; + m_tqfind = 0; } else { @@ -712,7 +712,7 @@ void KNote::slotRename() bool ok; aboutToEnterEventLoop(); TQString oldName = m_label->text(); - TQString newName = KInputDialog::getText( TQString::null, + TQString newName = KInputDialog::getText( TQString(), i18n("Please enter the new name:"), m_label->text(), &ok, this ); eventLoopLeft(); m_blockEmitDataChanged = false; @@ -876,7 +876,7 @@ void KNote::slotSaveAs() convert->setText( i18n("Save note as plain text") ); } - KFileDialog dlg( TQString::null, TQString::null, this, "filedialog", true, convert ); + KFileDialog dlg( TQString(), TQString(), this, "filedialog", true, convert ); dlg.setOperationMode( KFileDialog::Saving ); dlg.setCaption( i18n("Save As") ); aboutToEnterEventLoop(); @@ -984,7 +984,7 @@ void KNote::slotUpdateDesktopActions() TQStringList desktops; desktops.append( i18n("&All Desktops") ); - desktops.append( TQString::null ); // Separator + desktops.append( TQString() ); // Separator int count = wm_root.numberOfDesktops(); for ( int n = 1; n <= count; n++ ) @@ -1021,7 +1021,7 @@ void KNote::createFold() { TQPixmap fold( 15, 15 ); TQPainter foldp( &fold ); - foldp.setPen( Qt::NoPen ); + foldp.setPen( TQt::NoPen ); foldp.setBrush( palette().active().dark() ); TQPointArray foldpoints( 3 ); foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 ); @@ -1136,7 +1136,7 @@ void KNote::updateBackground( int y_offset ) y_offset = y_offset % h; TQImage grad_img( w, h, 32 ); - QRgb rgbcol; + TQRgb rgbcol; TQColor bg = palette().active().background(); for ( int i = 0; i < h; ++i ) @@ -1155,7 +1155,7 @@ void KNote::updateBackground( int y_offset ) } // setPaletteBackgroundPixmap makes TQTextEdit::color() stop working!! - m_editor->setPaper( TQBrush( Qt::black, TQPixmap( grad_img ) ) ); + m_editor->setPaper( TQBrush( TQt::black, TQPixmap( grad_img ) ) ); } void KNote::updateLayout() @@ -1166,7 +1166,7 @@ void KNote::updateLayout() m_kwinConf->setGroup( "Style" ); if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) ) - closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1; + closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).tqfind( 'X' ) > -1; if ( s_ppOffset ) { diff --git a/knotes/knote.h b/knotes/knote.h index 6bb2ffe8..eb548955 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -51,8 +51,9 @@ namespace KCal { class KNote : public TQFrame, virtual public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0, + KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *tqparent = 0, const char *name = 0 ); ~KNote(); @@ -73,7 +74,7 @@ public: TQColor bgColor() const; void setColor( const TQColor& fg, const TQColor& bg ); - void find( const TQString& pattern, long options ); + void tqfind( const TQString& pattern, long options ); bool isModified() const; @@ -164,7 +165,7 @@ private: KNoteConfig *m_config; KCal::Journal *m_journal; - KFind *m_find; + KFind *m_tqfind; KPopupMenu *m_menu; KPopupMenu *m_edit_menu; diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 2652af63..ca4d74e8 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,8 +45,8 @@ #include "knotealarmdlg.h" -KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok ) +KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok ) { TQVBox *page = makeVBoxMainWidget(); TQGroupBox *group = new TQGroupBox( 3, Vertical, i18n("Scheduled Alarm"), page ); diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h index 9e97ee76..7d06d6c0 100644 --- a/knotes/knotealarmdlg.h +++ b/knotes/knotealarmdlg.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,8 +46,9 @@ namespace KCal { class KNoteAlarmDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); + KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 ); void setIncidence( KCal::Journal *journal ); diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 230ba4d4..d9a6205e 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -30,8 +30,8 @@ #include "knotebutton.h" -KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name ) - : TQPushButton( parent, name ) +KNoteButton::KNoteButton( const TQString& icon, TQWidget *tqparent, const char *name ) + : TQPushButton( tqparent, name ) { setFocusPolicy( NoFocus ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h index 735fc107..594727ba 100644 --- a/knotes/knotebutton.h +++ b/knotes/knotebutton.h @@ -28,11 +28,12 @@ class TQEvent; class TQResizeEvent; -class KNoteButton: public QPushButton +class KNoteButton: public TQPushButton { Q_OBJECT + TQ_OBJECT public: - KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 ); + KNoteButton( const TQString& icon, TQWidget *tqparent=0, const char *name=0 ); ~KNoteButton(); virtual TQSize tqsizeHint() const; diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index a8833709..950b9a9b 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -42,8 +42,8 @@ KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title, - TQWidget *parent, const char *name ) - : KConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList, + TQWidget *tqparent, const char *name ) + : KConfigDialog( tqparent, name, config ? config : KNotesGlobalConfig::self(), IconList, config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok ) { setCaption( title ); diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h index c2220a56..71756082 100644 --- a/knotes/knoteconfigdlg.h +++ b/knotes/knoteconfigdlg.h @@ -30,9 +30,10 @@ class KNoteConfig; class KNoteConfigDlg : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: KNoteConfigDlg( KNoteConfig *config, const TQString &title, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~KNoteConfigDlg(); public slots: diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index d89cfd37..2796c297 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -36,8 +36,8 @@ static const short SEP = 5; static const short ICON_SIZE = 10; -KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *name ) - : KTextEdit( parent, name ), m_note( 0 ) +KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char *name ) + : KTextEdit( tqparent, name ), m_note( 0 ) { setAcceptDrops( true ); setWordWrap( WidgetWidth ); @@ -117,7 +117,7 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char * m_textSuper->setExclusiveGroup( "valign" ); m_textSub->setExclusiveGroup( "valign" ); -// There is no easy possibility to implement text indenting with QTextEdit +// 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()), @@ -219,7 +219,7 @@ void KNoteEdit::setTextFormat( TextFormat f ) TQString t = text(); KTextEdit::setTextFormat( f ); - // if the note tqcontains html/xml source try to display it, otherwise + // if the note contains html/xml source try to display it, otherwise // get the modified text again and set it to preserve newlines if ( TQStyleSheet::mightBeRichText( t ) ) setText( t ); @@ -451,7 +451,7 @@ void KNoteEdit::autoIndent() // This routine returns the whitespace before the first non white space // character in string. - // It is assumed that string tqcontains at least one non whitespace character + // It is assumed that string contains at least one non whitespace character // ie \n \r \t \v \f and space TQString indentString; diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h index 2e183bfc..959dee65 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -38,8 +38,9 @@ class KFontSizeAction; class KNoteEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 ); + KNoteEdit( KActionCollection *actions, TQWidget *tqparent=0, const char *name=0 ); ~KNoteEdit(); void setNote( KNote *_note ) { m_note = _note; diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index e78894ea..f00be4c5 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,8 +46,8 @@ #include "knotesglobalconfig.h" -KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok, true ) +KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); (void)new TQLabel( i18n("Hostname or IP address:"), page ); diff --git a/knotes/knotehostdlg.h b/knotes/knotehostdlg.h index 1e8c79ff..91959dc9 100644 --- a/knotes/knotehostdlg.h +++ b/knotes/knotehostdlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,8 +44,9 @@ class KHistoryCombo; class KNoteHostDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); + KNoteHostDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 ); ~KNoteHostDlg(); TQString host() const; diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp index 593ed8f7..69ddb35b 100644 --- a/knotes/knoteprinter.cpp +++ b/knotes/knoteprinter.cpp @@ -71,7 +71,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter, { const int margin = 40; // pt - TQPaintDeviceMetrics metrics( painter.device() ); + TQPaintDeviceMetrics metrics( painter.tqdevice() ); int marginX = margin * metrics.logicalDpiX() / 72; int marginY = margin * metrics.logicalDpiY() / 72; diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index 1f9e22e7..b248bdeb 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,8 +42,8 @@ #include "knotesglobalconfig.h" -KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, const char *name ) - : TQObject( parent, name ), +KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), m_manager( manager ), m_checkTimer( 0, "m_checkTimer" ) { @@ -67,7 +67,7 @@ void KNotesAlarm::checkAlarms() TQValueList<KCal::Alarm *>::ConstIterator it; for ( it = alarms.constBegin(); it != alarms.constEnd(); ++it ) { - KCal::Incidence *incidence = (*it)->parent(); + KCal::Incidence *incidence = (*it)->tqparent(); notes += incidence->summary(); } diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h index 993c8490..ea022595 100644 --- a/knotes/knotesalarm.h +++ b/knotes/knotesalarm.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,11 +42,12 @@ namespace KCal { } -class KNotesAlarm : public QObject +class KNotesAlarm : public TQObject { Q_OBJECT + TQ_OBJECT public: - KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 ); + KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent = 0, const char *name = 0 ); private slots: void checkAlarms(); diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 231afede..79a3ca99 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -60,8 +60,8 @@ using namespace KNetwork; class KNotesKeyDialog : public KDialogBase { public: - KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) - : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) + KNotesKeyDialog( KGlobalAccel *globals, TQWidget *tqparent, const char* name = 0 ) + : KDialogBase( tqparent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) { m_keyChooser = new KKeyChooser( globals, this ); setMainWidget( m_keyChooser ); @@ -94,7 +94,7 @@ int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCol KNotesApp::KNotesApp() : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ), - m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 ) + m_alarm( 0 ), m_listener( 0 ), m_tqfind( 0 ), m_findPos( 0 ) { connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) ); @@ -121,7 +121,7 @@ KNotesApp::KNotesApp() this, TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); - m_findAction = KStdAction::find( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() ); + m_findAction = KStdAction::tqfind( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() ); KStdAction::preferences( this, TQT_SLOT(slotPreferences()), actionCollection() ); KStdAction::keyBindings( this, TQT_SLOT(slotConfigureAccels()), actionCollection() ); //FIXME: no shortcut removing!? @@ -236,7 +236,7 @@ KNotesApp::~KNotesApp() delete m_guiBuilder; } -bool KNotesApp::commitData( QSessionManager& ) +bool KNotesApp::commitData( TQSessionManager& ) { saveConfigs(); return true; @@ -336,7 +336,7 @@ TQString KNotesApp::name( const TQString& id ) const if ( note ) return note->name(); else - return TQString::null; + return TQString(); } TQString KNotesApp::text( const TQString& id ) const @@ -345,7 +345,7 @@ TQString KNotesApp::text( const TQString& id ) const if ( note ) return note->text(); else - return TQString::null; + return TQString(); } void KNotesApp::setName( const TQString& id, const TQString& newName ) @@ -372,7 +372,7 @@ TQString KNotesApp::fgColor( const TQString& id ) const if ( note ) return note->fgColor().name(); else - return TQString::null; + return TQString(); } TQString KNotesApp::bgColor( const TQString& id ) const @@ -381,7 +381,7 @@ TQString KNotesApp::bgColor( const TQString& id ) const if ( note ) return note->bgColor().name(); else - return TQString::null; + return TQString(); } void KNotesApp::setColor( const TQString& id, const TQString& fgColor, const TQString& bgColor ) @@ -521,8 +521,8 @@ void KNotesApp::slotOpenFindDialog() m_findPos = new TQDictIterator<KNote>( m_noteList ); // this could be in an own method if searching without a dialog should be possible - delete m_find; - m_find = new KFind( findDia.pattern(), findDia.options(), this ); + delete m_tqfind; + m_tqfind = new KFind( findDia.pattern(), findDia.options(), this ); slotFindNext(); } @@ -533,13 +533,13 @@ void KNotesApp::slotFindNext() { KNote *note = **m_findPos; ++*m_findPos; - note->find( m_find->pattern(), m_find->options() ); + note->tqfind( m_tqfind->pattern(), m_tqfind->options() ); } else { - m_find->displayFinalDialog(); - delete m_find; - m_find = 0; + m_tqfind->displayFinalDialog(); + delete m_tqfind; + m_tqfind = 0; delete m_findPos; m_findPos = 0; } diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h index 3048958d..fc167ddf 100644 --- a/knotes/knotesapp.h +++ b/knotes/knotesapp.h @@ -56,6 +56,7 @@ class KNotesApp : public TQLabel, public KSessionManaged, virtual public KXMLGUI virtual public KNotesAppIface { Q_OBJECT + TQ_OBJECT public: KNotesApp(); ~KNotesApp(); @@ -90,12 +91,12 @@ public: bool isNew( const TQString& app, const TQString& id ) const; bool isModified( const TQString& app, const TQString& id ) const; - bool commitData( QSessionManager& ); + bool commitData( TQSessionManager& ); public slots: - TQString newNote( const TQString& name = TQString::null, - const TQString& text = TQString::null ); - TQString newNoteFromClipboard( const TQString& name = TQString::null ); + TQString newNote( const TQString& name = TQString(), + const TQString& text = TQString() ); + TQString newNoteFromClipboard( const TQString& name = TQString() ); void hideAllNotes() const; void showAllNotes() const; @@ -149,7 +150,7 @@ private: TQDict<KNote> m_noteList; KNoteActionList m_noteActions; - KFind *m_find; + KFind *m_tqfind; TQDictIterator<KNote> *m_findPos; KPopupMenu *m_note_menu; diff --git a/knotes/knotesappui.rc b/knotes/knotesappui.rc index d5d68273..a49a9028 100644 --- a/knotes/knotesappui.rc +++ b/knotes/knotesappui.rc @@ -7,7 +7,7 @@ <Action name="new_note"/> <Action name="new_note_clipboard"/> <Separator/> - <Action name="edit_find"/> + <Action name="edit_tqfind"/> <Separator/> <Action name="show_all_notes"/> <Action name="hide_all_notes"/> diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index c51330fa..129517b3 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -177,7 +177,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir, if ( fontfamily.isEmpty() ) fontfamily = TQString( "Sans Serif" ); uint size = input.readLine().toUInt(); - size = QMAX( size, 4 ); + size = TQMAX( size, 4 ); uint weight = input.readLine().toUInt(); bool italic = ( input.readLine().toUInt() == 1 ); TQFont font( fontfamily, size, weight, italic ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 259f9d36..ce4aafa4 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -130,7 +130,7 @@ void KNotesNetworkReceiver::slotConnectionClosed() TQString noteText = TQString( *m_buffer ).stripWhiteSpace(); // First line is the note title or, in case of ATnotes, the id - int pos = noteText.find( TQRegExp("[\r\n]") ); + int pos = noteText.tqfind( TQRegExp("[\r\n]") ); TQString noteTitle = noteText.left( pos ).stripWhiteSpace() + m_titleAddon; noteText = noteText.mid( pos ).stripWhiteSpace(); diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h index fdb84353..9f1cfdbb 100644 --- a/knotes/knotesnetrecv.h +++ b/knotes/knotesnetrecv.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ namespace KNetwork { } -class KNotesNetworkReceiver : public QObject +class KNotesNetworkReceiver : public TQObject { Q_OBJECT + TQ_OBJECT public: KNotesNetworkReceiver( KNetwork::KBufferedSocket * ); ~KNotesNetworkReceiver(); diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index a08be4d0..fafcebac 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h index 37a5233b..012b5eb0 100644 --- a/knotes/knotesnetsend.h +++ b/knotes/knotesnetsend.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,6 +43,7 @@ using namespace KNetwork; class KNotesNetworkSender : public KNetwork::KBufferedSocket { Q_OBJECT + TQ_OBJECT public: KNotesNetworkSender( const TQString& host, int port ); diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index 81c33489..96036212 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/knotes/resourcelocal.h b/knotes/resourcelocal.h index 0262674b..baeb710e 100644 --- a/knotes/resourcelocal.h +++ b/knotes/resourcelocal.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/knotes/resourcelocal_plugin.cpp b/knotes/resourcelocal_plugin.cpp index 0670956b..dcb3fa9a 100644 --- a/knotes/resourcelocal_plugin.cpp +++ b/knotes/resourcelocal_plugin.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,9 +43,9 @@ public: return new ResourceLocal( config ); } - KRES::ConfigWidget *configWidget( TQWidget *parent ) + KRES::ConfigWidget *configWidget( TQWidget *tqparent ) { - return new ResourceLocalConfig(parent); + return new ResourceLocalConfig(tqparent); } }; @@ -56,9 +56,9 @@ extern "C" return new LocalNotesFactory(); } - KRES::ConfigWidget *config_widget( TQWidget* parent ) + KRES::ConfigWidget *config_widget( TQWidget* tqparent ) { - return new ResourceLocalConfig( parent, "Configure Local Resource" ); + return new ResourceLocalConfig( tqparent, "Configure Local Resource" ); } KRES::Resource *resource( const KConfig* config ) diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index 207730a1..c24e672a 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -29,8 +29,8 @@ #include "resourcelocal.h" #include "resourcelocalconfig.h" -ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent, const char *name ) - : KRES::ConfigWidget( parent, name ) +ResourceLocalConfig::ResourceLocalConfig( TQWidget *tqparent, const char *name ) + : KRES::ConfigWidget( tqparent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h index 242b34a4..dfc1b677 100644 --- a/knotes/resourcelocalconfig.h +++ b/knotes/resourcelocalconfig.h @@ -28,8 +28,9 @@ class KURLRequester; class ResourceLocalConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceLocalConfig( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~ResourceLocalConfig(); public slots: diff --git a/knotes/resourcemanager.cpp b/knotes/resourcemanager.cpp index 226d9000..4ede5b82 100644 --- a/knotes/resourcemanager.cpp +++ b/knotes/resourcemanager.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h index a864fc38..e4476ced 100644 --- a/knotes/resourcemanager.h +++ b/knotes/resourcemanager.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,6 +50,7 @@ namespace KCal { class KNotesResourceManager : public TQObject, public KRES::ManagerObserver<ResourceNotes> { Q_OBJECT + TQ_OBJECT public: KNotesResourceManager(); virtual ~KNotesResourceManager(); diff --git a/knotes/resourcenotes.cpp b/knotes/resourcenotes.cpp index 4295396c..13114272 100644 --- a/knotes/resourcenotes.cpp +++ b/knotes/resourcenotes.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h index 988c8dde..4fbf3b98 100644 --- a/knotes/resourcenotes.h +++ b/knotes/resourcenotes.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. |