From 2a411f53a04f815770074b633e026a141f6fa875 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:01:17 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- kontact_plugin/basketdcopiface_stub.cpp | 8 +- src/backup.cpp | 6 +- src/basket.cpp | 20 ++--- src/basketlistview.cpp | 4 +- src/basketlistview.h | 2 +- src/basketproperties.cpp | 10 +-- src/basketstatusbar.cpp | 78 ++++++++--------- src/basketstatusbar.h | 14 ++-- src/bnpview.cpp | 24 +++--- src/bnpview.h | 6 +- src/exporterdialog.cpp | 4 +- src/kcolorcombo2.cpp | 4 +- src/kicondialog.cpp | 8 +- src/kicondialogui.ui | 4 +- src/likeback.cpp | 30 +++---- src/linklabel.cpp | 38 ++++----- src/linklabel.h | 4 +- src/mainwindow.cpp | 8 +- src/newbasketdialog.cpp | 6 +- src/note.cpp | 16 ++-- src/notecontent.cpp | 106 ++++++++++++------------ src/notecontent.h | 24 +++--- src/notedrag.cpp | 18 ++-- src/notedrag.h | 6 +- src/noteedit.cpp | 36 ++++---- src/notefactory.cpp | 6 +- src/passwordlayout.ui | 2 +- src/popupmenu.cpp | 6 +- src/qeffects.cpp | 4 +- src/regiongrabber.cpp | 4 +- src/systemtray.cpp | 2 +- src/tag.cpp | 22 ++--- src/tag.h | 4 +- src/tagsedit.cpp | 32 +++---- src/tagsedit.h | 2 +- src/tools.cpp | 2 +- src/variouswidgets.cpp | 8 +- 37 files changed, 289 insertions(+), 289 deletions(-) diff --git a/kontact_plugin/basketdcopiface_stub.cpp b/kontact_plugin/basketdcopiface_stub.cpp index a170b62..ca0de8b 100644 --- a/kontact_plugin/basketdcopiface_stub.cpp +++ b/kontact_plugin/basketdcopiface_stub.cpp @@ -30,24 +30,24 @@ BasketDcopInterface_stub::BasketDcopInterface_stub( const DCOPRef& ref ) void BasketDcopInterface_stub::newBasket() { if ( !dcopClient() ) { - settqStatus( CallFailed ); + setStatus( CallFailed ); return; } TQByteArray data; dcopClient()->send( app(), obj(), "newBasket()", data ); - settqStatus( CallSucceeded ); + setStatus( CallSucceeded ); } void BasketDcopInterface_stub::handleCommandLine() { if ( !dcopClient() ) { - settqStatus( CallFailed ); + setStatus( CallFailed ); return; } TQByteArray data, replyData; TQCString replyType; if ( dcopClient()->call( app(), obj(), "handleCommandLine()", data, replyType, replyData ) ) { - settqStatus( CallSucceeded ); + setStatus( CallSucceeded ); } else { callFailed(); } diff --git a/src/backup.cpp b/src/backup.cpp index 86ae3c6..d49313a 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -103,7 +103,7 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name) populateLastBackup(); - (new TQWidget(page))->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + (new TQWidget(page))->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } BackupDialog::~BackupDialog() @@ -170,7 +170,7 @@ void BackupDialog::backup() config->setGroup("Backups"); TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/"; TQString fileName = i18n("Backup filename (without extension), %1 is the date", "Baskets_%1") - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + .tqarg(TQDate::currentDate().toString(Qt::ISODate)); TQString url = folder + fileName; // Ask a file name & path to the user: @@ -216,7 +216,7 @@ void BackupDialog::backup() usleep(300); // Not too long because if the backup process is finished, we wait for nothing } - Settings::setLastBackup(TQDate::tqcurrentDate()); + Settings::setLastBackup(TQDate::currentDate()); Settings::saveConfig(); populateLastBackup(); } diff --git a/src/basket.cpp b/src/basket.cpp index 6532335..9f3cedd 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -1107,7 +1107,7 @@ bool Basket::save() return false; } - Global::bnpView->setUnsavedtqStatus(false); + Global::bnpView->setUnsavedStatus(false); return true; } @@ -3085,7 +3085,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt #else label->setText( text + i18n("Encryption is not supported by
this version of %1.").tqarg(kapp->aboutData()->programName()) ); #endif - label->tqsetAlignment( int( TQLabel::AlignTop ) ); + label->setAlignment( int( TQLabel::AlignTop ) ); tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); TQLabel* pixmap = new TQLabel( m_decryptBox, "pixmap" ); pixmap->setPixmap( KGlobal::iconLoader()->loadIcon("encrypted", KIcon::NoGroup, KIcon::SizeHuge) ); @@ -3098,11 +3098,11 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt i18n("To make baskets stay unlocked, change the automatic
" "locking duration in the application settings.") + "", m_decryptBox); - //label->setFixedWidth(label->tqsizeHint().width() / 2); - label->tqsetAlignment( int( TQLabel::AlignTop ) ); + //label->setFixedWidth(label->sizeHint().width() / 2); + label->setAlignment( int( TQLabel::AlignTop ) ); tqlayout->addMultiCellWidget( label, 2,2,0,2 ); - m_decryptBox->resize(tqlayout->tqsizeHint()); + m_decryptBox->resize(tqlayout->sizeHint()); } if(m_decryptBox->isHidden()) { @@ -3137,7 +3137,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt int hrt = rt.height(); painter2.fillRect(0, 0, visibleWidth(), visibleHeight(), brush); blendBackground(painter2, TQRect(0, 0, visibleWidth(), visibleHeight()), -1, -1, /*opaque=*/true); - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, textColor()); rt.draw(&painter2, 0, (visibleHeight() - hrt) / 2, TQRect(), cg); painter2.end(); @@ -3392,7 +3392,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber) TQKeySequence sequence; if (currentState == nextState && !tag->shortcut().isNull()) sequence = tag->shortcut().operator TQKeySequence(); - menu.insertItem(StateMenuItem::radioButtonIconSet(state == currentState, menu.tqcolorGroup()), new StateMenuItem(currentState, sequence, false), i ); + menu.insertItem(StateMenuItem::radioButtonIconSet(state == currentState, menu.colorGroup()), new StateMenuItem(currentState, sequence, false), i ); if (currentState == nextState && !tag->shortcut().isNull()) menu.setAccel(sequence, i); ++i; @@ -3494,7 +3494,7 @@ void Basket::popupTagsMenu(Note *note) // TQKeySequence sequence; // if (!currentTag->shortcut().isNull()) // sequence = currentTag->shortcut().operator TQKeySequence(); -// menu.insertItem(StateMenuItem::checkBoxIconSet(note->hasTag(currentTag), menu.tqcolorGroup()), new StateMenuItem(currentState, sequence, true), i ); +// menu.insertItem(StateMenuItem::checkBoxIconSet(note->hasTag(currentTag), menu.colorGroup()), new StateMenuItem(currentState, sequence, true), i ); // if (!currentTag->shortcut().isNull()) // menu.setAccel(sequence, i); // ++i; @@ -3730,7 +3730,7 @@ void Basket::contentChangedInEditor() if (m_inactivityAutoSaveTimer.isActive()) m_inactivityAutoSaveTimer.stop(); m_inactivityAutoSaveTimer.start(3 * 1000, /*singleShot=*/true); - Global::bnpView->setUnsavedtqStatus(true); + Global::bnpView->setUnsavedStatus(true); // } } @@ -5443,7 +5443,7 @@ DiskErrorDialog::DiskErrorDialog(const TQString &titleMessage, const TQString &m 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->tqsizeHint()); + iconLabel->setFixedSize(iconLabel->sizeHint()); TQLabel *label = new TQLabel("

" + titleMessage + "

" + message + "

", plainPage()); if (!icon.isNull()) tqlayout->addWidget(iconLabel); diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp index 434e1a9..1ec5cd5 100644 --- a/src/basketlistview.cpp +++ b/src/basketlistview.cpp @@ -412,7 +412,7 @@ int BasketListViewItem::countHiddenChildsFound() return countChildsFound(); } -void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*tqcolorGroup*/, int /*column*/, int width, int /*align*/) +void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*colorGroup*/, int /*column*/, int width, int /*align*/) { // Workaround a TQt bug: // When the splitter is moved to hide the tree view and then the application is restarted, @@ -623,7 +623,7 @@ public: TQListViewItem *item = m_basketView->itemAt(m_basketView->contentsToViewport(pos)); BasketListViewItem* bitem = dynamic_cast(item); if (bitem && bitem->isAbbreviated()) { - tip(m_basketView->tqitemRect(bitem), bitem->basket()->basketName()); + tip(m_basketView->itemRect(bitem), bitem->basket()->basketName()); } } private: diff --git a/src/basketlistview.h b/src/basketlistview.h index d46e8b7..62a7a47 100644 --- a/src/basketlistview.h +++ b/src/basketlistview.h @@ -50,7 +50,7 @@ class BasketListViewItem : public TQListViewItem void ensureVisible(); bool isShown(); bool isCurrentBasket(); - void paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align); + void paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align); TQString escapedName(const TQString &string); /// TQPixmap circledTextPixmap(const TQString &text, int height, const TQFont &font, const TQColor &color); diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp index fa5a3a2..975e312 100644 --- a/src/basketproperties.cpp +++ b/src/basketproperties.cpp @@ -56,7 +56,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent) m_icon->setIconType(KIcon::NoGroup, KIcon::Action); m_icon->setIconSize(16); m_icon->setIcon(m_basket->icon()); - int size = TQMAX(m_icon->tqsizeHint().width(), m_icon->tqsizeHint().height()); + int size = TQMAX(m_icon->sizeHint().width(), m_icon->sizeHint().height()); m_icon->setFixedSize(size, size); // Make it square! TQToolTip::add(m_icon, i18n("Icon")); m_name = new TQLineEdit(m_basket->basketName(), page); @@ -99,8 +99,8 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent) } } // m_backgroundImage->insertItem(i18n("Other..."), -1); - int BUTTON_MARGIN = kapp->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); - m_backgroundImage->setSizeLimit(50/*75 * 6 / m_backgroundImage->tqsizeHint().height()*/); + int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); + m_backgroundImage->setSizeLimit(50/*75 * 6 / m_backgroundImage->sizeHint().height()*/); m_backgroundImage->setMinimumHeight(75 + 2 * BUTTON_MARGIN); // Disposition: @@ -117,8 +117,8 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent) m_disposition->insert(radio); new TQRadioButton(i18n("&Free-form"), m_disposition); TQRadioButton *mindMap = new TQRadioButton(i18n("&Mind map"), m_disposition); // TODO: "Learn more..." - int height = TQMAX(mindMap->tqsizeHint().height(), m_columnCount->tqsizeHint().height()); // Make all radioButtons vertically equaly-spaced! - mindMap->setMinimumSize(mindMap->tqsizeHint().width(), height); // Because the m_columnCount can be heigher, and make radio1 and radio2 more spaced than radio2 and radio3. + int height = TQMAX(mindMap->sizeHint().height(), m_columnCount->sizeHint().height()); // Make all radioButtons vertically equaly-spaced! + mindMap->setMinimumSize(mindMap->sizeHint().width(), height); // Because the m_columnCount can be heigher, and make radio1 and radio2 more spaced than radio2 and radio3. m_disposition->setButton(m_basket->isFreeLayout() ? (m_basket->isMindMap() ? 2 : 1) : 0); topLayout->addWidget(m_disposition); diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp index 42127cf..14edc82 100644 --- a/src/basketstatusbar.cpp +++ b/src/basketstatusbar.cpp @@ -34,12 +34,12 @@ #include BasketStatusBar::BasketStatusBar(KStatusBar *bar) - : m_bar(bar), m_extension(0), m_selectiontqStatus(0), m_locktqStatus(0), m_baskettqStatus(0), m_savedtqStatus(0) + : m_bar(bar), m_extension(0), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0) { } BasketStatusBar::BasketStatusBar(KParts::StatusBarExtension *extension) - : m_bar(0), m_extension(extension), m_selectiontqStatus(0), m_locktqStatus(0), m_baskettqStatus(0), m_savedtqStatus(0) + : m_bar(0), m_extension(extension), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0) { } @@ -72,32 +72,32 @@ void BasketStatusBar::setupStatusBar() //Tools::printChildren(parent); if(lst->count() == 0) { - m_baskettqStatus = new TQLabel(parent); - m_baskettqStatus->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored, 0, 0, false) ); - addWidget( m_baskettqStatus, 1, false ); // Fit all extra space and is hiddable + m_basketStatus = new TQLabel(parent); + m_basketStatus->setSizePolicy( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored, 0, 0, false) ); + addWidget( m_basketStatus, 1, false ); // Fit all extra space and is hiddable } else - m_baskettqStatus = static_cast(TQT_TQWIDGET(lst->at(0))); + m_basketStatus = static_cast(TQT_TQWIDGET(lst->at(0))); delete lst; - m_selectiontqStatus = new TQLabel(i18n("Loading..."), parent); - addWidget( m_selectiontqStatus, 0, true ); + m_selectionStatus = new TQLabel(i18n("Loading..."), parent); + addWidget( m_selectionStatus, 0, true ); - m_locktqStatus = new ClickableLabel(0/*this*/); - m_locktqStatus->setMinimumSize(18, 18); - m_locktqStatus->tqsetAlignment(TQt::AlignCenter); -// addWidget( m_locktqStatus, 0, true ); - connect( m_locktqStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) ); + m_lockStatus = new ClickableLabel(0/*this*/); + m_lockStatus->setMinimumSize(18, 18); + m_lockStatus->setAlignment(TQt::AlignCenter); +// addWidget( m_lockStatus, 0, true ); + connect( m_lockStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) ); m_savedStatusPixmap = SmallIcon("filesave"); - m_savedtqStatus = new TQLabel(parent); - m_savedtqStatus->setPixmap(m_savedStatusPixmap); - m_savedtqStatus->setFixedSize(m_savedtqStatus->tqsizeHint()); - m_savedtqStatus->clear(); - //m_savedtqStatus->setPixmap(m_savedStatusIconSet.pixmap(TQIconSet::Small, TQIconSet::Disabled)); - //m_savedtqStatus->setEnabled(false); - addWidget( m_savedtqStatus, 0, true ); - TQToolTip::add(m_savedtqStatus, "

" + i18n("Shows if there are changes that have not yet been saved.")); + m_savedStatus = new TQLabel(parent); + m_savedStatus->setPixmap(m_savedStatusPixmap); + m_savedStatus->setFixedSize(m_savedStatus->sizeHint()); + m_savedStatus->clear(); + //m_savedStatus->setPixmap(m_savedStatusIconSet.pixmap(TQIconSet::Small, TQIconSet::Disabled)); + //m_savedStatus->setEnabled(false); + addWidget( m_savedStatus, 0, true ); + TQToolTip::add(m_savedStatus, "

" + i18n("Shows if there are changes that have not yet been saved.")); } void BasketStatusBar::postStatusbarMessage(const TQString& text) @@ -108,8 +108,8 @@ void BasketStatusBar::postStatusbarMessage(const TQString& text) void BasketStatusBar::setStatusText(const TQString &txt) { - if(m_baskettqStatus && m_baskettqStatus->text() != txt) - m_baskettqStatus->setText(txt); + if(m_basketStatus && m_basketStatus->text() != txt) + m_basketStatus->setText(txt); } void BasketStatusBar::setStatusBarHint(const TQString &hint) @@ -137,40 +137,40 @@ void BasketStatusBar::updateStatusBarHint() setStatusText(message); } -void BasketStatusBar::setLocktqStatus(bool isLocked) +void BasketStatusBar::setLockStatus(bool isLocked) { - if(!m_locktqStatus) + if(!m_lockStatus) return; if (isLocked) { - m_locktqStatus->setPixmap(SmallIcon("encrypted.png")); - TQToolTip::add(m_locktqStatus, i18n( + m_lockStatus->setPixmap(SmallIcon("encrypted.png")); + TQToolTip::add(m_lockStatus, i18n( "

This basket is locked.
Click to unlock it.

").replace(" ", " ") ); -// TQToolTip::add(m_locktqStatus, i18n("This basket is locked.\nClick to unlock it.")); +// TQToolTip::add(m_lockStatus, i18n("This basket is locked.\nClick to unlock it.")); } else { - m_locktqStatus->clear(); - TQToolTip::add(m_locktqStatus, i18n( + m_lockStatus->clear(); + TQToolTip::add(m_lockStatus, i18n( "

This basket is unlocked.
Click to lock it.

").replace(" ", " ") ); -// TQToolTip::add(m_locktqStatus, i18n("This basket is unlocked.\nClick to lock it.")); +// TQToolTip::add(m_lockStatus, i18n("This basket is unlocked.\nClick to lock it.")); } } -void BasketStatusBar::setSelectiontqStatus(const TQString &s) +void BasketStatusBar::setSelectionStatus(const TQString &s) { - if (m_selectiontqStatus) - m_selectiontqStatus->setText(s); + if (m_selectionStatus) + m_selectionStatus->setText(s); } -void BasketStatusBar::setUnsavedtqStatus(bool isUnsaved) +void BasketStatusBar::setUnsavedStatus(bool isUnsaved) { - if (!m_savedtqStatus) + if (!m_savedStatus) return; if (isUnsaved) { - if (m_savedtqStatus->pixmap() == 0) - m_savedtqStatus->setPixmap(m_savedStatusPixmap); + if (m_savedStatus->pixmap() == 0) + m_savedStatus->setPixmap(m_savedStatusPixmap); } else - m_savedtqStatus->clear(); + m_savedStatus->clear(); } #include "basketstatusbar.moc" diff --git a/src/basketstatusbar.h b/src/basketstatusbar.h index cb165e4..15baf32 100644 --- a/src/basketstatusbar.h +++ b/src/basketstatusbar.h @@ -46,10 +46,10 @@ class BasketStatusBar : public TQObject void setStatusBarHint(const TQString &hint); /// << Set a specific message or update if hint is empty void updateStatusBarHint(); /// << Display the current state message (dragging, editing) or reset the startsbar message void postStatusbarMessage(const TQString &text); - void setSelectiontqStatus(const TQString &s); - void setLocktqStatus(bool isLocked); + void setSelectionStatus(const TQString &s); + void setLockStatus(bool isLocked); void setupStatusBar(); - void setUnsavedtqStatus(bool isUnsaved); + void setUnsavedStatus(bool isUnsaved); protected: KStatusBar *statusBar () const; @@ -59,10 +59,10 @@ class BasketStatusBar : public TQObject private: KStatusBar *m_bar; KParts::StatusBarExtension *m_extension; - TQLabel *m_selectiontqStatus; - ClickableLabel *m_locktqStatus; - TQLabel *m_baskettqStatus; - TQLabel *m_savedtqStatus; + TQLabel *m_selectionStatus; + ClickableLabel *m_lockStatus; + TQLabel *m_basketStatus; + TQLabel *m_savedStatus; TQPixmap m_savedStatusPixmap; }; diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 1d7488c..50e7811 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -1342,18 +1342,18 @@ void BNPView::notesStateChanged() // Update statusbar message : if (currentBasket()->isLocked()) - setSelectiontqStatus(i18n("Locked")); + setSelectionStatus(i18n("Locked")); else if (!basket->isLoaded()) - setSelectiontqStatus(i18n("Loading...")); + setSelectionStatus(i18n("Loading...")); else if (basket->count() == 0) - setSelectiontqStatus(i18n("No notes")); + setSelectionStatus(i18n("No notes")); else { TQString count = i18n("%n note", "%n notes", basket->count() ); TQString selecteds = i18n("%n selected", "%n selected", basket->countSelecteds()); TQString showns = (currentDecoratedBasket()->filterData().isFiltering ? i18n("all matches") : i18n("no filter")); if (basket->countFounds() != basket->count()) showns = i18n("%n match", "%n matches", basket->countFounds()); - setSelectiontqStatus( + setSelectionStatus( i18n("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3").tqarg(count, showns, selecteds) ); } @@ -1870,7 +1870,7 @@ void BNPView::isLockedChanged() { bool isLocked = currentBasket()->isLocked(); - setLocktqStatus(isLocked); + setLockStatus(isLocked); // m_actLockBasket->setChecked(isLocked); m_actPropBasket->setEnabled(!isLocked); @@ -2044,14 +2044,14 @@ void BNPView::updateStatusBarHint() m_statusbar->updateStatusBarHint(); } -void BNPView::setSelectiontqStatus(TQString s) +void BNPView::setSelectionStatus(TQString s) { - m_statusbar->setSelectiontqStatus(s); + m_statusbar->setSelectionStatus(s); } -void BNPView::setLocktqStatus(bool isLocked) +void BNPView::setLockStatus(bool isLocked) { - m_statusbar->setLocktqStatus(isLocked); + m_statusbar->setLockStatus(isLocked); } void BNPView::postStatusbarMessage(const TQString& msg) @@ -2064,9 +2064,9 @@ void BNPView::setStatusBarHint(const TQString &hint) m_statusbar->setStatusBarHint(hint); } -void BNPView::setUnsavedtqStatus(bool isUnsaved) +void BNPView::setUnsavedStatus(bool isUnsaved) { - m_statusbar->setUnsavedtqStatus(isUnsaved); + m_statusbar->setUnsavedStatus(isUnsaved); } void BNPView::setActive(bool active) @@ -2299,7 +2299,7 @@ void BNPView::populateTagsMenu(KPopupMenu &menu, Note *referenceNote) sequence = currentTag->shortcut().operator TQKeySequence(); menu.insertItem(StateMenuItem::checkBoxIconSet( (referenceNote ? referenceNote->hasTag(currentTag) : false), - menu.tqcolorGroup()), + menu.colorGroup()), new StateMenuItem(currentState, sequence, true), i ); diff --git a/src/bnpview.h b/src/bnpview.h index 0025701..32ffc11 100644 --- a/src/bnpview.h +++ b/src/bnpview.h @@ -294,11 +294,11 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface public slots: void setCaption(TQString s); void updateStatusBarHint(); - void setSelectiontqStatus(TQString s); - void setLocktqStatus(bool isLocked); + void setSelectionStatus(TQString s); + void setLockStatus(bool isLocked); void postStatusbarMessage(const TQString&); void setStatusBarHint(const TQString&); - void setUnsavedtqStatus(bool isUnsaved); + void setUnsavedStatus(bool isUnsaved); void setActive(bool active = true); KActionCollection *actionCollection() { return m_actionCollection; }; diff --git a/src/exporterdialog.cpp b/src/exporterdialog.cpp index 7ef6585..fa753f7 100644 --- a/src/exporterdialog.cpp +++ b/src/exporterdialog.cpp @@ -61,10 +61,10 @@ ExporterDialog::ExporterDialog(Basket *basket, TQWidget *parent, const char *nam showTile(true); // Add a stretch at the bottom: // Duplicated code from AddBasketWizard::addStretch(TQWidget *parent): - (new TQWidget(page))->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + (new TQWidget(page))->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); // Double the width, because the filename should be visible - TQSize size(tqsizeHint()); + TQSize size(sizeHint()); resize(TQSize(size.width() * 2, size.height())); /* ========================== diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index f55f7af..eb0bbed 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -634,13 +634,13 @@ void KColorCombo2::popup() TQPoint popupPoint = mapToGlobal(TQPoint(0, 0)); - int popupHeight = m_popup->tqsizeHint().height(); + int popupHeight = m_popup->sizeHint().height(); if (popupPoint.y() + height() + popupHeight > desk.bottom()) popupPoint.setY(popupPoint.y() - popupHeight); else popupPoint.setY(popupPoint.y() + height()); - int popupWidth = m_popup->tqsizeHint().width(); + int popupWidth = m_popup->sizeHint().width(); if (popupPoint.x() + popupWidth > desk.right()) popupPoint.setX(desk.right() - popupWidth); diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp index 85e923e..0122289 100644 --- a/src/kicondialog.cpp +++ b/src/kicondialog.cpp @@ -86,7 +86,7 @@ KIconDialog::KIconDialog(TQWidget *parent, const char*) d = new KIconDialogPrivate; mpLoader = KGlobal::iconLoader(); init(); - resize(tqminimumSize()); + resize(minimumSize()); } KIconDialog::KIconDialog(KIconLoader *loader, TQWidget *parent, @@ -277,7 +277,7 @@ void KIconDialog::setCustomLocation( const TQString& location ) if (location.isEmpty()) { - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png")); + mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); } else { mFileList = mpLoader->queryIconsByDir(location); } @@ -304,7 +304,7 @@ void KIconDialog::showDialog() { d->custom = TQString(); - // Make it so tqminimumSize returns correct value + // Make it so minimumSize returns correct value d->ui->filterLabel->hide(); d->ui->searchLine->hide(); d->ui->progressBar->show(); @@ -313,7 +313,7 @@ void KIconDialog::showDialog() show(); // FIXME: this should be before show() but it doesn't work ;-( - resize(tqminimumSize()); + resize(minimumSize()); showIcons(); } diff --git a/src/kicondialogui.ui b/src/kicondialogui.ui index e29c0a3..0632f49 100644 --- a/src/kicondialogui.ui +++ b/src/kicondialogui.ui @@ -21,7 +21,7 @@ 0 - + 0 0 @@ -54,7 +54,7 @@ iconCanvas - + 370 290 diff --git a/src/likeback.cpp b/src/likeback.cpp index aafcab9..5690842 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -232,7 +232,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const // Initialize the button-bar: d->bar = new LikeBackBar(this); - d->bar->resize(d->bar->tqsizeHint()); + d->bar->resize(d->bar->sizeHint()); // Show the information message if it is the first time, and if the button-bar is shown: static const char *messageShown = "LikeBack_starting_information"; @@ -583,7 +583,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version) if (m_process) return; m_process = new KProcess(); - *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount"); + *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(fetchUserEmail()) ); if (!m_process->start()) { kdDebug() << "Couldn't start kcmshell.." << endl; @@ -604,23 +604,23 @@ void LikeBack::fetchUserEmail() // m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( TQString::tqfromLatin1("emaildefaults") ); + KConfig emailConf( TQString::fromLatin1("emaildefaults") ); // find out the default profile - emailConf.setGroup(TQString::tqfromLatin1("Defaults")); - TQString profile = TQString::tqfromLatin1("PROFILE_"); - profile += emailConf.readEntry(TQString::tqfromLatin1("Profile"), TQString::tqfromLatin1("Default")); + emailConf.setGroup(TQString::fromLatin1("Defaults")); + TQString profile = TQString::fromLatin1("PROFILE_"); + profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default")); emailConf.setGroup(profile); - TQString fromaddr = emailConf.readEntry(TQString::tqfromLatin1("EmailAddress")); + TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress")); if (fromaddr.isEmpty()) { struct passwd *p; p = getpwuid(getuid()); - d->fetchedEmail = TQString::tqfromLatin1(p->pw_name); + d->fetchedEmail = TQString::fromLatin1(p->pw_name); } else { - TQString name = emailConf.readEntry(TQString::tqfromLatin1("FullName")); + TQString name = emailConf.readEntry(TQString::fromLatin1("FullName")); if (!name.isEmpty()) - d->fetchedEmail = /*name + TQString::tqfromLatin1(" <") +*/ fromaddr /*+ TQString::tqfromLatin1(">")*/; + d->fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/; } // m_from->setText( fromaddr ); } @@ -670,7 +670,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); TQLabel *likeIcon = new TQLabel(buttons); likeIcon->setPixmap(likePixmap); - likeIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQRadioButton *likeButton = new TQRadioButton(i18n("Something you &like"), buttons); buttonsGrid->addWidget(likeIcon, /*row=*/0, /*column=*/0); buttonsGrid->addWidget(likeButton, /*row=*/0, /*column=*/1); @@ -680,7 +680,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); TQLabel *dislikeIcon = new TQLabel(buttons); dislikeIcon->setPixmap(dislikePixmap); - dislikeIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQRadioButton *dislikeButton = new TQRadioButton(i18n("Something you &dislike"), buttons); buttonsGrid->addWidget(dislikeIcon, /*row=*/1, /*column=*/0); buttonsGrid->addWidget(dislikeButton, /*row=*/1, /*column=*/1); @@ -690,7 +690,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); TQLabel *bugIcon = new TQLabel(buttons); bugIcon->setPixmap(bugPixmap); - bugIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQRadioButton *bugButton = new TQRadioButton(i18n("An improper &behavior of this application"), buttons); buttonsGrid->addWidget(bugIcon, /*row=*/2, /*column=*/0); buttonsGrid->addWidget(bugButton, /*row=*/2, /*column=*/1); @@ -700,7 +700,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); TQLabel *featureIcon = new TQLabel(buttons); featureIcon->setPixmap(featurePixmap); - featureIcon->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQRadioButton *featureButton = new TQRadioButton(i18n("A new &feature you desire"), buttons); buttonsGrid->addWidget(featureIcon, /*row=*/3, /*column=*/0); buttonsGrid->addWidget(featureButton, /*row=*/3, /*column=*/1); @@ -725,7 +725,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic")); - resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(tqsizeHint())); + resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint())); TQAction *sendShortcut = new TQAction(this); sendShortcut->setAccel(TQString("Ctrl+Return")); diff --git a/src/linklabel.cpp b/src/linklabel.cpp index c2060f7..fa67c54 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -269,19 +269,19 @@ void LinkLabel::setAlign(int hAlign, int vAlign) m_layout->remove(m_title); m_layout->removeItem(m_spacer2); - // Otherwise, tqminimumSize will be incoherent (last size ? ) + // Otherwise, minimumSize will be incoherent (last size ? ) m_layout->setResizeMode(TQLayout::Minimum); // And re-populate the widget with the appropriates things and order bool addSpacers = hAlign == 1; m_layout->setDirection(TQBoxLayout::LeftToRight); - //m_title->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Maximum/*Expanding*/, 0, 0, false) ); - m_icon->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred/*Expanding*/, 0, 0, false) ); + //m_title->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Maximum/*Expanding*/, 0, 0, false) ); + m_icon->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred/*Expanding*/, 0, 0, false) ); m_spacer1->changeSize( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Preferred/*Expanding*/ ); m_spacer2->changeSize( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Preferred/*Expanding*/ ); - m_icon->tqsetAlignment( hFlag | vFlag ); - m_title->tqsetAlignment( hFlag | vFlag | wBreak ); + m_icon->setAlignment( hFlag | vFlag ); + m_title->setAlignment( hFlag | vFlag | wBreak ); if ( addSpacers && (vAlign != 0) || (m_title->text().isEmpty() && hAlign == 2) ) m_layout->addItem(m_spacer1); @@ -392,7 +392,7 @@ void LinkDisplay::setLink(const TQString &title, const TQString &icon, const TQP m_font = font; // "Constants": - int BUTTON_MARGIN = kapp->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); int LINK_MARGIN = BUTTON_MARGIN + 2; // Recompute m_minWidth: @@ -422,15 +422,15 @@ void LinkDisplay::setWidth(int width) /** Paint on @p painter * in (@p x, @p y, @p width, @p height) - * using @p tqcolorGroup for the button drawing (if @p isHovered) + * using @p colorGroup for the button drawing (if @p isHovered) * and the LinkLook color() for the text, - * unless [the LinkLook !color.isValid() and it does not useLinkColor()] or [@p isDefaultColor is false]: in this case it will use @p tqcolorGroup.text(). + * unless [the LinkLook !color.isValid() and it does not useLinkColor()] or [@p isDefaultColor is false]: in this case it will use @p colorGroup.text(). * It will draw the button if @p isIconButtonHovered. */ -void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, const TQColorGroup &tqcolorGroup, +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().tqpixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin); int LINK_MARGIN = BUTTON_MARGIN + 2; TQPixmap pixmap; @@ -450,7 +450,7 @@ void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, // 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), - tqcolorGroup, TQStyle::Style_Enabled | (isIconButtonHovered ? TQStyle::Style_MouseOver : 0)); + colorGroup, TQStyle::Style_Enabled | (isIconButtonHovered ? TQStyle::Style_MouseOver : 0)); painter->drawPixmap(x + BUTTON_MARGIN - 1 + pixmapX, y + pixmapY, pixmap); // Figure out the text color: @@ -459,7 +459,7 @@ void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, else if (isIconButtonHovered) painter->setPen(m_look->effectiveHoverColor()); else if (!isDefaultColor || (!m_look->color().isValid() && !m_look->useLinkColor())) // If the color is FORCED or if the link color default to the text color: - painter->setPen(tqcolorGroup.text()); + painter->setPen(colorGroup.text()); else painter->setPen(m_look->effectiveColor()); // Draw the text: @@ -468,14 +468,14 @@ void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak, m_title); } -TQPixmap LinkDisplay::feedbackPixmap(int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor) +TQPixmap LinkDisplay::feedbackPixmap(int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor) { int theWidth = TQMIN(width, maxWidth()); int theHeight = TQMIN(height, heightForWidth(theWidth)); TQPixmap pixmap(theWidth, theHeight); - pixmap.fill(tqcolorGroup.background()); + pixmap.fill(colorGroup.background()); TQPainter painter(&pixmap); - paint(&painter, 0, 0, theWidth, theHeight, tqcolorGroup, isDefaultColor, + paint(&painter, 0, 0, theWidth, theHeight, colorGroup, isDefaultColor, /*isSelected=*/false, /*isHovered=*/false, /*isIconButtonHovered=*/false); painter.end(); return 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().tqpixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->tqstyle().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().tqpixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->tqstyle().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().tqpixelMetric(TQStyle::PM_ButtonMargin); + int BUTTON_MARGIN = kapp->tqstyle().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)); @@ -623,7 +623,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const TQString exTitle, TQGroupBox *gb = new TQHGroupBox(i18n("Example"), this); m_exLook = new LinkLook; m_example = new LinkLabel(exTitle, exIcon, m_exLook, 1, 1, gb); - m_example->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_example->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_example->setCursor(TQCursor(TQt::PointingHandCursor)); tqlayout->addWidget(gb); m_exTitle = exTitle; diff --git a/src/linklabel.h b/src/linklabel.h index 13283e3..7266ad4 100644 --- a/src/linklabel.h +++ b/src/linklabel.h @@ -152,8 +152,8 @@ class LinkDisplay int width() const { return m_width; } /// << @return the width of the link. It is never less than minWidth()! int height() const { return m_height; } /// << @return the height if the link after having set it a width. // And finaly, use it: - void paint(TQPainter *painter, int x, int y, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered, bool isIconButtonHovered) const; /// << Draw the link on a painter. Set textColor to be !isValid() to use the LinkLook color. Otherwise it will use this color! - TQPixmap feedbackPixmap(int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor); /// << @return the pixmap to put under the cursor while dragging this object. + void paint(TQPainter *painter, int x, int y, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered, bool isIconButtonHovered) const; /// << Draw the link on a painter. Set textColor to be !isValid() to use the LinkLook color. Otherwise it will use this color! + TQPixmap feedbackPixmap(int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor); /// << @return the pixmap to put under the cursor while dragging this object. // Eventually get some information about the link display: bool iconButtonAt(const TQPoint &pos) const; /// << @return true if the icon button is under point @p pos. TQRect iconButtonRect() const; /// << @return the rectangle of the icon button. diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dabecb1..0e8b5b9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -111,7 +111,7 @@ MainWindow::MainWindow(TQWidget *parent, const char *name) statusBar()->show(); statusBar()->setSizeGripEnabled(true); - setAutoSaveSettings(/*groupName=*/TQString::tqfromLatin1("MainWindow"), /*saveWindowSize=*//*FIXME:false:Why was it false??*/true); + setAutoSaveSettings(/*groupName=*/TQString::fromLatin1("MainWindow"), /*saveWindowSize=*//*FIXME:false:Why was it false??*/true); // m_actShowToolbar->setChecked( toolBar()->isShown() ); m_actShowStatusbar->setChecked( statusBar()->isShown() ); @@ -193,7 +193,7 @@ void MainWindow::slotNewToolbarConfig() // This is called when OK or Apply is cl createGUI("basketui.rc"); // TODO: Reconnect tags menu aboutToShow() ?? if (!Global::bnpView->isPart()) Global::bnpView->connectTagsMenu(); // The Tags menu was created again! - plugActionList( TQString::tqfromLatin1("go_baskets_list"), actBasketsList); + plugActionList( TQString::fromLatin1("go_baskets_list"), actBasketsList); applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); } @@ -221,13 +221,13 @@ void MainWindow::polish() bool shouldSave = false; // If position and size has never been set, set nice ones: - // - Set size to tqsizeHint() + // - Set size to sizeHint() // - Keep the window manager placing the window where it want and save this if (Settings::mainWindowSize().isEmpty()) { // std::cout << "Main Window Position: Initial Set in show()" << std::endl; int defaultWidth = kapp->desktop()->width() * 5 / 6; int defaultHeight = kapp->desktop()->height() * 5 / 6; - resize(defaultWidth, defaultHeight); // tqsizeHint() is bad (too small) and we want the user to have a good default area size + resize(defaultWidth, defaultHeight); // sizeHint() is bad (too small) and we want the user to have a good default area size shouldSave = true; } else { // std::cout << "Main Window Position: Recall in show(x=" diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index 82ee60e..04d39a8 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -98,7 +98,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_icon->setIconType(KIcon::NoGroup, KIcon::Action); m_icon->setIconSize(16); m_icon->setIcon(m_defaultProperties.icon.isEmpty() ? "basket" : m_defaultProperties.icon); - int size = TQMAX(m_icon->tqsizeHint().width(), m_icon->tqsizeHint().height()); + int size = TQMAX(m_icon->sizeHint().width(), m_icon->sizeHint().height()); m_icon->setFixedSize(size, size); // Make it square! TQToolTip::add(m_icon, i18n("Icon")); m_name = new TQLineEdit(/*i18n("Basket"), */page); @@ -108,7 +108,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro TQToolTip::add(m_name, i18n("Name")); m_backgroundColor = new KColorCombo2(TQColor(), KGlobalSettings::baseColor(), page); m_backgroundColor->setColor(TQColor()); - m_backgroundColor->setFixedSize(m_backgroundColor->tqsizeHint()); + m_backgroundColor->setFixedSize(m_backgroundColor->sizeHint()); m_backgroundColor->setColor(m_defaultProperties.backgroundColor); TQToolTip::add(m_backgroundColor, i18n("Background color")); nameLayout->addWidget(m_icon); @@ -200,7 +200,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro painter.end(); lastTemplate = new KIconViewItem(m_templates, lastTemplate, i18n("Mind map"), icon);*/ - m_templates->setMinimumHeight(topLayout->tqminimumSize().width() * 9 / 16); + m_templates->setMinimumHeight(topLayout->minimumSize().width() * 9 / 16); TQLabel *label = new TQLabel(m_templates, i18n("&Template:"), page); tqlayout->addWidget(label, /*stretch=*/0, TQt::AlignBottom); diff --git a/src/note.cpp b/src/note.cpp index 94eab87..436441d 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -73,7 +73,7 @@ Note::Note(Basket *parent) m_x(0), m_y(-1), m_width(-1), m_height(-1), m_groupWidth(250), m_isFolded(false), m_firstChild(0L), m_parentNote(0), - m_basket(parent), m_content(0), m_addedDate(TQDateTime::tqcurrentDateTime()), m_lastModificationDate(TQDateTime::tqcurrentDateTime()), + m_basket(parent), m_content(0), m_addedDate(TQDateTime::currentDateTime()), m_lastModificationDate(TQDateTime::currentDateTime()), m_computedAreas(false), m_onTop(false), m_deltaX(0), m_deltaY(0), m_deltaHeight(0), m_collapseFinished(true), m_expandingFinished(true), m_hovered(false), m_hoveredZone(Note::None), m_focused(false), m_selected(false), m_wasInLastSelectionRect(false), @@ -1284,7 +1284,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro // If the current style is a KStyle, use it to draw the expander (plus or minus): if (dynamic_cast(&(kapp->tqstyle())) != NULL) { // Set the 4 rounded corners background to background color: - TQColorGroup cg(basket->tqcolorGroup()); + TQColorGroup cg(basket->colorGroup()); cg.setColor(TQColorGroup::Base, background); // Fill the inside of the expander in white, typically: @@ -1304,7 +1304,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro } else { int width = EXPANDER_WIDTH; int height = EXPANDER_HEIGHT; - const TQColorGroup &cg = basket->tqcolorGroup(); + const TQColorGroup &cg = basket->colorGroup(); // Fill white area: painter->fillRect(x + 1, y + 1, width - 2, height - 2, cg.base()); @@ -1979,7 +1979,7 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) } // Determine the colors (for the richText drawing) and the text color (for the tags arrow too): - TQColorGroup cg(basket()->tqcolorGroup()); + TQColorGroup cg(basket()->colorGroup()); cg.setColor(TQColorGroup::Text, (m_computedState.textColor().isValid() ? m_computedState.textColor() : basket()->textColor()) ); cg.setColor(TQColorGroup::Background, bgColor); if (isSelected()) @@ -1990,14 +1990,14 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) TQColor textColor = cg.color(TQColorGroup::Text); TQColor light = Tools::mixColor(textColor, bgColor); TQColor mid = Tools::mixColor(textColor, light); - painter2.setPen(light);//TQPen(basket()->tqcolorGroup().dark().light(150))); + painter2.setPen(light);//TQPen(basket()->colorGroup().dark().light(150))); painter2.drawLine(xIcon, yIcon + 6, xIcon + 4, yIcon + 6); - painter2.setPen(mid);//TQPen(basket()->tqcolorGroup().dark())); + painter2.setPen(mid);//TQPen(basket()->colorGroup().dark())); painter2.drawLine(xIcon + 1, yIcon + 7, xIcon + 3, yIcon + 7); - painter2.setPen(textColor);//TQPen(basket()->tqcolorGroup().foreground())); + painter2.setPen(textColor);//TQPen(basket()->colorGroup().foreground())); painter2.drawPoint(xIcon + 2, yIcon + 8); } else if (m_haveInvisibleTags) { - painter2.setPen(cg.color(TQColorGroup::Text)/*TQPen(basket()->tqcolorGroup().foreground())*/); + painter2.setPen(cg.color(TQColorGroup::Text)/*TQPen(basket()->colorGroup().foreground())*/); painter2.drawPoint(xIcon, yIcon + 7); painter2.drawPoint(xIcon + 2, yIcon + 7); painter2.drawPoint(xIcon + 4, yIcon + 7); diff --git a/src/notecontent.cpp b/src/notecontent.cpp index 7dc7e17..01f56dc 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -152,7 +152,7 @@ Basket* NoteContent::basket() void NoteContent::setEdited() { - note()->setLastModificationDate(TQDateTime::tqcurrentDateTime()); + note()->setLastModificationDate(TQDateTime::currentDateTime()); basket()->save(); } @@ -378,14 +378,14 @@ TQPixmap HtmlContent::feedbackPixmap(int width, int height) { TQSimpleRichText richText(html(), note()->font()); richText.setWidth(width); - TQColorGroup tqcolorGroup(basket()->tqcolorGroup()); - tqcolorGroup.setColor(TQColorGroup::Text, note()->textColor()); - tqcolorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); + TQColorGroup colorGroup(basket()->colorGroup()); + colorGroup.setColor(TQColorGroup::Text, note()->textColor()); + colorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); TQPixmap pixmap( TQMIN(width, richText.widthUsed()), TQMIN(height, richText.height()) ); pixmap.fill(note()->backgroundColor().dark(FEEDBACK_DARKING)); TQPainter painter(&pixmap); painter.setPen(note()->textColor()); - richText.draw(&painter, 0, 0, TQRect(0, 0, pixmap.width(), pixmap.height()), tqcolorGroup); + richText.draw(&painter, 0, 0, TQRect(0, 0, pixmap.width(), pixmap.height()), colorGroup); painter.end(); return pixmap; } @@ -433,10 +433,10 @@ TQPixmap AnimationContent::feedbackPixmap(int width, int height) TQPixmap LinkContent::feedbackPixmap(int width, int height) { - TQColorGroup tqcolorGroup(basket()->tqcolorGroup()); - tqcolorGroup.setColor(TQColorGroup::Text, note()->textColor()); - tqcolorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); - return m_linkDisplay.feedbackPixmap(width, height, tqcolorGroup, /*isDefaultColor=*/note()->textColor() == basket()->textColor()); + TQColorGroup colorGroup(basket()->colorGroup()); + colorGroup.setColor(TQColorGroup::Text, note()->textColor()); + colorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); + return m_linkDisplay.feedbackPixmap(width, height, colorGroup, /*isDefaultColor=*/note()->textColor() == basket()->textColor()); } TQPixmap ColorContent::feedbackPixmap(int width, int height) @@ -446,45 +446,45 @@ TQPixmap ColorContent::feedbackPixmap(int width, int height) int rectHeight = (textRect.height() + 2)*3/2; int rectWidth = rectHeight * 14 / 10; // 1.4 times the height, like A4 papers. - TQColorGroup tqcolorGroup(basket()->tqcolorGroup()); - tqcolorGroup.setColor(TQColorGroup::Text, note()->textColor()); - tqcolorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); + TQColorGroup colorGroup(basket()->colorGroup()); + colorGroup.setColor(TQColorGroup::Text, note()->textColor()); + colorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); TQPixmap pixmap( TQMIN(width, rectWidth + RECT_MARGIN + textRect.width() + RECT_MARGIN), TQMIN(height, rectHeight) ); pixmap.fill(note()->backgroundColor().dark(FEEDBACK_DARKING)); TQPainter painter(&pixmap); - paint(&painter, pixmap.width(), pixmap.height(), tqcolorGroup, false, false, false); // We don't care of the three last boolean parameters. + paint(&painter, pixmap.width(), pixmap.height(), colorGroup, false, false, false); // We don't care of the three last boolean parameters. painter.end(); return pixmap; } TQPixmap FileContent::feedbackPixmap(int width, int height) { - TQColorGroup tqcolorGroup(basket()->tqcolorGroup()); - tqcolorGroup.setColor(TQColorGroup::Text, note()->textColor()); - tqcolorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); - return m_linkDisplay.feedbackPixmap(width, height, tqcolorGroup, /*isDefaultColor=*/note()->textColor() == basket()->textColor()); + TQColorGroup colorGroup(basket()->colorGroup()); + colorGroup.setColor(TQColorGroup::Text, note()->textColor()); + colorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); + return m_linkDisplay.feedbackPixmap(width, height, colorGroup, /*isDefaultColor=*/note()->textColor() == basket()->textColor()); } TQPixmap LauncherContent::feedbackPixmap(int width, int height) { - TQColorGroup tqcolorGroup(basket()->tqcolorGroup()); - tqcolorGroup.setColor(TQColorGroup::Text, note()->textColor()); - tqcolorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); - return m_linkDisplay.feedbackPixmap(width, height, tqcolorGroup, /*isDefaultColor=*/note()->textColor() == basket()->textColor()); + TQColorGroup colorGroup(basket()->colorGroup()); + colorGroup.setColor(TQColorGroup::Text, note()->textColor()); + colorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); + return m_linkDisplay.feedbackPixmap(width, height, colorGroup, /*isDefaultColor=*/note()->textColor() == basket()->textColor()); } TQPixmap UnknownContent::feedbackPixmap(int width, int height) { TQRect textRect = TQFontMetrics(note()->font()).boundingRect(0, 0, /*width=*/1, 500000, TQt::AlignAuto | TQt::AlignTop | TQt::WordBreak, m_mimeTypes); - TQColorGroup tqcolorGroup(basket()->tqcolorGroup()); - tqcolorGroup.setColor(TQColorGroup::Text, note()->textColor()); - tqcolorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); + TQColorGroup colorGroup(basket()->colorGroup()); + colorGroup.setColor(TQColorGroup::Text, note()->textColor()); + colorGroup.setColor(TQColorGroup::Background, note()->backgroundColor().dark(FEEDBACK_DARKING)); TQPixmap pixmap( TQMIN(width, DECORATION_MARGIN + textRect.width() + DECORATION_MARGIN), TQMIN(height, DECORATION_MARGIN + textRect.height() + DECORATION_MARGIN) ); TQPainter painter(&pixmap); - paint(&painter, pixmap.width() + 1, pixmap.height(), tqcolorGroup, false, false, false); // We don't care of the three last boolean parameters. + paint(&painter, pixmap.width() + 1, pixmap.height(), colorGroup, false, false, false); // We don't care of the three last boolean parameters. painter.setPen(note()->backgroundColor().dark(FEEDBACK_DARKING)); painter.drawPoint(0, 0); painter.drawPoint(pixmap.width() - 1, 0); @@ -520,11 +520,11 @@ int TextContent::setWidthAndGetHeight(int width) return 10; // Lazy loaded } -void TextContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) +void TextContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) { if (m_simpleRichText) { width -= 1; - m_simpleRichText->draw(painter, 0, 0, TQRect(0, 0, width, height), tqcolorGroup); + m_simpleRichText->draw(painter, 0, 0, TQRect(0, 0, width, height), colorGroup); } } @@ -629,11 +629,11 @@ int HtmlContent::setWidthAndGetHeight(int width) return 10; // Lazy loaded } -void HtmlContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) +void HtmlContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) { if (m_simpleRichText) { width -= 1; - m_simpleRichText->draw(painter, 0, 0, TQRect(0, 0, width, height), tqcolorGroup); + m_simpleRichText->draw(painter, 0, 0, TQRect(0, 0, width, height), colorGroup); } } @@ -735,7 +735,7 @@ int ImageContent::setWidthAndGetHeight(int width) } } -void ImageContent::paint(TQPainter *painter, int width, int /*height*/, const TQColorGroup &/*tqcolorGroup*/, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) +void ImageContent::paint(TQPainter *painter, int width, int /*height*/, const TQColorGroup &/*colorGroup*/, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) { width -= 1; // KPixmap pixmap = m_pixmap; @@ -855,7 +855,7 @@ void ImageContent::exportToHTML(HTMLExporter *exporter, int /*indent*/) int AnimationContent::INVALID_STATUS = -100; AnimationContent::AnimationContent(Note *parent, const TQString &fileName, bool lazyLoad) - : NoteContent(parent, fileName), m_oldtqStatus(INVALID_STATUS) + : NoteContent(parent, fileName), m_oldStatus(INVALID_STATUS) { basket()->addWatchedFile(fullPath()); loadFromFile(lazyLoad); @@ -867,7 +867,7 @@ int AnimationContent::setWidthAndGetHeight(int /*width*/) return m_movie.framePixmap().height() ; // TODO!!! } -void AnimationContent::paint(TQPainter *painter, int width, int /*height*/, const TQColorGroup &/*tqcolorGroup*/, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) +void AnimationContent::paint(TQPainter *painter, int width, int /*height*/, const TQColorGroup &/*colorGroup*/, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) { /*width -= 1*/; // DEBUG_WIN << "AnimationContent::paint()"; @@ -929,7 +929,7 @@ bool AnimationContent::setMovie(const TQMovie &movie) m_movie = movie; m_movie.connectUpdate( this, TQT_SLOT(movieUpdated(const TQRect&)) ); m_movie.connectResize( this, TQT_SLOT(movieResized(const TQSize&)) ); - m_movie.connectStatus( this, TQT_SLOT(movietqStatus(int)) ); + m_movie.connectStatus( this, TQT_SLOT(movieStatus(int)) ); contentChanged( m_movie.framePixmap().width() + 1 ); // TODO return true; } @@ -953,21 +953,21 @@ void AnimationContent::movieResized(const TQSize&) * - For animation: TQMovie::EndOfFrame... (for each image), TQMovie::EndOfLoop, * and it then restart that for each loop. */ -void AnimationContent::movietqStatus(int status) +void AnimationContent::movieStatus(int status) { DEBUG_WIN << "movieStatus()"; // At least two frames: it's an animation, everything is OK - if (m_oldtqStatus == TQMovie::EndOfFrame && status == TQMovie::EndOfFrame) { + if (m_oldStatus == TQMovie::EndOfFrame && status == TQMovie::EndOfFrame) { movie().disconnectStatus(this); - m_oldtqStatus = INVALID_STATUS; + m_oldStatus = INVALID_STATUS; // if (note()->isFocused()) // When inserting a new note we ensure it visble // basket()->ensureNoteVisible(note()); // But after loading it has certainly grown and if it was } // Only one image: it's an image, change note's type - else if (m_oldtqStatus == TQMovie::EndOfFrame && status == TQMovie::EndOfLoop) { + else if (m_oldStatus == TQMovie::EndOfFrame && status == TQMovie::EndOfLoop) { movie().disconnectStatus(this); - m_oldtqStatus = INVALID_STATUS; + m_oldStatus = INVALID_STATUS; note()->setContent(new ImageContent(note(), fileName())); basket()->save(); //delete this; // CRASH, as always !!!!!!!!! @@ -977,7 +977,7 @@ void AnimationContent::movietqStatus(int status) // TQTimer::singleShot(25, note(), TQT_SLOT(delayedEnsureVisible())); } else - m_oldtqStatus = status; + m_oldStatus = status; } void AnimationContent::exportToHTML(HTMLExporter *exporter, int /*indent*/) @@ -1004,9 +1004,9 @@ int FileContent::setWidthAndGetHeight(int width) return m_linkDisplay.height(); } -void FileContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered) +void FileContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered) { - m_linkDisplay.paint(painter, 0, 0, width, height, tqcolorGroup, isDefaultColor, isSelected, isHovered, isHovered && note()->hoveredZone() == Note::Custom0); + m_linkDisplay.paint(painter, 0, 0, width, height, colorGroup, isDefaultColor, isSelected, isHovered, isHovered && note()->hoveredZone() == Note::Custom0); } bool FileContent::loadFromFile(bool /*lazyLoad*/) @@ -1221,9 +1221,9 @@ int LinkContent::setWidthAndGetHeight(int width) return m_linkDisplay.height(); } -void LinkContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered) +void LinkContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered) { - m_linkDisplay.paint(painter, 0, 0, width, height, tqcolorGroup, isDefaultColor, isSelected, isHovered, isHovered && note()->hoveredZone() == Note::Custom0); + m_linkDisplay.paint(painter, 0, 0, width, height, colorGroup, isDefaultColor, isSelected, isHovered, isHovered && note()->hoveredZone() == Note::Custom0); } void LinkContent::saveToNode(TQDomDocument &doc, TQDomElement &content) @@ -1407,9 +1407,9 @@ int LauncherContent::setWidthAndGetHeight(int width) return m_linkDisplay.height(); } -void LauncherContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered) +void LauncherContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered) { - m_linkDisplay.paint(painter, 0, 0, width, height, tqcolorGroup, isDefaultColor, isSelected, isHovered, isHovered && note()->hoveredZone() == Note::Custom0); + m_linkDisplay.paint(painter, 0, 0, width, height, colorGroup, isDefaultColor, isSelected, isHovered, isHovered && note()->hoveredZone() == Note::Custom0); } bool LauncherContent::loadFromFile(bool /*lazyLoad*/) // TODO: saveToFile() ?? Is it possible? @@ -1527,7 +1527,7 @@ int ColorContent::setWidthAndGetHeight(int /*width*/) // We do not need width be return rectHeight; } -void ColorContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) +void ColorContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) { // FIXME: Duplicate from setColor(): TQRect textRect = TQFontMetrics(note()->font()).boundingRect(color().name()); @@ -1553,7 +1553,7 @@ void ColorContent::paint(TQPainter *painter, int width, int height, const TQColo // Draw the text: painter->setFont(note()->font()); - painter->setPen(tqcolorGroup.text()); + painter->setPen(colorGroup.text()); painter->drawText(rectWidth + RECT_MARGIN, 0, width - rectWidth - RECT_MARGIN, height, TQt::AlignAuto | TQt::AlignVCenter, color().name()); } @@ -1814,29 +1814,29 @@ extern void drawGradient( TQPainter *p, const TQColor &colorTop, const TQColor & int x, int y, int w, int h, bool sunken, bool horz, bool flat ); /*const*/ -void UnknownContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) +void UnknownContent::paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool /*isDefaultColor*/, bool /*isSelected*/, bool /*isHovered*/) { width -= 1; - painter->setPen(tqcolorGroup.text()); + painter->setPen(colorGroup.text()); // FIXME: Duplicate from ColorContent::paint() and CommonColorSelector::drawColorRect: // Fill with gradient: - drawGradient(painter, tqcolorGroup.background(), tqcolorGroup.background().dark(110), 1, 1, width - 2, height - 2, /*sunken=*/false, /*horz=*/true, /*flat=*/false); + drawGradient(painter, colorGroup.background(), colorGroup.background().dark(110), 1, 1, width - 2, height - 2, /*sunken=*/false, /*horz=*/true, /*flat=*/false); // Stroke: - TQColor stroke = Tools::mixColor(tqcolorGroup.background(), tqcolorGroup.text()); + TQColor stroke = Tools::mixColor(colorGroup.background(), colorGroup.text()); painter->setPen(stroke); painter->drawLine(1, 0, width - 2, 0); painter->drawLine(0, 1, 0, height - 2); painter->drawLine(1, height - 1, width - 2, height - 1); painter->drawLine(width - 1, 1, width - 1, height - 2); // Round corners: - painter->setPen(Tools::mixColor(tqcolorGroup.background(), stroke)); + painter->setPen(Tools::mixColor(colorGroup.background(), stroke)); painter->drawPoint(1, 1); painter->drawPoint(1, height - 2); painter->drawPoint(width - 2, height - 2); painter->drawPoint(width - 2, 1); - painter->setPen(tqcolorGroup.text()); + painter->setPen(colorGroup.text()); painter->drawText(DECORATION_MARGIN, DECORATION_MARGIN, width - 2*DECORATION_MARGIN, height - 2*DECORATION_MARGIN, TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak, m_mimeTypes); } diff --git a/src/notecontent.h b/src/notecontent.h index 40bb1d9..bc71876 100644 --- a/src/notecontent.h +++ b/src/notecontent.h @@ -83,7 +83,7 @@ class NoteContent // TODO: Mark some methods as const! and some (lik virtual void exportToHTML(HTMLExporter *exporter, int indent) = 0; /// << Export the note in an HTML file. virtual TQString cssClass() = 0; /// << @return the CSS class of the note when exported to HTML virtual int setWidthAndGetHeight(int width) = 0; /// << Retqlayout content with @p width (never less than minWidth()). @return its new height. - virtual void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered) = 0; /// << Paint the content on @p painter, at coordinate (0, 0) and with the size (@p width, @p height). + virtual void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered) = 0; /// << Paint the content on @p painter, at coordinate (0, 0) and with the size (@p width, @p height). virtual bool loadFromFile(bool /*lazyLoad*/) { return false; } /// << Load the content from the file. The default implementation does nothing. @see fileName(). virtual bool finishLazyLoad() { return false; } /// << Load what was not loaded by loadFromFile() if it was lazy-loaded virtual bool saveToFile() { return false; } /// << Save the content to the file. The default implementation does nothing. @see fileName(). @@ -163,7 +163,7 @@ class TextContent : public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool lazyLoad); bool finishLazyLoad(); bool saveToFile(); @@ -206,7 +206,7 @@ class HtmlContent : public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool lazyLoad); bool finishLazyLoad(); bool saveToFile(); @@ -249,7 +249,7 @@ class ImageContent : public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool lazyLoad); bool finishLazyLoad(); bool saveToFile(); @@ -299,7 +299,7 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool lazyLoad); bool finishLazyLoad(); bool saveToFile(); @@ -312,10 +312,10 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a protected slots: void movieUpdated(const TQRect&); void movieResized(const TQSize&); - void movietqStatus(int status); + void movieStatus(int status); protected: TQMovie m_movie; - int m_oldtqStatus; + int m_oldStatus; static int INVALID_STATUS; }; @@ -342,7 +342,7 @@ class FileContent : public TQObject, public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool /*lazyLoad*/); void fontChanged(); void linkLookChanged(); @@ -430,7 +430,7 @@ class LinkContent : public TQObject, public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); void saveToNode(TQDomDocument &doc, TQDomElement &content); void fontChanged(); void linkLookChanged(); @@ -493,7 +493,7 @@ class LauncherContent : public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool /*lazyLoad*/); void fontChanged(); TQString editToolTipText(); @@ -543,7 +543,7 @@ class ColorContent : public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); void saveToNode(TQDomDocument &doc, TQDomElement &content); void fontChanged(); TQString editToolTipText(); @@ -584,7 +584,7 @@ class UnknownContent : public NoteContent void exportToHTML(HTMLExporter *exporter, int indent); TQString cssClass(); int setWidthAndGetHeight(int width); - void paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered); + void paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered); bool loadFromFile(bool /*lazyLoad*/); void fontChanged(); TQString editToolTipText(); diff --git a/src/notedrag.cpp b/src/notedrag.cpp index 5f00918..67b45a3 100644 --- a/src/notedrag.cpp +++ b/src/notedrag.cpp @@ -227,7 +227,7 @@ void NoteDrag::serializeLinks(NoteSelection *noteList, KMultipleDrag *multipleDr multipleDrag->addDragObject(urlsDrag); #else KURLDrag2 *urlsDrag = new KURLDrag2(urls); - TQByteArray byteArray = urlsDrag->tqencodedData2("text/uri-list"); + TQByteArray byteArray = urlsDrag->encodedData2("text/uri-list"); TQStoredDrag *uriListDrag = new TQStoredDrag("text/uri-list"); uriListDrag->setEncodedData(byteArray); multipleDrag->addDragObject(uriListDrag); @@ -375,7 +375,7 @@ bool NoteDrag::canDecode(TQMimeSource *source) Basket* NoteDrag::basketOf(TQMimeSource *source) { - TQBuffer buffer(source->tqencodedData(NOTE_MIME_STRING)); + TQBuffer buffer(source->encodedData(NOTE_MIME_STRING)); if (buffer.open(IO_ReadOnly)) { TQDataStream stream(&buffer); // Get the parent basket: @@ -388,7 +388,7 @@ Basket* NoteDrag::basketOf(TQMimeSource *source) TQValueList NoteDrag::notesOf(TQMimeSource *source) { - TQBuffer buffer(source->tqencodedData(NOTE_MIME_STRING)); + TQBuffer buffer(source->encodedData(NOTE_MIME_STRING)); if (buffer.open(IO_ReadOnly)) { TQDataStream stream(&buffer); // Get the parent basket: @@ -410,7 +410,7 @@ TQValueList NoteDrag::notesOf(TQMimeSource *source) Note* NoteDrag::decode(TQMimeSource *source, Basket *parent, bool moveFiles, bool moveNotes) { - TQBuffer buffer(source->tqencodedData(NOTE_MIME_STRING)); + TQBuffer buffer(source->encodedData(NOTE_MIME_STRING)); if (buffer.open(IO_ReadOnly)) { TQDataStream stream(&buffer); // Get the parent basket: @@ -558,7 +558,7 @@ bool ExtendedTextDrag::decode(const TQMimeSource *e, TQString &str, TQCString &s // Test if it was a UTF-16 string (from eg. Mozilla): if (str.length() >= 2) { if ((str[0] == 0xFF && str[1] == 0xFE) || (str[0] == 0xFE && str[1] == 0xFF)) { - TQByteArray utf16 = e->tqencodedData(TQString("text/" + subtype).local8Bit()); + TQByteArray utf16 = e->encodedData(TQString("text/" + subtype).local8Bit()); str = TQTextCodec::codecForName("utf16")->toUnicode(utf16); return true; } @@ -567,22 +567,22 @@ bool ExtendedTextDrag::decode(const TQMimeSource *e, TQString &str, TQCString &s // Test if it was empty (sometimes, from GNOME or Mozilla) if (str.length() == 0 && subtype == "plain") { if (e->provides("UTF8_STRING")) { - TQByteArray utf8 = e->tqencodedData("UTF8_STRING"); + TQByteArray utf8 = e->encodedData("UTF8_STRING"); str = TQTextCodec::codecForName("utf8")->toUnicode(utf8); return true; } if (e->provides("text/tqunicode")) { // FIXME: It's UTF-16 without order bytes!!! - TQByteArray utf16 = e->tqencodedData("text/tqunicode"); + TQByteArray utf16 = e->encodedData("text/tqunicode"); str = TQTextCodec::codecForName("utf16")->toUnicode(utf16); return true; } if (e->provides("TEXT")) { // local encoding - TQByteArray text = e->tqencodedData("TEXT"); + TQByteArray text = e->encodedData("TEXT"); str = TQString(text); return true; } if (e->provides("COMPOUND_TEXT")) { // local encoding - TQByteArray text = e->tqencodedData("COMPOUND_TEXT"); + TQByteArray text = e->encodedData("COMPOUND_TEXT"); str = TQString(text); return true; } diff --git a/src/notedrag.h b/src/notedrag.h index eeff237..804d05d 100644 --- a/src/notedrag.h +++ b/src/notedrag.h @@ -87,7 +87,7 @@ class ExtendedTextDrag : public TQTextDrag static bool decode(const TQMimeSource *e, TQString &str, TQCString &subtype); }; -// Support KDE 3.3 and older PROTECTED KURLDrag::tqencodedData()! +// Support KDE 3.3 and older PROTECTED KURLDrag::encodedData()! #include class KURLDrag2 : public KURLDrag @@ -96,9 +96,9 @@ class KURLDrag2 : public KURLDrag TQ_OBJECT public: KURLDrag2(const KURL::List &urls) : KURLDrag(urls) {} - TQByteArray tqencodedData2(const char *mime) const + TQByteArray encodedData2(const char *mime) const { - return tqencodedData(mime); + return encodedData(mime); } }; diff --git a/src/noteedit.cpp b/src/noteedit.cpp index e47933a..056e98e 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -337,10 +337,10 @@ void HtmlEditor::fontChanged(const TQFont &font) //void HtmlEditor::setBold() { textEdit()->setBold( InlineEditors::instance()->richTextBold->isChecked() ); } //void HtmlEditor::setItalic() { textEdit()->setItalic( InlineEditors::instance()->richTextItalic->isChecked() ); } //void HtmlEditor::setUnderline() { textEdit()->setUnderline( InlineEditors::instance()->richTextUnderline->isChecked() ); } -void HtmlEditor::setLeft() { textEdit()->tqsetAlignment(TQt::AlignLeft); } -void HtmlEditor::setCentered() { textEdit()->tqsetAlignment(TQt::AlignCenter); } -void HtmlEditor::setRight() { textEdit()->tqsetAlignment(TQt::AlignRight); } -void HtmlEditor::setBlock() { textEdit()->tqsetAlignment(TQt::AlignJustify); } +void HtmlEditor::setLeft() { textEdit()->setAlignment(TQt::AlignLeft); } +void HtmlEditor::setCentered() { textEdit()->setAlignment(TQt::AlignCenter); } +void HtmlEditor::setRight() { textEdit()->setAlignment(TQt::AlignRight); } +void HtmlEditor::setBlock() { textEdit()->setAlignment(TQt::AlignJustify); } HtmlEditor::~HtmlEditor() { @@ -559,12 +559,12 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQK m_autoIcon = new TQPushButton(i18n("Auto"), wid); // Create before to know size here: /* Icon button: */ m_icon->setIcon(m_noteContent->icon()); - int minSize = m_autoIcon->tqsizeHint().height(); + int minSize = m_autoIcon->sizeHint().height(); // Make the icon button at least the same heigh than the other buttons for a better tqalignment (nicer to the eyes): - if (m_icon->tqsizeHint().height() < minSize) + if (m_icon->sizeHint().height() < minSize) m_icon->setFixedSize(minSize, minSize); else - m_icon->setFixedSize(m_icon->tqsizeHint().height(), m_icon->tqsizeHint().height()); // Make it square + m_icon->setFixedSize(m_icon->sizeHint().height(), m_icon->sizeHint().height()); // Make it square /* Auto button: */ m_autoIcon->setToggleButton(true); m_autoIcon->setOn(m_noteContent->autoIcon()); @@ -593,7 +593,7 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQK connect( m_autoIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessIcon()) ); TQWidget *stretchWidget = new TQWidget(page); - stretchWidget->tqsetSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space + stretchWidget->setSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space tqlayout->addWidget(stretchWidget, 3, 1, TQt::AlignVCenter); @@ -674,15 +674,15 @@ void LinkEditDialog::slotOk() /* Change icon size if link look have changed */ LinkLook *linkLook = LinkLook::lookForURL(filteredURL); TQString icon = m_icon->icon(); // When we change size, icon isn't changed and keep it's old size - m_icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); // Reset size policy + m_icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); // Reset size policy m_icon->setIconSize(linkLook->iconSize()); // So I store it's name and reload it after size change ! m_icon->setIcon(icon); - int minSize = m_autoIcon->tqsizeHint().height(); + int minSize = m_autoIcon->sizeHint().height(); // Make the icon button at least the same heigh than the other buttons for a better tqalignment (nicer to the eyes): - if (m_icon->tqsizeHint().height() < minSize) + if (m_icon->sizeHint().height() < minSize) m_icon->setFixedSize(minSize, minSize); else - m_icon->setFixedSize(m_icon->tqsizeHint().height(), m_icon->tqsizeHint().height()); // Make it square + m_icon->setFixedSize(m_icon->sizeHint().height(), m_icon->sizeHint().height()); // Make it square KDialogBase::slotOk(); } @@ -711,12 +711,12 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *p TQPushButton *guessButton = new TQPushButton(i18n("&Guess"), wid); /* Icon button: */ m_icon->setIcon(service.icon()); - int minSize = guessButton->tqsizeHint().height(); + int minSize = guessButton->sizeHint().height(); // Make the icon button at least the same heigh than the other buttons for a better tqalignment (nicer to the eyes): - if (m_icon->tqsizeHint().height() < minSize) + if (m_icon->sizeHint().height() < minSize) m_icon->setFixedSize(minSize, minSize); else - m_icon->setFixedSize(m_icon->tqsizeHint().height(), m_icon->tqsizeHint().height()); // Make it square + m_icon->setFixedSize(m_icon->sizeHint().height(), m_icon->sizeHint().height()); // Make it square /* Guess button: */ hLay->addWidget(m_icon); hLay->addWidget(guessButton); @@ -734,7 +734,7 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *p tqlayout->addWidget(wid, 2, 1, TQt::AlignVCenter); TQWidget *stretchWidget = new TQWidget(page); - stretchWidget->tqsetSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space + stretchWidget->setSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space tqlayout->addWidget(stretchWidget, 3, 1, TQt::AlignVCenter); connect( guessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessIcon()) ); @@ -805,7 +805,7 @@ void InlineEditors::initToolBars(KActionCollection *actionCollection) // Init the RichTextEditor Toolbar: richTextFont = new FocusedFontCombo(Global::mainWindow()); - richTextFont->setFixedWidth(richTextFont->tqsizeHint().width() * 2 / 3); + richTextFont->setFixedWidth(richTextFont->sizeHint().width() * 2 / 3); richTextFont->setCurrentFont(defaultFont.family()); KWidgetAction *action = new KWidgetAction(richTextFont, i18n("Font"), TQt::Key_F6, /*receiver=*/0, /*slot=*/"", actionCollection, "richtext_font"); @@ -816,7 +816,7 @@ void InlineEditors::initToolBars(KActionCollection *actionCollection) /*receiver=*/0, /*slot=*/"", actionCollection, "richtext_font_size"); richTextColor = new FocusedColorCombo(Global::mainWindow()); - richTextColor->setFixedWidth(richTextColor->tqsizeHint().height() * 2); + richTextColor->setFixedWidth(richTextColor->sizeHint().height() * 2); richTextColor->setColor(textColor); action = new KWidgetAction(richTextColor, i18n("Color"), KShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color"); diff --git a/src/notefactory.cpp b/src/notefactory.cpp index 1b8e83e..6292cef 100644 --- a/src/notefactory.cpp +++ b/src/notefactory.cpp @@ -399,7 +399,7 @@ Note* NoteFactory::dropNote(TQMimeSource *source, Basket *parent, bool fromDrop, */ if (source->provides("text/x-moz-url")) { // FOR MOZILLA // Get the array and create a TQChar array of 1/2 of the size - TQByteArray mozilla = source->tqencodedData("text/x-moz-url"); + TQByteArray mozilla = source->encodedData("text/x-moz-url"); TQMemArray chars( mozilla.count() / 2 ); // A small debug work to know the value of each bytes if (Global::debugWindow) @@ -471,7 +471,7 @@ Note* NoteFactory::createNoteUnknown(TQMimeSource *source, Basket *parent/*, con // Echo the length (in bytes) and then the data, and then same for next MIME type: for (int i = 0; source->format(i); ++i) if ( *(source->format(i)) ) { - TQByteArray data = source->tqencodedData(source->format(i)); + TQByteArray data = source->encodedData(source->format(i)); stream << (TQ_UINT32)data.count(); stream.writeRawBytes(data.data(), data.count()); } @@ -779,7 +779,7 @@ NoteType::Id NoteFactory::typeForURL(const KURL &url, Basket */*parent*/) if (metaInfo.isEmpty()) { // metaInfo is empty for GIF files on my machine ! if (viewText && maybeText(url)) return NoteType::Text; else if (viewHTML && (maybeHtml(url))) return NoteType::Html; - else if (viewImage && maybeAnimation(url)) return NoteType::Animation; // See Note::movietqStatus(int) + else if (viewImage && maybeAnimation(url)) return NoteType::Animation; // See Note::movieStatus(int) else if (viewImage && maybeImageOrAnimation(url)) return NoteType::Image; // for more explanations else if (viewSound && maybeSound(url)) return NoteType::Sound; else if (maybeLauncher(url)) return NoteType::Launcher; diff --git a/src/passwordlayout.ui b/src/passwordlayout.ui index e04577f..a26820c 100644 --- a/src/passwordlayout.ui +++ b/src/passwordlayout.ui @@ -104,7 +104,7 @@ Expanding - + 20 6 diff --git a/src/popupmenu.cpp b/src/popupmenu.cpp index 68085f3..403d475 100644 --- a/src/popupmenu.cpp +++ b/src/popupmenu.cpp @@ -43,7 +43,7 @@ void PopupMenu::execAtRectCenter(TQPopupMenu &menu, const TQRect &rect) { // Compute point where to popup the menu that should be centered : - TQSize menuSize = menu.tqsizeHint(); + TQSize menuSize = menu.sizeHint(); TQSize menuHalfSize = menuSize / 2; TQPoint point = rect.center() - TQPoint(menuHalfSize.width(), menuHalfSize.height()); @@ -66,7 +66,7 @@ void PopupMenu::execAtRectCenter(TQPopupMenu &menu, const TQRect &rect) void PopupMenu::execAtRectBottom(TQPopupMenu &menu, const TQRect &rect, bool centered) { - TQSize menuSize = menu.tqsizeHint() - TQSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)] + TQSize menuSize = menu.sizeHint() - TQSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)] int desktopWidth = kapp->desktop()->width(); // to be compared/added/substracted with TQRects/TQPoints... int desktopHeight = kapp->desktop()->height(); @@ -108,7 +108,7 @@ void PopupMenu::execAtRectBottom(TQPopupMenu &menu, const TQRect &rect, bool cen void PopupMenu::execAtRectRight(TQPopupMenu &menu, const TQRect &rect, bool centered) { - TQSize menuSize = menu.tqsizeHint() - TQSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)] + TQSize menuSize = menu.sizeHint() - TQSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)] int desktopWidth = kapp->desktop()->width(); // to be compared/added/substracted with TQRects/TQPoints... int desktopHeight = kapp->desktop()->height(); diff --git a/src/qeffects.cpp b/src/qeffects.cpp index 45ff01d..7c2dd0b 100644 --- a/src/qeffects.cpp +++ b/src/qeffects.cpp @@ -311,8 +311,8 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient ) totalWidth = widget->width(); totalHeight = widget->height(); } else { - totalWidth = widget->tqsizeHint().width(); - totalHeight = widget->tqsizeHint().height(); + totalWidth = widget->sizeHint().width(); + totalHeight = widget->sizeHint().height(); } currentHeight = totalHeight; diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp index c13b9fa..8f723a4 100644 --- a/src/regiongrabber.cpp +++ b/src/regiongrabber.cpp @@ -171,8 +171,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), - TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); } diff --git a/src/systemtray.cpp b/src/systemtray.cpp index 7700f28..6e2f364 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -121,7 +121,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) // kapp->widgetAt(g + TQPoint(tw-1, 0)) != this || // kapp->widgetAt(g + TQPoint(0, th-1)) != this || // kapp->widgetAt(g + TQPoint(tw-1, th-1)) != this) { - int systrayManagerWinId = tqtopLevelWidget()->winId(); + int systrayManagerWinId = topLevelWidget()->winId(); KWin::forceActiveWindow(systrayManagerWinId); kapp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed // KWin::activateWindow(systrayManagerWinId); diff --git a/src/tag.cpp b/src/tag.cpp index f560397..7af9db1 100644 --- a/src/tag.cpp +++ b/src/tag.cpp @@ -768,7 +768,7 @@ void IndentedMenuItem::paint(TQPainter *painter, const TQColorGroup &cg, bool ac } } -TQSize IndentedMenuItem::tqsizeHint() +TQSize IndentedMenuItem::sizeHint() { int iconSize = KIcon::SizeSmall; int iconMargin = StateMenuItem::iconMargin(); @@ -841,7 +841,7 @@ void StateMenuItem::paint(TQPainter *painter, const TQColorGroup &cg, bool activ } } -TQSize StateMenuItem::tqsizeHint() +TQSize StateMenuItem::sizeHint() { int iconSize = 16; // We use 16 instead of KIcon::SizeSmall (the size of icons in menus) because tags will always be 16*16 icons TQFont theFont = m_state->font(KGlobalSettings::menuFont()); @@ -851,15 +851,15 @@ TQSize StateMenuItem::tqsizeHint() TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg) { - int width = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); - int height = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorHeight, 0); + int width = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + int height = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorHeight, 0); TQRect rect(0, 0, width, height); TQColor menuBackgroundColor = (dynamic_cast(&(kapp->tqstyle())) == NULL ? TQColor(cg.background()) : cg.background().light(103)); // Enabled, Not hovering TQPixmap pixmap(width, height); - pixmap.fill(menuBackgroundColor); // In case the tqpixelMetric() haven't returned a bigger rectangle than what drawPrimitive() draws + pixmap.fill(menuBackgroundColor); // In case the pixelMetric() haven't returned a bigger rectangle than what drawPrimitive() draws TQPainter painter(&pixmap); int style = TQStyle::Style_Enabled | TQStyle::Style_Active | (checked ? TQStyle::Style_On : TQStyle::Style_Off); TQColor background = cg.color(TQColorGroup::Background); @@ -868,7 +868,7 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg) // Enabled, Hovering TQPixmap pixmapHover(width, height); - pixmapHover.fill(menuBackgroundColor); // In case the tqpixelMetric() haven't returned a bigger rectangle than what drawPrimitive() draws + pixmapHover.fill(menuBackgroundColor); // In case the pixelMetric() haven't returned a bigger rectangle than what drawPrimitive() draws painter.begin(&pixmapHover); style |= TQStyle::Style_MouseOver; cg.setColor(TQColorGroup::Background, KGlobalSettings::highlightColor()); @@ -877,7 +877,7 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg) // Disabled TQPixmap pixmapDisabled(width, height); - pixmapDisabled.fill(menuBackgroundColor); // In case the tqpixelMetric() haven't returned a bigger rectangle than what drawPrimitive() draws + pixmapDisabled.fill(menuBackgroundColor); // In case the pixelMetric() haven't returned a bigger rectangle than what drawPrimitive() draws painter.begin(&pixmapDisabled); style = /*TQStyle::Style_Enabled | */TQStyle::Style_Active | (checked ? TQStyle::Style_On : TQStyle::Style_Off); cg.setColor(TQColorGroup::Background, background); @@ -892,8 +892,8 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg) TQIconSet StateMenuItem::radioButtonIconSet(bool checked, TQColorGroup cg) { - int width = kapp->tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); - int height = kapp->tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorHeight, 0); + int width = kapp->tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); + int height = kapp->tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorHeight, 0); TQRect rect(0, 0, width, height); int style = TQStyle::Style_Default | TQStyle::Style_Enabled | (checked ? TQStyle::Style_On : TQStyle::Style_Off); @@ -908,7 +908,7 @@ TQIconSet StateMenuItem::radioButtonIconSet(bool checked, TQColorGroup cg) */ TQRadioButton rb(0); rb.setChecked(checked); - kapp->tqstyle().tqdrawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style); + kapp->tqstyle().drawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style); painter.end(); /* Some styles like Plastik (and derived ones) have TQStyle::PE_ExclusiveIndicator drawing a radiobutton disc, as wanted, * and leave pixels ouside it untouched, BUT TQStyle::PE_ExclusiveIndicatorMask is a fully black square. @@ -924,7 +924,7 @@ TQIconSet StateMenuItem::radioButtonIconSet(bool checked, TQColorGroup cg) //kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ExclusiveIndicator, &painter, rect, cg, style); style |= TQStyle::Style_MouseOver; cg.setColor(TQColorGroup::Background, KGlobalSettings::highlightColor()); - kapp->tqstyle().tqdrawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style); + kapp->tqstyle().drawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style); painter.end(); pixmapHover.setMask(pixmapHover.createHeuristicMask()); diff --git a/src/tag.h b/src/tag.h index df7c0dc..4683a37 100644 --- a/src/tag.h +++ b/src/tag.h @@ -166,7 +166,7 @@ class IndentedMenuItem : public TQCustomMenuItem IndentedMenuItem(const TQString &text, const TQString &icon = "", const TQString &shortcut = ""); ~IndentedMenuItem(); void paint(TQPainter *painter, const TQColorGroup &cg, bool active, bool enabled, int x, int y, int w, int h); - TQSize tqsizeHint(); + TQSize sizeHint(); bool fullSpan() { return true; } private: TQString m_text; @@ -183,7 +183,7 @@ class StateMenuItem : public TQCustomMenuItem StateMenuItem(State *state, const TQString &shortcut, bool withTagName = false); ~StateMenuItem(); void paint(TQPainter *painter, const TQColorGroup &cg, bool active, bool enabled, int x, int y, int w, int h); - TQSize tqsizeHint(); + TQSize sizeHint(); bool fullSpan() { return true; } private: State *m_state; diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp index 3cbca01..21ec672 100644 --- a/src/tagsedit.cpp +++ b/src/tagsedit.cpp @@ -217,7 +217,7 @@ void TagListViewItem::setup() tqrepaint(); } -void TagListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*tqcolorGroup*/, int /*column*/, int width, int /*align*/) +void TagListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*colorGroup*/, int /*column*/, int width, int /*align*/) { bool withIcon = m_stateCopy || (m_tagCopy && !m_tagCopy->isMultiState()); TQString text = (m_tagCopy ? m_tagCopy->newTag->name() : m_stateCopy->newState->name()); @@ -411,8 +411,8 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew connect( m_removeEmblem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot! // Make the icon button and the remove button the same height: - int height = TQMAX(m_emblem->tqsizeHint().width(), m_emblem->tqsizeHint().height()); - height = TQMAX(height, m_removeEmblem->tqsizeHint().height()); + int height = TQMAX(m_emblem->sizeHint().width(), m_emblem->sizeHint().height()); + height = TQMAX(height, m_removeEmblem->sizeHint().height()); m_emblem->setFixedSize(height, height); // Make it square m_removeEmblem->setFixedHeight(height); m_emblem->resetIcon(); @@ -432,7 +432,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew TQIconSet boldIconSet = kapp->iconLoader()->loadIconSet("text_bold", KIcon::Small); m_bold = new TQPushButton(boldIconSet, "", stateWidget); m_bold->setToggleButton(true); - int size = TQMAX(m_bold->tqsizeHint().width(), m_bold->tqsizeHint().height()); + int size = TQMAX(m_bold->sizeHint().width(), m_bold->sizeHint().height()); m_bold->setFixedSize(size, size); // Make it square! TQToolTip::add(m_bold, i18n("Bold")); @@ -541,17 +541,17 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew rightLayout->addStretch(); tqlayout->addWidget(rightWidget); - rightWidget->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Expanding); + rightWidget->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Expanding); // Equalize the width of the first column of the two grids: - int maxWidth = tagNameLabel->tqsizeHint().width(); - maxWidth = TQMAX(maxWidth, shortcutLabel->tqsizeHint().width()); - maxWidth = TQMAX(maxWidth, m_stateNameLabel->tqsizeHint().width()); - maxWidth = TQMAX(maxWidth, emblemLabel->tqsizeHint().width()); - maxWidth = TQMAX(maxWidth, textLabel->tqsizeHint().width()); - maxWidth = TQMAX(maxWidth, fontLabel->tqsizeHint().width()); - maxWidth = TQMAX(maxWidth, backgroundColorLabel->tqsizeHint().width()); - maxWidth = TQMAX(maxWidth, textEquivalentLabel->tqsizeHint().width()); + int maxWidth = tagNameLabel->sizeHint().width(); + maxWidth = TQMAX(maxWidth, shortcutLabel->sizeHint().width()); + maxWidth = TQMAX(maxWidth, m_stateNameLabel->sizeHint().width()); + maxWidth = TQMAX(maxWidth, emblemLabel->sizeHint().width()); + maxWidth = TQMAX(maxWidth, textLabel->sizeHint().width()); + maxWidth = TQMAX(maxWidth, fontLabel->sizeHint().width()); + maxWidth = TQMAX(maxWidth, backgroundColorLabel->sizeHint().width()); + maxWidth = TQMAX(maxWidth, textEquivalentLabel->sizeHint().width()); tagNameLabel->setFixedWidth(maxWidth); m_stateNameLabel->setFixedWidth(maxWidth); @@ -664,8 +664,8 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew connect( rename, TQT_SIGNAL(activated()), this, TQT_SLOT(renameIt()) ); m_tags->setMinimumSize( - m_tags->tqsizeHint().width() * 2, - m_tagBox->tqsizeHint().height() + m_stateBox->tqsizeHint().height() + m_tags->sizeHint().width() * 2, + m_tagBox->sizeHint().height() + m_stateBox->sizeHint().height() ); if (addNewTag) @@ -681,7 +681,7 @@ TagsEditDialog::~TagsEditDialog() void TagsEditDialog::resetTreeSizeHint() { - m_tags->setMinimumSize(m_tags->tqsizeHint()); + m_tags->setMinimumSize(m_tags->sizeHint()); } TagListViewItem* TagsEditDialog::itemForState(State *state) diff --git a/src/tagsedit.h b/src/tagsedit.h index 41fbb42..a97582c 100644 --- a/src/tagsedit.h +++ b/src/tagsedit.h @@ -87,7 +87,7 @@ class TagListViewItem : public TQListViewItem TagListViewItem* parent() const; // Reimplemented to cast the return value int width(const TQFontMetrics &fontMetrics, const TQListView *listView, int column) const; void setup(); - void paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align); + void paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align); private: TagCopy *m_tagCopy; diff --git a/src/tools.cpp b/src/tools.cpp index 4bccb66..81dad55 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -427,7 +427,7 @@ TQString Tools::fileNameForNewFile(const TQString &wantedName, const TQString &d bool Tools::isAFileCut(TQMimeSource *source) { if (source->provides("application/x-kde-cutselection")) { - TQByteArray array = source->tqencodedData("application/x-kde-cutselection"); + TQByteArray array = source->encodedData("application/x-kde-cutselection"); return !array.isEmpty() && TQCString(array.data(), array.size() + 1).at(0) == '1'; } else return false; diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp index d24725a..f212721 100644 --- a/src/variouswidgets.cpp +++ b/src/variouswidgets.cpp @@ -46,7 +46,7 @@ RunCommandRequester::RunCommandRequester(const TQString &runCommand, const TQStr m_runCommand = new TQLineEdit(runCommand, this); TQPushButton *pb = new TQPushButton(/*"C&hoose..."*/i18n("..."), this); - pb->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + pb->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); tqlayout->addWidget(m_runCommand); tqlayout->addWidget(pb); @@ -129,11 +129,11 @@ ViewSizeDialog::ViewSizeDialog(TQWidget *parent, int w, int h) "Resize the window to select the image size\n" "and close it or press Escape to accept changes."), this); label->move(8, 8); - label->setFixedSize( label->tqsizeHint() ); + label->setFixedSize( label->sizeHint() ); // setSizeGripEnabled(true) doesn't work (the grip stay at the same place), so we emulate it: m_sizeGrip = new TQSizeGrip(this); - m_sizeGrip->setFixedSize( m_sizeGrip->tqsizeHint() ); + m_sizeGrip->setFixedSize( m_sizeGrip->sizeHint() ); setGeometry(x(), y(), w, h); } @@ -269,7 +269,7 @@ FontSizeCombo::FontSizeCombo(bool rw, bool withDefault, TQWidget *parent, const insertItem(i18n("(Default)")); TQFontDatabase fontDB; - TQValueList sizes = fontDB.tqstandardSizes(); + TQValueList sizes = fontDB.standardSizes(); for (TQValueList::Iterator it = sizes.begin(); it != sizes.end(); ++it) insertItem(TQString::number(*it));