From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knotes/Makefile.am | 2 +- knotes/knote.cpp | 30 +++++++++---------- knotes/knotebutton.cpp | 16 +++++----- knotes/knotebutton.h | 2 +- knotes/knoteconfigdlg.cpp | 66 +++++++++++++++++++++--------------------- knotes/knoteedit.cpp | 16 +++++----- knotes/knoteedit.h | 2 +- knotes/knoteprinter.cpp | 10 +++---- knotes/knoteprinter.h | 6 ++-- knotes/knotesalarm.cpp | 2 +- knotes/knotesapp.cpp | 10 +++---- knotes/knoteslegacy.cpp | 2 +- knotes/knotesnetrecv.cpp | 2 +- knotes/knotesnetsend.cpp | 2 +- knotes/resourcelocal.cpp | 2 +- knotes/resourcelocalconfig.cpp | 6 ++-- 16 files changed, 88 insertions(+), 88 deletions(-) (limited to 'knotes') diff --git a/knotes/Makefile.am b/knotes/Makefile.am index 73f678a18..0f3eb458f 100644 --- a/knotes/Makefile.am +++ b/knotes/Makefile.am @@ -35,7 +35,7 @@ kde_module_LTLIBRARIES = knotes_local.la knotes_local_la_SOURCES = resourcelocal_plugin.cpp knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) knotes_local_la_LIBADD = libknotesresources.la libknotesconfig.la libknotesprinting.la \ - $(top_builddir)/libkcal/libkcal.la -lkdeprint + $(top_builddir)/libkcal/libkcal.la -lkdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources METASOURCES = AUTO diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 9e644d7a6..d4ce67b50 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -202,17 +202,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * m_editor->setCornerWidget( new TQSizeGrip( this ) ); uint width = m_editor->cornerWidget()->width(); uint height = m_editor->cornerWidget()->height(); - TQBitmap mask; - mask.resize( width, height ); - mask.fill( color0 ); + TQBitmap tqmask; + tqmask.resize( width, height ); + tqmask.fill( color0 ); TQPointArray array; array.setPoints( 3, 0, height, width, height, width, 0 ); TQPainter p; - p.begin( &mask ); + p.begin( &tqmask ); p.setBrush( color1 ); p.drawPolygon( array ); p.end(); - m_editor->cornerWidget()->setMask( mask ); + m_editor->cornerWidget()->setMask( tqmask ); m_editor->cornerWidget()->setBackgroundMode( PaletteBase ); // the config file location @@ -321,7 +321,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // read configuration settings... slotApplyConfig(); - // create the mask for the fold---to be done after slotApplyConfig(), + // create the tqmask for the fold---to be done after slotApplyConfig(), // which calls createFold() m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) ); @@ -774,7 +774,7 @@ void KNote::slotClose() void KNote::slotInsDate() { - m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) ); + m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()) ); } void KNote::slotSetAlarm() @@ -861,7 +861,7 @@ void KNote::slotPrint() printer.setFont( m_config->font() ); printer.setContext( m_editor->context() ); printer.setStyleSheet( m_editor->styleSheet() ); - printer.setColorGroup( colorGroup() ); + printer.tqsetColorGroup( tqcolorGroup() ); printer.printNote( TQString(), content ); } @@ -1035,9 +1035,9 @@ void KNote::updateLabelAlignment() // if the name is too long to fit, left-align it, otherwise center it (#59028) TQString labelText = m_label->text(); if ( m_label->fontMetrics().boundingRect( labelText ).width() > m_label->width() ) - m_label->setAlignment( AlignLeft ); + m_label->tqsetAlignment( AlignLeft ); else - m_label->setAlignment( AlignHCenter ); + m_label->tqsetAlignment( AlignHCenter ); } void KNote::updateFocus() @@ -1100,7 +1100,7 @@ void KNote::updateMask() int h = height(); TQRegion reg( 0, s_ppOffset, w, h - s_ppOffset ); - const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->mask(); + const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->tqmask(); TQRegion pushpin_reg( *pushpin_bitmap ); m_pushpin->setMask( pushpin_reg ); pushpin_reg.translate( m_pushpin->x(), m_pushpin->y() ); @@ -1120,7 +1120,7 @@ void KNote::updateBackground( int y_offset ) { if ( !s_ppOffset ) { - m_editor->setPaper( TQBrush( colorGroup().background() ) ); + m_editor->setPaper( TQBrush( tqcolorGroup().background() ) ); return; } @@ -1160,7 +1160,7 @@ void KNote::updateBackground( int y_offset ) void KNote::updateLayout() { - const int headerHeight = m_label->sizeHint().height(); + const int headerHeight = m_label->tqsizeHint().height(); const int margin = m_editor->margin(); bool closeLeft = false; @@ -1240,9 +1240,9 @@ void KNote::drawFrame( TQPainter *p ) TQRect r = frameRect(); r.setTop( s_ppOffset ); if ( s_ppOffset ) - qDrawShadePanel( p, r, colorGroup(), false, lineWidth() ); + qDrawShadePanel( p, r, tqcolorGroup(), false, lineWidth() ); else - qDrawWinPanel( p, r, colorGroup(), false ); + qDrawWinPanel( p, r, tqcolorGroup(), false ); } void KNote::showEvent( TQShowEvent * ) diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index b6cf49bc4..230ba4d44 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -34,7 +34,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na : TQPushButton( parent, name ) { setFocusPolicy( NoFocus ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); m_flat = true; @@ -49,18 +49,18 @@ KNoteButton::~KNoteButton() void KNoteButton::enterEvent( TQEvent * ) { m_flat = false; - repaint( false ); + tqrepaint( false ); } void KNoteButton::leaveEvent( TQEvent * ) { m_flat = true; - repaint(); + tqrepaint(); } -TQSize KNoteButton::sizeHint() const +TQSize KNoteButton::tqsizeHint() const { - return TQSize( TQPushButton::sizeHint().height(), TQPushButton::sizeHint().height() ); + return TQSize( TQPushButton::tqsizeHint().height(), TQPushButton::tqsizeHint().height() ); } void KNoteButton::drawButton( TQPainter* p ) @@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p ) if ( !m_flat ) flags |= TQStyle::Style_MouseOver; - style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), tqcolorGroup(), flags ); drawButtonLabel( p ); } @@ -102,8 +102,8 @@ void KNoteButton::drawButtonLabel( TQPainter* p ) // Shift button contents if pushed. if ( isOn() || isDown() ) { - dx += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + dx += style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + dy += style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } p->drawPixmap( dx, dy, pix ); diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h index 1825ce948..735fc1070 100644 --- a/knotes/knotebutton.h +++ b/knotes/knotebutton.h @@ -35,7 +35,7 @@ public: KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 ); ~KNoteButton(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent * ); diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index a1238768b..a88337090 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption() TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) { TQWidget *displayPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2, + TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" ); - layout->addWidget( label_FgColor, 0, 0 ); + tqlayout->addWidget( label_FgColor, 0, 0 ); KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" ); label_FgColor->setBuddy( kcfg_FgColor ); - layout->addWidget( kcfg_FgColor, 0, 1 ); + tqlayout->addWidget( kcfg_FgColor, 0, 1 ); TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" ); - layout->addWidget( label_BgColor, 1, 0 ); + tqlayout->addWidget( label_BgColor, 1, 0 ); KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" ); label_BgColor->setBuddy( kcfg_BgColor ); - layout->addWidget( kcfg_BgColor, 1, 1 ); + tqlayout->addWidget( kcfg_BgColor, 1, 1 ); TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"), displayPage, "kcfg_ShowInTaskbar" ); @@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) if ( defaults ) { TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" ); - layout->addWidget( label_Width, 2, 0 ); + tqlayout->addWidget( label_Width, 2, 0 ); KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" ); label_Width->setBuddy( kcfg_Width ); kcfg_Width->setRange( 50, 2000, 10, false ); - layout->addWidget( kcfg_Width, 2, 1 ); + tqlayout->addWidget( kcfg_Width, 2, 1 ); TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" ); - layout->addWidget( label_Height, 3, 0 ); + tqlayout->addWidget( label_Height, 3, 0 ); KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" ); kcfg_Height->setRange( 50, 2000, 10, false ); label_Height->setBuddy( kcfg_Height ); - layout->addWidget( kcfg_Height, 3, 1 ); + tqlayout->addWidget( kcfg_Height, 3, 1 ); - layout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); + tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); } else - layout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); + tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); return displayPage; } @@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults ) { TQWidget *editorPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3, + TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" ); - layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" ); kcfg_TabSize->setRange( 0, 40, 1, false ); label_TabSize->setBuddy( kcfg_TabSize ); - layout->addWidget( kcfg_TabSize, 0, 2 ); + tqlayout->addWidget( kcfg_TabSize, 0, 2 ); TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" ); - layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); + tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" ); - layout->addWidget( kcfg_RichText, 1, 2 ); + tqlayout->addWidget( kcfg_RichText, 1, 2 ); TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" ); - layout->addWidget( label_Font, 3, 0 ); + tqlayout->addWidget( label_Font, 3, 0 ); KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" ); - kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); + kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" ); - layout->addWidget( label_TitleFont, 2, 0 ); + tqlayout->addWidget( label_TitleFont, 2, 0 ); KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" ); - kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); + kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); return editorPage; } @@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage() TQWidget *KNoteConfigDlg::makeActionsPage() { TQWidget *actionsPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" ); - layout->addWidget( label_MailAction, 0, 0 ); + tqlayout->addWidget( label_MailAction, 0, 0 ); KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" ); label_MailAction->setBuddy( kcfg_MailAction ); - layout->addWidget( kcfg_MailAction, 0, 1 ); + tqlayout->addWidget( kcfg_MailAction, 0, 1 ); return actionsPage; } @@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage() TQWidget *KNoteConfigDlg::makeNetworkPage() { TQWidget *networkPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage ); - layout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" ); TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage ); - layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); + tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" ); KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" ); label_SenderID->setBuddy( kcfg_SenderID ); TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" ); - layout->addWidget( label_Port, 2, 0 ); + tqlayout->addWidget( label_Port, 2, 0 ); KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" ); kcfg_Port->setRange( 0, 65535, 1, false ); label_Port->setBuddy( kcfg_Port ); - layout->addWidget( kcfg_Port, 2, 1 ); + tqlayout->addWidget( kcfg_Port, 2, 1 ); return networkPage; } @@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage() TQWidget *KNoteConfigDlg::makeStylePage() { TQWidget *stylePage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" ); - layout->addWidget( label_Style, 0, 0 ); + tqlayout->addWidget( label_Style, 0, 0 ); TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" ); TQStringList list; list << "Plain" << "Fancy"; kcfg_Style->insertStringList( list ); label_Style->setBuddy( kcfg_Style ); - layout->addWidget( kcfg_Style, 0, 1 ); + tqlayout->addWidget( kcfg_Style, 0, 1 ); return stylePage; } diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 7b99254b0..d89cfd37e 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -149,7 +149,7 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char * connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), - this, TQT_SLOT(alignmentChanged( int )) ); + this, TQT_SLOT(tqalignmentChanged( int )) ); connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); } @@ -219,7 +219,7 @@ void KNoteEdit::setTextFormat( TextFormat f ) TQString t = text(); KTextEdit::setTextFormat( f ); - // if the note contains html/xml source try to display it, otherwise + // if the note tqcontains 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 ); @@ -298,25 +298,25 @@ void KNoteEdit::textColor() void KNoteEdit::textAlignLeft() { - setAlignment( AlignLeft ); + tqsetAlignment( AlignLeft ); m_textAlignLeft->setChecked( true ); } void KNoteEdit::textAlignCenter() { - setAlignment( AlignCenter ); + tqsetAlignment( AlignCenter ); m_textAlignCenter->setChecked( true ); } void KNoteEdit::textAlignRight() { - setAlignment( AlignRight ); + tqsetAlignment( AlignRight ); m_textAlignRight->setChecked( true ); } void KNoteEdit::textAlignBlock() { - setAlignment( AlignJustify ); + tqsetAlignment( AlignJustify ); m_textAlignBlock->setChecked( true ); } @@ -409,7 +409,7 @@ void KNoteEdit::colorChanged( const TQColor &c ) m_textColor->setIconSet( pix ); } -void KNoteEdit::alignmentChanged( int a ) +void KNoteEdit::tqalignmentChanged( int a ) { // TODO: AlignAuto if ( ( a == AlignAuto ) || ( a & AlignLeft ) ) @@ -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 contains at least one non whitespace character + // It is assumed that string tqcontains 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 0e6a6e4b4..2e183bfc2 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -81,7 +81,7 @@ private slots: void fontChanged( const TQFont &f ); void colorChanged( const TQColor &c ); - void alignmentChanged( int a ); + void tqalignmentChanged( int a ); void verticalAlignmentChanged( VerticalAlignment a ); void slotAllowTab(); diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp index c58031671..593ed8f72 100644 --- a/knotes/knoteprinter.cpp +++ b/knotes/knoteprinter.cpp @@ -46,14 +46,14 @@ TQFont KNotePrinter::font() const return m_font; } -void KNotePrinter::setColorGroup( const TQColorGroup& colorGroup ) +void KNotePrinter::tqsetColorGroup( const TQColorGroup& tqcolorGroup ) { - m_colorGroup = colorGroup; + m_tqcolorGroup = tqcolorGroup; } -TQColorGroup KNotePrinter::colorGroup() const +TQColorGroup KNotePrinter::tqcolorGroup() const { - return m_colorGroup; + return m_tqcolorGroup; } void KNotePrinter::setStyleSheet( TQStyleSheet* styleSheet ) @@ -93,7 +93,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter, for (;;) { - text.draw( &painter, body.left(), body.top(), view, m_colorGroup ); + text.draw( &painter, body.left(), body.top(), view, m_tqcolorGroup ); view.moveBy( 0, body.height() ); painter.translate( 0, -body.height() ); diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h index 632dd85a4..148a2ec45 100644 --- a/knotes/knoteprinter.h +++ b/knotes/knoteprinter.h @@ -27,8 +27,8 @@ public: void setFont( const TQFont& font ); TQFont font() const; - void setColorGroup( const TQColorGroup& colorGroup ); - TQColorGroup colorGroup() const; + void tqsetColorGroup( const TQColorGroup& tqcolorGroup ); + TQColorGroup tqcolorGroup() const; void setStyleSheet( TQStyleSheet* styleSheet ); TQStyleSheet* styleSheet() const; @@ -43,7 +43,7 @@ private: void doPrint( KPrinter& printer, TQPainter& painter, const TQString& content ) const; - TQColorGroup m_colorGroup; + TQColorGroup m_tqcolorGroup; TQFont m_font; TQStyleSheet* m_styleSheet; TQMimeSourceFactory* m_mimeSourceFactory; diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index 616c83b7c..1f9e22e7b 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -59,7 +59,7 @@ void KNotesAlarm::checkAlarms() if ( !from.isValid() ) from.setTime_t( 0 ); - KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::currentDateTime() ); + KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::tqcurrentDateTime() ); TQValueList alarms = m_manager->alarms( from, KNotesGlobalConfig::self()->alarmsLastChecked() ); if( alarms.isEmpty()) return; diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 72b1ecce1..231afede7 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -138,7 +138,7 @@ KNotesApp::KNotesApp() // get the most recent XML UI file TQString xmlFileName = instance()->instanceName() + "ui.rc"; - TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + xmlFileName; + TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + xmlFileName; TQStringList fileList = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", xmlFileName ); @@ -183,7 +183,7 @@ KNotesApp::KNotesApp() m_manager->load(); // read the old config files, convert and add them - KCal::CalendarLocal calendar( TQString::fromLatin1( "UTC" ) ); + KCal::CalendarLocal calendar( TQString::tqfromLatin1( "UTC" ) ); if ( KNotesLegacy::convert( &calendar ) ) { KCal::Journal::List notes = calendar.journals(); @@ -253,7 +253,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); // the body of the note journal->setDescription( text ); @@ -460,7 +460,7 @@ bool KNotesApp::isModified( const TQString& app, const TQString& id ) const void KNotesApp::mousePressEvent( TQMouseEvent* e ) { - if ( !rect().contains( e->pos() ) ) + if ( !rect().tqcontains( e->pos() ) ) return; switch ( e->button() ) @@ -703,7 +703,7 @@ void KNotesApp::updateNoteActions() for ( TQDictIterator it( m_noteList ); it.current(); ++it ) { - KAction *action = new KAction( it.current()->name().replace("&", "&&"), + KAction *action = new KAction( it.current()->name().tqreplace("&", "&&"), KShortcut(), this, TQT_SLOT(slotShowNote()), (TQObject *)0, it.current()->noteId().utf8() ); diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 6dd80368f..c51330faa 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -156,7 +156,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir, config.readConfig(); config.setVersion( KNOTES_VERSION ); - // get the geometry + // get the tqgeometry config.setWidth( props[3].toUInt() ); config.setHeight( props[4].toUInt() ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 0a261252b..259f9d361 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -61,7 +61,7 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s ) : TQObject(), m_buffer( new TQByteArray() ), m_sock( s ) { - TQString date = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false ); + TQString date = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, false ); // Add the remote IP or hostname and the date to the title, to help the // user guess who wrote it. diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index 86246407b..a08be4d03 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -62,7 +62,7 @@ void KNotesNetworkSender::setSenderId( const TQString& sender ) void KNotesNetworkSender::setNote( const TQString& title, const TQString& text ) { - // TODO: support for unicode and rich text. + // TODO: support for tqunicode and rich text. // Mmmmmm... how to behave with such heterogeneous environment? // AFAIK, ATnotes does not allow UNICODE. m_title = title.ascii(); diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index 91e6d2d9f..81c33489e 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -45,7 +45,7 @@ ResourceLocal::ResourceLocal( const KConfig *config ) - : ResourceNotes( config ), mCalendar( TQString::fromLatin1( "UTC" ) ) + : ResourceNotes( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ) { kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl; setType( "file" ); diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index 417f81a05..207730a14 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -32,15 +32,15 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent, const char *name ) : KRES::ConfigWidget( parent, name ) { - TQHBoxLayout *layout = new TQHBoxLayout( this ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); TQLabel *label = new TQLabel( i18n( "Location:" ), this ); mURL = new KURLRequester( this ); KFile::Mode mode = static_cast( KFile::File | KFile::LocalOnly ); mURL->setMode( mode ); - layout->addWidget( label ); - layout->addWidget( mURL ); + tqlayout->addWidget( label ); + tqlayout->addWidget( mURL ); } ResourceLocalConfig::~ResourceLocalConfig() -- cgit v1.2.1