summaryrefslogtreecommitdiffstats
path: root/src/basket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/basket.cpp')
-rw-r--r--src/basket.cpp36
1 files changed, 18 insertions, 18 deletions
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<br/>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("<small>" +
i18n("To make baskets stay unlocked, change the automatic<br>"
@@ -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("<p><nobr><b><font size='+1'>" + titleMessage + "</font></b></nobr></p><p>" + message + "</p>", plainPage());
if (!icon.isNull())
- tqlayout->addWidget(iconLabel);
- tqlayout->addWidget(label);
+ layout->addWidget(iconLabel);
+ layout->addWidget(label);
}
DiskErrorDialog::~DiskErrorDialog()
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 10:23:43 +0000