diff options
Diffstat (limited to 'knotes')
-rw-r--r-- | knotes/ChangeLog | 4 | ||||
-rw-r--r-- | knotes/knote.cpp | 18 | ||||
-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 | 4 | ||||
-rw-r--r-- | knotes/knoteconfigdlg.h | 2 | ||||
-rw-r--r-- | knotes/knoteedit.cpp | 4 | ||||
-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 | 6 | ||||
-rw-r--r-- | knotes/knotesalarm.h | 2 | ||||
-rw-r--r-- | knotes/knotesapp.cpp | 4 | ||||
-rw-r--r-- | knotes/resourcelocal_plugin.cpp | 8 | ||||
-rw-r--r-- | knotes/resourcelocalconfig.cpp | 4 | ||||
-rw-r--r-- | knotes/resourcelocalconfig.h | 2 |
19 files changed, 40 insertions, 40 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog index fb3918281..6353a107f 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -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 tqparent will be the widgets' tqparent + the builder's parent will be the widgets' parent * 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 tqparent of the config dialog -> fixes jumping to another + set KNotesApp as parent of the config dialog -> fixes jumping to another desktop when opening the config dialog 2004/03/13 Michael Brade <brade@kde.org> diff --git a/knotes/knote.cpp b/knotes/knote.cpp index f5ebfe3bf..8a260576c 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -79,8 +79,8 @@ using namespace KCal; int KNote::s_ppOffset = 0; -KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ), +KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *name ) + : TQFrame( parent, 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_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ), @@ -200,17 +200,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char m_editor->setCornerWidget( new TQSizeGrip( this ) ); uint width = m_editor->cornerWidget()->width(); uint height = m_editor->cornerWidget()->height(); - TQBitmap tqmask; - tqmask.resize( width, height ); - tqmask.fill( color0 ); + TQBitmap mask; + mask.resize( width, height ); + mask.fill( color0 ); TQPointArray array; array.setPoints( 3, 0, height, width, height, width, 0 ); TQPainter p; - p.begin( &tqmask ); + p.begin( &mask ); p.setBrush( color1 ); p.drawPolygon( array ); p.end(); - m_editor->cornerWidget()->setMask( tqmask ); + m_editor->cornerWidget()->setMask( mask ); m_editor->cornerWidget()->setBackgroundMode( PaletteBase ); // the config file location @@ -319,7 +319,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char // read configuration settings... slotApplyConfig(); - // create the tqmask for the fold---to be done after slotApplyConfig(), + // create the mask for the fold---to be done after slotApplyConfig(), // which calls createFold() m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) ); @@ -1101,7 +1101,7 @@ void KNote::updateMask() int h = height(); TQRegion reg( 0, s_ppOffset, w, h - s_ppOffset ); - const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->tqmask(); + const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->mask(); TQRegion pushpin_reg( *pushpin_bitmap ); m_pushpin->setMask( pushpin_reg ); pushpin_reg.translate( m_pushpin->x(), m_pushpin->y() ); diff --git a/knotes/knote.h b/knotes/knote.h index 50a007dad..027c88d59 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -53,7 +53,7 @@ class KNote : public TQFrame, virtual public KXMLGUIClient Q_OBJECT TQ_OBJECT public: - KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *tqparent = 0, + KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0, const char *name = 0 ); ~KNote(); diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 6ce39e4a0..5ca8a453a 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -45,8 +45,8 @@ #include "knotealarmdlg.h" -KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok ) +KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok ) { TQVBox *page = makeVBoxMainWidget(); TQGroupBox *group = new TQGroupBox( 3, Qt::Vertical, i18n("Scheduled Alarm"), page ); diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h index 7d06d6c0f..888da8a63 100644 --- a/knotes/knotealarmdlg.h +++ b/knotes/knotealarmdlg.h @@ -48,7 +48,7 @@ class KNoteAlarmDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 ); + KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); void setIncidence( KCal::Journal *journal ); diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index b1f28f2f2..5dc5009e0 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -30,8 +30,8 @@ #include "knotebutton.h" -KNoteButton::KNoteButton( const TQString& icon, TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) +KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) { setFocusPolicy( TQ_NoFocus ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h index 594727ba5..6a9f7e5bf 100644 --- a/knotes/knotebutton.h +++ b/knotes/knotebutton.h @@ -33,7 +33,7 @@ class KNoteButton: public TQPushButton Q_OBJECT TQ_OBJECT public: - KNoteButton( const TQString& icon, TQWidget *tqparent=0, const char *name=0 ); + KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 ); ~KNoteButton(); virtual TQSize tqsizeHint() const; diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index abb379a03..617d90ab0 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -42,8 +42,8 @@ KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title, - TQWidget *tqparent, const char *name ) - : KConfigDialog( tqparent, name, config ? config : KNotesGlobalConfig::self(), IconList, + TQWidget *parent, const char *name ) + : KConfigDialog( parent, 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 71756082c..a74ed2a0f 100644 --- a/knotes/knoteconfigdlg.h +++ b/knotes/knoteconfigdlg.h @@ -33,7 +33,7 @@ class KNoteConfigDlg : public KConfigDialog TQ_OBJECT public: KNoteConfigDlg( KNoteConfig *config, const TQString &title, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~KNoteConfigDlg(); public slots: diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 93a142299..c0647e6de 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 *tqparent, const char *name ) - : KTextEdit( tqparent, name ), m_note( 0 ) +KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *name ) + : KTextEdit( parent, name ), m_note( 0 ) { setAcceptDrops( true ); setWordWrap( WidgetWidth ); diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h index dfceaef85..da45b0007 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -40,7 +40,7 @@ class KNoteEdit : public KTextEdit Q_OBJECT TQ_OBJECT public: - KNoteEdit( KActionCollection *actions, TQWidget *tqparent=0, const char *name=0 ); + KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 ); ~KNoteEdit(); void setNote( KNote *_note ) { m_note = _note; diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index f00be4c5f..3b8b8f50f 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -46,8 +46,8 @@ #include "knotesglobalconfig.h" -KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok, true ) +KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const char *name ) + : KDialogBase( parent, 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 91959dc9c..279e67f6e 100644 --- a/knotes/knotehostdlg.h +++ b/knotes/knotehostdlg.h @@ -46,7 +46,7 @@ class KNoteHostDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KNoteHostDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 ); + KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); ~KNoteHostDlg(); TQString host() const; diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index b248bdebc..5d8b0de28 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -42,8 +42,8 @@ #include "knotesglobalconfig.h" -KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), +KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, const char *name ) + : TQObject( parent, 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)->tqparent(); + KCal::Incidence *incidence = (*it)->parent(); notes += incidence->summary(); } diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h index ea0225954..dc8ff2782 100644 --- a/knotes/knotesalarm.h +++ b/knotes/knotesalarm.h @@ -47,7 +47,7 @@ class KNotesAlarm : public TQObject Q_OBJECT TQ_OBJECT public: - KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent = 0, const char *name = 0 ); + KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 ); private slots: void checkAlarms(); diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 7b38121c3..3ea8caea6 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 *tqparent, const char* name = 0 ) - : KDialogBase( tqparent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) + KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) + : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) { m_keyChooser = new KKeyChooser( globals, this ); setMainWidget( m_keyChooser ); diff --git a/knotes/resourcelocal_plugin.cpp b/knotes/resourcelocal_plugin.cpp index dcb3fa9a3..846a5a3a6 100644 --- a/knotes/resourcelocal_plugin.cpp +++ b/knotes/resourcelocal_plugin.cpp @@ -43,9 +43,9 @@ public: return new ResourceLocal( config ); } - KRES::ConfigWidget *configWidget( TQWidget *tqparent ) + KRES::ConfigWidget *configWidget( TQWidget *parent ) { - return new ResourceLocalConfig(tqparent); + return new ResourceLocalConfig(parent); } }; @@ -56,9 +56,9 @@ extern "C" return new LocalNotesFactory(); } - KRES::ConfigWidget *config_widget( TQWidget* tqparent ) + KRES::ConfigWidget *config_widget( TQWidget* parent ) { - return new ResourceLocalConfig( tqparent, "Configure Local Resource" ); + return new ResourceLocalConfig( parent, "Configure Local Resource" ); } KRES::Resource *resource( const KConfig* config ) diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index c24e672a5..207730a14 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -29,8 +29,8 @@ #include "resourcelocal.h" #include "resourcelocalconfig.h" -ResourceLocalConfig::ResourceLocalConfig( TQWidget *tqparent, const char *name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent, const char *name ) + : KRES::ConfigWidget( parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h index dfc1b6773..ee4a987b9 100644 --- a/knotes/resourcelocalconfig.h +++ b/knotes/resourcelocalconfig.h @@ -30,7 +30,7 @@ class ResourceLocalConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceLocalConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 ); virtual ~ResourceLocalConfig(); public slots: |