diff --git a/src/basket.cpp b/src/basket.cpp
index 078a6c4..41ac42c 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -987,7 +987,7 @@ void Basket::setDisposition(int disposition, int columnCount)
}
} else if (currentDisposition == COLUMNS_LAYOUT && (disposition == FREE_LAYOUT || disposition == MINDMAPS_LAYOUT)) {
Note *column = firstNote();
- m_columnsCount = 0; // Now, so relayoutNotes() will not retqlayout the free notes as if they were columns!
+ m_columnsCount = 0; // Now, so relayoutNotes() will not relayout the free notes as if they were columns!
while (column) {
// Move all childs on the first level:
Note *nextColumn = column->next();
@@ -1854,7 +1854,7 @@ void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/i
{
Note *note;
if (event->button() == Qt::MidButton)
- note = NoteFactory::dropNote(KApplication::tqclipboard()->data(TQClipboard::Selection), this);
+ note = NoteFactory::dropNote(KApplication::clipboard()->data(TQClipboard::Selection), this);
else
note = NoteFactory::createNoteText("", this);
@@ -2075,7 +2075,7 @@ void Basket::pasteNote(TQClipboard::Mode mode)
}
closeEditor();
unselectAll();
- Note *note = NoteFactory::dropNote(KApplication::tqclipboard()->data(mode), this);
+ Note *note = NoteFactory::dropNote(KApplication::clipboard()->data(mode), this);
if (note) {
insertCreatedNote(note);
//unselectAllBut(note);
@@ -2764,7 +2764,7 @@ void Basket::drawInserter(TQPainter &painter, int xPainter, int yPainter)
int lineY = (m_inserterGroup && m_inserterTop ? 0 : 2);
int roundY = (m_inserterGroup && m_inserterTop ? 0 : 1);
- TQColor dark = KApplication::tqpalette().active().dark();
+ TQColor dark = KApplication::palette().active().dark();
TQColor light = dark.light().light();
if (m_inserterGroup && Settings::groupOnInsertionLine())
light = Tools::mixColor(light, KGlobalSettings::highlightColor());
@@ -3070,12 +3070,12 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
m_decryptBox->setFrameShadow( TQFrame::Plain );
m_decryptBox->setLineWidth( 1 );
- TQGridLayout* tqlayout = new TQGridLayout( m_decryptBox, 1, 1, 11, 6, "decryptBoxLayout");
+ TQGridLayout* layout = new TQGridLayout( m_decryptBox, 1, 1, 11, 6, "decryptBoxLayout");
#ifdef HAVE_LIBGPGME
m_button = new TQPushButton( m_decryptBox, "button" );
m_button->setText( i18n( "&Unlock" ) );
- tqlayout->addWidget( m_button, 1, 2 );
+ layout->addWidget( m_button, 1, 2 );
connect( m_button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( unlock() ) );
#endif
TQLabel* label = new TQLabel( m_decryptBox, "label" );
@@ -3086,13 +3086,13 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
label->setText( text + i18n("Encryption is not supported by
this version of %1.").arg(kapp->aboutData()->programName()) );
#endif
label->setAlignment( int( TQLabel::AlignTop ) );
- tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
+ layout->addMultiCellWidget( label, 0, 0, 1, 2 );
TQLabel* pixmap = new TQLabel( m_decryptBox, "pixmap" );
pixmap->setPixmap( KGlobal::iconLoader()->loadIcon("encrypted", KIcon::NoGroup, KIcon::SizeHuge) );
- tqlayout->addMultiCellWidget( pixmap, 0, 1, 0, 0 );
+ layout->addMultiCellWidget( pixmap, 0, 1, 0, 0 );
TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- tqlayout->addItem( spacer, 1, 1 );
+ layout->addItem( spacer, 1, 1 );
label = new TQLabel("" +
i18n("To make baskets stay unlocked, change the automatic
"
@@ -3100,9 +3100,9 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
m_decryptBox);
//label->setFixedWidth(label->sizeHint().width() / 2);
label->setAlignment( int( TQLabel::AlignTop ) );
- tqlayout->addMultiCellWidget( label, 2,2,0,2 );
+ layout->addMultiCellWidget( label, 2,2,0,2 );
- m_decryptBox->resize(tqlayout->sizeHint());
+ m_decryptBox->resize(layout->sizeHint());
}
if(m_decryptBox->isHidden())
{
@@ -3420,7 +3420,7 @@ void Basket::toggledStateInMenu(int id)
if (id == 1) {
removeTagFromSelectedNotes(m_tagPopup);
//m_tagPopupNote->removeTag(m_tagPopup);
- //m_tagPopupNote->setWidth(0); // To force a new tqlayout computation
+ //m_tagPopupNote->setWidth(0); // To force a new layout computation
updateEditorAppearance();
filterAgain();
save();
@@ -3565,7 +3565,7 @@ void Basket::toggledTagInMenu(int id)
removeTagFromSelectedNotes(tag);
else
addTagToSelectedNotes(tag);
- m_tagPopupNote->setWidth(0); // To force a new tqlayout computation
+ m_tagPopupNote->setWidth(0); // To force a new layout computation
filterAgain();
save();
}
@@ -4196,7 +4196,7 @@ void Basket::noteDeleteWithoutConfirmation(bool deleteFilesToo)
void Basket::doCopy(CopyMode copyMode)
{
- TQClipboard *cb = KApplication::tqclipboard();
+ TQClipboard *cb = KApplication::clipboard();
TQClipboard::Mode mode = (copyMode == CopyToSelection ? TQClipboard::Selection : TQClipboard::Clipboard);
NoteSelection *selection = selectedNotes();
@@ -5047,7 +5047,7 @@ void Basket::selectRange(Note *start, Note *end, bool unselectOthers /*= true*/)
return;
}
- // Free tqlayout baskets should select range as if we were drawing a rectangle between start and end:
+ // Free layout baskets should select range as if we were drawing a rectangle between start and end:
if (isFreeLayout()) {
TQRect startRect( start->finalX(), start->finalY(), start->width(), start->finalHeight() );
TQRect endRect( end->finalX(), end->finalY(), end->width(), end->finalHeight() );
@@ -5439,15 +5439,15 @@ DiskErrorDialog::DiskErrorDialog(const TQString &titleMessage, const TQString &m
//enableButton(Close, false);
//enableButtonOK(false);
setModal(true);
- TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), /*margin=*/0, spacingHint());
+ TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), /*margin=*/0, spacingHint());
TQPixmap icon = kapp->iconLoader()->loadIcon("hdd_unmount", KIcon::NoGroup, 64, KIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
TQLabel *iconLabel = new TQLabel(plainPage());
iconLabel->setPixmap(icon);
iconLabel->setFixedSize(iconLabel->sizeHint());
TQLabel *label = new TQLabel("
" + message + "
", plainPage()); if (!icon.isNull()) - tqlayout->addWidget(iconLabel); - tqlayout->addWidget(label); + layout->addWidget(iconLabel); + layout->addWidget(label); } DiskErrorDialog::~DiskErrorDialog() diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp index 975e312..2ab6f42 100644 --- a/src/basketproperties.cpp +++ b/src/basketproperties.cpp @@ -99,7 +99,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent) } } // m_backgroundImage->insertItem(i18n("Other..."), -1); - int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin); m_backgroundImage->setSizeLimit(50/*75 * 6 / m_backgroundImage->sizeHint().height()*/); m_backgroundImage->setMinimumHeight(75 + 2 * BUTTON_MARGIN); diff --git a/src/debugwindow.cpp b/src/debugwindow.cpp index e86ff99..5f1b80a 100644 --- a/src/debugwindow.cpp +++ b/src/debugwindow.cpp @@ -33,19 +33,19 @@ DebugWindow::DebugWindow(TQWidget *parent, const char *name ) Global::debugWindow = this; setCaption(i18n("Debug Window")); - tqlayout = new TQVBoxLayout(this); + layout = new TQVBoxLayout(this); textBrowser = new TQTextBrowser(this); textBrowser->setWordWrap(TQTextBrowser::NoWrap); - tqlayout->addWidget(textBrowser); + layout->addWidget(textBrowser); textBrowser->show(); } DebugWindow::~DebugWindow() { delete textBrowser; - delete tqlayout; + delete layout; } void DebugWindow::postMessage(const TQString msg) diff --git a/src/debugwindow.h b/src/debugwindow.h index 5a72790..31b9911 100644 --- a/src/debugwindow.h +++ b/src/debugwindow.h @@ -46,7 +46,7 @@ class DebugWindow : public TQWidget { protected: virtual void closeEvent(TQCloseEvent *event); private: - TQVBoxLayout *tqlayout; + TQVBoxLayout *layout; TQTextBrowser *textBrowser; }; diff --git a/src/focusedwidgets.cpp b/src/focusedwidgets.cpp index ac46eec..d472555 100644 --- a/src/focusedwidgets.cpp +++ b/src/focusedwidgets.cpp @@ -67,7 +67,7 @@ void FocusedTextEdit::paste() // uint oldAutoFormating = autoFormatting(); // setAutoFormatting(AutoNone); - TQClipboard *clipboard = TQApplication::tqclipboard(); + TQClipboard *clipboard = TQApplication::clipboard(); int paragraph; int index; getCursorPosition(¶graph, &index); @@ -107,7 +107,7 @@ void FocusedTextEdit::paste() */ void FocusedTextEdit::adaptClipboardText(TQClipboard::Mode mode) { - TQClipboard *clipboard = TQApplication::tqclipboard(); + TQClipboard *clipboard = TQApplication::clipboard(); if (!clipboard) return; diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index cd57f25..04f1b43 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -68,7 +68,7 @@ KColorPopup::~KColorPopup() #include" + i18n("Send application developers a comment about something you like")); m_likeButton->setAutoRaise(true); connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedLike()) ); - tqlayout->add(m_likeButton); + layout->add(m_likeButton); m_dislikeButton = new TQToolButton(this, "likeback_dislike"); m_dislikeButton->setIconSet(dislikeIconSet); m_dislikeButton->setTextLabel("
" + i18n("Send application developers a comment about something you dislike")); m_dislikeButton->setAutoRaise(true); connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedDislike()) ); - tqlayout->add(m_dislikeButton); + layout->add(m_dislikeButton); m_bugButton = new TQToolButton(this, "likeback_bug"); m_bugButton->setIconSet(bugIconSet); m_bugButton->setTextLabel("
" + i18n("Send application developers a comment about an improper behavior of the application")); m_bugButton->setAutoRaise(true); connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedBug()) ); - tqlayout->add(m_bugButton); + layout->add(m_bugButton); m_featureButton = new TQToolButton(this, "likeback_feature"); m_featureButton->setIconSet(featureIconSet); m_featureButton->setTextLabel("
" + i18n("Send application developers a comment about a new feature you desire")); m_featureButton->setAutoRaise(true); connect( m_featureButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedFeature()) ); - tqlayout->add(m_featureButton); + layout->add(m_featureButton); connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) ); diff --git a/src/linklabel.cpp b/src/linklabel.cpp index 77d5cd2..6932dca 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -392,7 +392,7 @@ void LinkDisplay::setLink(const TQString &title, const TQString &icon, const TQP m_font = font; // "Constants": - int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin); int LINK_MARGIN = BUTTON_MARGIN + 2; // Recompute m_minWidth: @@ -430,7 +430,7 @@ void LinkDisplay::setWidth(int width) void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered, bool isIconButtonHovered) const { - int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin); int LINK_MARGIN = BUTTON_MARGIN + 2; TQPixmap pixmap; @@ -449,7 +449,7 @@ void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, int pixmapY = (height - pixmap.height()) / 2; // Draw the button (if any) and the icon: if (isHovered) - kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonCommand, painter, TQRect(-1, -1, iconPreviewWidth + 2*BUTTON_MARGIN, height + 2), + kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, painter, TQRect(-1, -1, iconPreviewWidth + 2*BUTTON_MARGIN, height + 2), colorGroup, TQStyle::Style_Enabled | (isIconButtonHovered ? TQStyle::Style_MouseOver : 0)); painter->drawPixmap(x + BUTTON_MARGIN - 1 + pixmapX, y + pixmapY, pixmap); @@ -483,7 +483,7 @@ TQPixmap LinkDisplay::feedbackPixmap(int width, int height, const TQColorGroup & bool LinkDisplay::iconButtonAt(const TQPoint &pos) const { - int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin); // int LINK_MARGIN = BUTTON_MARGIN + 2; int iconPreviewWidth = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width() : 0)); @@ -492,7 +492,7 @@ bool LinkDisplay::iconButtonAt(const TQPoint &pos) const TQRect LinkDisplay::iconButtonRect() const { - int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin); // int LINK_MARGIN = BUTTON_MARGIN + 2; int iconPreviewWidth = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width() : 0)); @@ -517,7 +517,7 @@ TQFont LinkDisplay::labelFont(TQFont font, bool isIconButtonHovered) const int LinkDisplay::heightForWidth(int width) const { - int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin); int LINK_MARGIN = BUTTON_MARGIN + 2; int iconPreviewWidth = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width() : 0)); int iconPreviewHeight = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.height() : 0)); @@ -559,15 +559,15 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const TQString exTitle, : TQWidget(parent, name, fl) { TQLabel *label; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialogBase::marginHint(), KDialogBase::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialogBase::marginHint(), KDialogBase::spacingHint()); m_italic = new TQCheckBox(i18n("I&talic"), this); - tqlayout->addWidget(m_italic); + layout->addWidget(m_italic); m_bold = new TQCheckBox(i18n("&Bold"), this); - tqlayout->addWidget(m_bold); + layout->addWidget(m_bold); - TQGridLayout *gl = new TQGridLayout(tqlayout, /*rows=*//*(look->canPreview() ? 5 : 4)*/5, /*columns=*//*3*/4); + TQGridLayout *gl = new TQGridLayout(layout, /*rows=*//*(look->canPreview() ? 5 : 4)*/5, /*columns=*//*3*/4); gl->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Expanding), 1, /*2*/3); m_underlining = new TQComboBox(false, this); @@ -625,7 +625,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const TQString exTitle, m_example = new LinkLabel(exTitle, exIcon, m_exLook, 1, 1, gb); m_example->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_example->setCursor(TQCursor(TQt::PointingHandCursor)); - tqlayout->addWidget(gb); + layout->addWidget(gb); m_exTitle = exTitle; m_exIcon = exIcon; diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index 04d39a8..c782583 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -116,7 +116,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro nameLayout->addWidget(m_backgroundColor); topLayout->addLayout(nameLayout); - TQHBoxLayout *tqlayout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); KPushButton *button = new KPushButton( KGuiItem(i18n("&Manage Templates..."), "configure"), page ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(manageTemplates()) ); button->hide(); @@ -203,13 +203,13 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_templates->setMinimumHeight(topLayout->minimumSize().width() * 9 / 16); TQLabel *label = new TQLabel(m_templates, i18n("&Template:"), page); - tqlayout->addWidget(label, /*stretch=*/0, TQt::AlignBottom); - tqlayout->addStretch(); - tqlayout->addWidget(button, /*stretch=*/0, TQt::AlignBottom); - topLayout->addLayout(tqlayout); + layout->addWidget(label, /*stretch=*/0, TQt::AlignBottom); + layout->addStretch(); + layout->addWidget(button, /*stretch=*/0, TQt::AlignBottom); + topLayout->addLayout(layout); topLayout->addWidget(m_templates); - tqlayout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); + layout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); m_createIn = new TQComboBox(page); m_createIn->insertItem(i18n("(Baskets)")); label = new TQLabel(m_createIn, i18n("C&reate in:"), page); @@ -219,11 +219,11 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro "