summaryrefslogtreecommitdiffstats
path: root/knotes
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /knotes
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'knotes')
-rw-r--r--knotes/ChangeLog10
-rw-r--r--knotes/knote.cpp38
-rw-r--r--knotes/knotebutton.cpp16
-rw-r--r--knotes/knotebutton.h2
-rw-r--r--knotes/knoteconfigdlg.cpp68
-rw-r--r--knotes/knoteedit.cpp8
-rw-r--r--knotes/knoteprinter.cpp14
-rw-r--r--knotes/knoteprinter.h8
-rw-r--r--knotes/knotesalarm.cpp2
-rw-r--r--knotes/knotesapp.cpp10
-rw-r--r--knotes/knoteslegacy.cpp4
-rw-r--r--knotes/knotesnetrecv.cpp6
-rw-r--r--knotes/knotesnetsend.cpp4
-rw-r--r--knotes/resourcelocal.cpp4
-rw-r--r--knotes/resourcelocalconfig.cpp8
15 files changed, 101 insertions, 101 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index 532a92792..41ff85579 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>
@@ -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>
@@ -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.
@@ -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/knote.cpp b/knotes/knote.cpp
index 2b0ae9599..430a5dca5 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -393,7 +393,7 @@ void KNote::slotKill( bool force )
m_blockEmitDataChanged = true;
if ( !force &&
KMessageBox::warningContinueCancel( this,
- i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").arg( m_label->text() ),
+ i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").tqarg( m_label->text() ),
i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "editdelete" ),
"ConfirmDeleteNote"
)
@@ -772,7 +772,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()
@@ -804,7 +804,7 @@ void KNote::slotPreferences()
void KNote::slotSend()
{
// pop up dialog to get the IP
- KNoteHostDlg hostDlg( i18n("Send \"%1\"").arg( name() ), this );
+ KNoteHostDlg hostDlg( i18n("Send \"%1\"").tqarg( name() ), this );
aboutToEnterEventLoop();
bool ok = (hostDlg.exec() == TQDialog::Accepted);
eventLoopLeft();
@@ -859,7 +859,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 );
}
@@ -891,7 +891,7 @@ void KNote::slotSaveAs()
if ( file.exists() &&
KMessageBox::warningContinueCancel( this, i18n("<qt>A file named <b>%1</b> already exists.<br>"
- "Are you sure you want to overwrite it?</qt>").arg( TQFileInfo(file).fileName() ) )
+ "Are you sure you want to overwrite it?</qt>").tqarg( TQFileInfo(file).fileName() ) )
!= KMessageBox::Continue )
{
m_blockEmitDataChanged = false;
@@ -986,7 +986,7 @@ void KNote::slotUpdateDesktopActions()
int count = wm_root.numberOfDesktops();
for ( int n = 1; n <= count; n++ )
- desktops.append( TQString("&%1 %2").arg( n ).arg( TQString::fromUtf8(wm_root.desktopName( n )) ) );
+ desktops.append( TQString("&%1 %2").tqarg( n ).tqarg( TQString::fromUtf8(wm_root.desktopName( n )) ) );
m_toDesktop->setItems( desktops );
@@ -1020,7 +1020,7 @@ void KNote::createFold()
TQPixmap fold( 15, 15 );
TQPainter foldp( &fold );
foldp.setPen( TQt::NoPen );
- foldp.setBrush( palette().active().dark() );
+ foldp.setBrush( tqpalette().active().dark() );
TQPointArray foldpoints( 3 );
foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 );
foldp.drawPolygon( foldpoints );
@@ -1033,16 +1033,16 @@ 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()
{
if ( hasFocus() )
{
- m_label->setBackgroundColor( palette().active().shadow() );
+ m_label->setBackgroundColor( tqpalette().active().shadow() );
m_button->show();
if ( !m_editor->isReadOnly() )
@@ -1081,11 +1081,11 @@ void KNote::updateFocus()
if ( s_ppOffset )
{
- m_label->setBackgroundColor( palette().active().midlight() );
+ m_label->setBackgroundColor( tqpalette().active().midlight() );
m_fold->show();
}
else
- m_label->setBackgroundColor( palette().active().background() );
+ m_label->setBackgroundColor( tqpalette().active().background() );
}
}
@@ -1121,7 +1121,7 @@ void KNote::updateBackground( int y_offset )
{
if ( !s_ppOffset )
{
- m_editor->setPaper( TQBrush( colorGroup().background() ) );
+ m_editor->setPaper( TQBrush( tqcolorGroup().background() ) );
return;
}
@@ -1138,7 +1138,7 @@ void KNote::updateBackground( int y_offset )
TQImage grad_img( w, h, 32 );
TQRgb rgbcol;
- TQColor bg = palette().active().background();
+ TQColor bg = tqpalette().active().background();
for ( int i = 0; i < h; ++i )
{
@@ -1161,7 +1161,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;
@@ -1172,7 +1172,7 @@ void KNote::updateLayout()
if ( s_ppOffset )
{
if ( !m_editor->paper().pixmap() ) // just changed the style
- setColor( palette().active().foreground(), palette().active().background() );
+ setColor( tqpalette().active().foreground(), tqpalette().active().background() );
m_pushpin->show();
setFrameStyle( Panel | Raised );
@@ -1185,7 +1185,7 @@ void KNote::updateLayout()
else
{
if ( m_editor->paper().pixmap() ) // just changed the style
- setColor( palette().active().foreground(), palette().active().background() );
+ setColor( tqpalette().active().foreground(), tqpalette().active().background() );
setFrameStyle( WinPanel | Raised );
m_pushpin->hide();
@@ -1241,9 +1241,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 be141088d..5dc5009e0 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( TQ_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;
- tqstyle().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags );
+ tqstyle().tqdrawPrimitive( 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 += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
- dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+ dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+ dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
p->drawPixmap( dx, dy, pix );
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 2f3699269..6a9f7e5bf 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -36,7 +36,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 51e22fbfb..034a3239e 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -19,7 +19,7 @@
*******************************************************************/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqhgroupbox.h>
@@ -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 2844c29f3..c0647e6de 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -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 );
}
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index c58031671..6b2868174 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 )
@@ -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;
@@ -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() );
@@ -117,7 +117,7 @@ void KNotePrinter::printNote( const TQString& name, const TQString& content ) co
KPrinter printer;
printer.setFullPage( true );
- if ( !printer.setup( 0, i18n("Print %1").arg(name) ) )
+ if ( !printer.setup( 0, i18n("Print %1").tqarg(name) ) )
return;
TQPainter painter;
painter.begin( &printer );
diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h
index 090bac334..148a2ec45 100644
--- a/knotes/knoteprinter.h
+++ b/knotes/knoteprinter.h
@@ -2,7 +2,7 @@
#define KNOTEPRINTER_H
#include <tqfont.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqstring.h>
class TQMimeSourceFactory;
@@ -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 285d7224e..5d8b0de28 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<KCal::Alarm *> alarms = m_manager->alarms( from, KNotesGlobalConfig::self()->alarmsLastChecked() );
if( alarms.isEmpty())
return;
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 26a02465f..22ee49fd6 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*******************************************************************/
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqptrlist.h>
#include <tqtooltip.h>
@@ -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 );
@@ -266,7 +266,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text )
TQString KNotesApp::newNoteFromClipboard( const TQString& name )
{
- const TQString& text = KApplication::clipboard()->text();
+ const TQString& text = KApplication::tqclipboard()->text();
return newNote( name, text );
}
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 03b37995c..129517b30 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -23,7 +23,7 @@
#include <tqpoint.h>
#include <tqcolor.h>
#include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -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 9120336a8..2adf8e784 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -61,13 +61,13 @@ 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.
m_titleAddon = TQString(" [%1, %2]")
- .arg( m_sock->peerAddress().nodeName() )
- .arg( date );
+ .tqarg( m_sock->peerAddress().nodeName() )
+ .tqarg( date );
// Setup the communications
connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) );
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 998439de4..ca3005d6a 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();
@@ -91,7 +91,7 @@ void KNotesNetworkSender::slotReadyWrite()
void KNotesNetworkSender::slotError( int err )
{
KMessageBox::sorry( 0, i18n("Communication error: %1")
- .arg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) )
+ .tqarg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) )
);
slotClosed();
}
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 53ea68ac8..aed70e236 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" );
@@ -89,7 +89,7 @@ bool ResourceLocal::save()
i18n("<qt>Unable to save the notes to <b>%1</b>. "
"Check that there is sufficient disk space."
"<br>There should be a backup in the same directory "
- "though.</qt>").arg( mURL.path() ) );
+ "though.</qt>").tqarg( mURL.path() ) );
return false;
}
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 7d2636567..207730a14 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -19,7 +19,7 @@
*******************************************************************/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -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::Mode>( KFile::File |
KFile::LocalOnly );
mURL->setMode( mode );
- layout->addWidget( label );
- layout->addWidget( mURL );
+ tqlayout->addWidget( label );
+ tqlayout->addWidget( mURL );
}
ResourceLocalConfig::~ResourceLocalConfig()