summaryrefslogtreecommitdiffstats
path: root/knotes
diff options
context:
space:
mode:
Diffstat (limited to 'knotes')
-rw-r--r--knotes/ChangeLog4
-rw-r--r--knotes/knote.cpp14
-rw-r--r--knotes/knotebutton.cpp6
-rw-r--r--knotes/knoteconfigdlg.cpp62
-rw-r--r--knotes/knotesapp.cpp2
-rw-r--r--knotes/knotesnetsend.cpp2
-rw-r--r--knotes/resourcelocalconfig.cpp6
7 files changed, 48 insertions, 48 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index 95990a9d2..532a92792 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -616,7 +616,7 @@ ChangeLog for KNotes
2001/06/23 Michael Brade <[email protected]>
* fixed #18086 (add a size grip for the notes)
- * update the title tqlayout if the font was changed
+ * update the title layout if the font was changed
2001/06/17 Michael Brade <[email protected]>
@@ -863,7 +863,7 @@ Tue Aug 3 02:23:09 1999 Carsten Pfeiffer <[email protected]>
* 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
- tqlayout management (still not perfect, yet)
+ layout management (still not perfect, yet)
1999-06-07 Petter Reinholdtsen <[email protected]>
* knotes.cpp: Changed text Quit to Exit to match KDE style guide.
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index e22ab4285..2b0ae9599 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -1020,7 +1020,7 @@ void KNote::createFold()
TQPixmap fold( 15, 15 );
TQPainter foldp( &fold );
foldp.setPen( TQt::NoPen );
- foldp.setBrush( tqpalette().active().dark() );
+ foldp.setBrush( palette().active().dark() );
TQPointArray foldpoints( 3 );
foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 );
foldp.drawPolygon( foldpoints );
@@ -1042,7 +1042,7 @@ void KNote::updateFocus()
{
if ( hasFocus() )
{
- m_label->setBackgroundColor( tqpalette().active().shadow() );
+ m_label->setBackgroundColor( palette().active().shadow() );
m_button->show();
if ( !m_editor->isReadOnly() )
@@ -1081,11 +1081,11 @@ void KNote::updateFocus()
if ( s_ppOffset )
{
- m_label->setBackgroundColor( tqpalette().active().midlight() );
+ m_label->setBackgroundColor( palette().active().midlight() );
m_fold->show();
}
else
- m_label->setBackgroundColor( tqpalette().active().background() );
+ m_label->setBackgroundColor( palette().active().background() );
}
}
@@ -1138,7 +1138,7 @@ void KNote::updateBackground( int y_offset )
TQImage grad_img( w, h, 32 );
TQRgb rgbcol;
- TQColor bg = tqpalette().active().background();
+ TQColor bg = palette().active().background();
for ( int i = 0; i < h; ++i )
{
@@ -1172,7 +1172,7 @@ void KNote::updateLayout()
if ( s_ppOffset )
{
if ( !m_editor->paper().pixmap() ) // just changed the style
- setColor( tqpalette().active().foreground(), tqpalette().active().background() );
+ setColor( palette().active().foreground(), palette().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( tqpalette().active().foreground(), tqpalette().active().background() );
+ setColor( palette().active().foreground(), palette().active().background() );
setFrameStyle( WinPanel | Raised );
m_pushpin->hide();
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index be141088d..0c7862b2e 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -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 );
+ style().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), 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 += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+ dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
p->drawPixmap( dx, dy, pix );
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 2e26ab999..9eeb3fdc7 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 *tqlayout = new TQGridLayout( displayPage, 2, 2,
+ TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2,
defaults ? marginHint() : 0, spacingHint() );
TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" );
- tqlayout->addWidget( label_FgColor, 0, 0 );
+ layout->addWidget( label_FgColor, 0, 0 );
KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" );
label_FgColor->setBuddy( kcfg_FgColor );
- tqlayout->addWidget( kcfg_FgColor, 0, 1 );
+ layout->addWidget( kcfg_FgColor, 0, 1 );
TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" );
- tqlayout->addWidget( label_BgColor, 1, 0 );
+ layout->addWidget( label_BgColor, 1, 0 );
KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" );
label_BgColor->setBuddy( kcfg_BgColor );
- tqlayout->addWidget( kcfg_BgColor, 1, 1 );
+ layout->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" );
- tqlayout->addWidget( label_Width, 2, 0 );
+ layout->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 );
- tqlayout->addWidget( kcfg_Width, 2, 1 );
+ layout->addWidget( kcfg_Width, 2, 1 );
TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" );
- tqlayout->addWidget( label_Height, 3, 0 );
+ layout->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 );
- tqlayout->addWidget( kcfg_Height, 3, 1 );
+ layout->addWidget( kcfg_Height, 3, 1 );
- tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
+ layout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
}
else
- tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
+ layout->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 *tqlayout = new TQGridLayout( editorPage, 4, 3,
+ TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3,
defaults ? marginHint() : 0, spacingHint() );
TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" );
- tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
+ layout->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 );
- tqlayout->addWidget( kcfg_TabSize, 0, 2 );
+ layout->addWidget( kcfg_TabSize, 0, 2 );
TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" );
- tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
+ layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" );
- tqlayout->addWidget( kcfg_RichText, 1, 2 );
+ layout->addWidget( kcfg_RichText, 1, 2 );
TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" );
- tqlayout->addWidget( label_Font, 3, 0 );
+ layout->addWidget( label_Font, 3, 0 );
KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" );
kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
- tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
+ layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" );
- tqlayout->addWidget( label_TitleFont, 2, 0 );
+ layout->addWidget( label_TitleFont, 2, 0 );
KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" );
kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
- tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
+ layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
return editorPage;
}
@@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage()
TQWidget *KNoteConfigDlg::makeActionsPage()
{
TQWidget *actionsPage = new TQWidget();
- TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" );
- tqlayout->addWidget( label_MailAction, 0, 0 );
+ layout->addWidget( label_MailAction, 0, 0 );
KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" );
label_MailAction->setBuddy( kcfg_MailAction );
- tqlayout->addWidget( kcfg_MailAction, 0, 1 );
+ layout->addWidget( kcfg_MailAction, 0, 1 );
return actionsPage;
}
@@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage()
TQWidget *KNoteConfigDlg::makeNetworkPage()
{
TQWidget *networkPage = new TQWidget();
- TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage );
- tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
+ layout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" );
TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage );
- tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
+ layout->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" );
- tqlayout->addWidget( label_Port, 2, 0 );
+ layout->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 );
- tqlayout->addWidget( kcfg_Port, 2, 1 );
+ layout->addWidget( kcfg_Port, 2, 1 );
return networkPage;
}
@@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage()
TQWidget *KNoteConfigDlg::makeStylePage()
{
TQWidget *stylePage = new TQWidget();
- TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" );
- tqlayout->addWidget( label_Style, 0, 0 );
+ layout->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 );
- tqlayout->addWidget( kcfg_Style, 0, 1 );
+ layout->addWidget( kcfg_Style, 0, 1 );
return stylePage;
}
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index b76f19846..e62c3f456 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -266,7 +266,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text )
TQString KNotesApp::newNoteFromClipboard( const TQString& name )
{
- const TQString& text = KApplication::tqclipboard()->text();
+ const TQString& text = KApplication::clipboard()->text();
return newNote( name, text );
}
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 42ff66fc9..998439de4 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 tqunicode and rich text.
+ // TODO: support for unicode 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/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 207730a14..417f81a05 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 *tqlayout = new TQHBoxLayout( this );
+ TQHBoxLayout *layout = 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 );
- tqlayout->addWidget( label );
- tqlayout->addWidget( mURL );
+ layout->addWidget( label );
+ layout->addWidget( mURL );
}
ResourceLocalConfig::~ResourceLocalConfig()
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-15 21:12:21 +0000