From ebbee358abafa1b5166404c6fe5cc44ae2837a57 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:21:13 -0600 Subject: Rename obsolete tq methods to standard names --- kolourpaint/kpmainwindow_edit.cpp | 14 +++++++------- kolourpaint/kpthumbnail.cpp | 10 +++++----- kolourpaint/kptool.cpp | 2 +- kolourpaint/pixmapfx/kpeffectbalance.cpp | 2 +- kolourpaint/pixmapfx/kpeffectsdialog.cpp | 14 +++++++------- kolourpaint/widgets/kptooltoolbar.cpp | 2 +- kolourpaint/widgets/kptoolwidgeterasersize.cpp | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'kolourpaint') diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index e5156148..cc9d5421 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -129,7 +129,7 @@ void kpMainWindow::setupEditMenuActions () // Paste should always be enabled, as long as there is something paste // (independent of whether we have a document or not) - connect (TQApplication::tqclipboard (), TQT_SIGNAL (dataChanged ()), + connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()), TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ())); slotEnablePaste (); } @@ -223,7 +223,7 @@ void kpMainWindow::slotCopy () { if (!sel.text ().isEmpty ()) { - TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()), + TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()), TQClipboard::Clipboard); // SYNC: Normally, users highlight text and press CTRL+C. @@ -243,7 +243,7 @@ void kpMainWindow::slotCopy () // Once we change KolourPaint to support highlighted text // and CTRL+C to copy only the highlighted text, delete // this code. - TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()), + TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()), TQClipboard::Selection); } } @@ -268,7 +268,7 @@ void kpMainWindow::slotCopy () rawPixmap, TQt::white)); // CONFIG - TQApplication::tqclipboard ()->setData (new kpSelectionDrag (sel), + TQApplication::clipboard ()->setData (new kpSelectionDrag (sel), TQClipboard::Clipboard); } @@ -288,7 +288,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw) bool hasSomething = false; - TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard); + TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard); if (ms) { // It's faster to test for TQTextDrag::canDecode() first due to the @@ -311,7 +311,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw) return hasSomething; } -// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqtqclipboard() to +// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqclipboard() to // emit dataChanged(). We don't want to have our paste // action disabled when we can actually paste something. // @@ -683,7 +683,7 @@ void kpMainWindow::slotPaste () // Acquire the pixmap // - TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard); + TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard); if (!ms) { kdError () << "kpMainWindow::slotPaste() without mimeSource" << endl; diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp index 06949f24..a1de8556 100644 --- a/kolourpaint/kpthumbnail.cpp +++ b/kolourpaint/kpthumbnail.cpp @@ -63,16 +63,16 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name) } - TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize (); + TQSize layoutMinimumSize = layout () ? layout ()->minimumSize () : TQSize (); #if DEBUG_KP_THUMBNAIL - kdDebug () << "\ttqlayout=" << tqlayout () - << " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl; + kdDebug () << "\tlayout=" << layout () + << " minSize=" << (layout () ? layout ()->minimumSize () : TQSize ()) << endl; kdDebug () << "\tboxLayout=" << boxLayout () << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ()) << endl; #endif - if (tqlayout ()) - tqlayout ()->setResizeMode (TQLayout::FreeResize); + if (layout ()) + layout ()->setResizeMode (TQLayout::FreeResize); setMinimumSize (TQMAX (layoutMinimumSize.width (), 64), TQMAX (layoutMinimumSize.height (), 64)); diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index dc28e2a9..dd2eea9c 100644 --- a/kolourpaint/kptool.cpp +++ b/kolourpaint/kptool.cpp @@ -944,7 +944,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e) if (m_mainWindow && e->button () == Qt::MidButton) { - const TQString text = TQApplication::tqclipboard ()->text (TQClipboard::Selection); + const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection); #if DEBUG_KP_TOOL && 1 kdDebug () << "\tMMB pasteText='" << text << "'" << endl; #endif diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index 9fb07cf1..c5aaa30e 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp @@ -275,7 +275,7 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection, // TODO: This is what should be shown in the m_gammaInput spinbox m_gammaLabel = new TQLabel (this); // TODO: This doesn't seem to be wide enough with some fonts so the - // whole tqlayout moves when we drag the gamma slider. + // whole layout moves when we drag the gamma slider. m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 ")); m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight); TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this); diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index ce39de75..206fcc91 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp @@ -258,20 +258,20 @@ void kpEffectsDialog::selectEffect (int which) TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize (); TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize (); TQLayout::ResizeMode previewGroupBoxResizeMode = - m_previewGroupBox->tqlayout () ? - m_previewGroupBox->tqlayout ()->resizeMode () : + m_previewGroupBox->layout () ? + m_previewGroupBox->layout ()->resizeMode () : TQLayout::Auto; #if DEBUG_KP_EFFECTS_DIALOG kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize << " maxSize=" << previewGroupBoxMaxSize << " size=" << m_previewGroupBox->size () - << " tqlayout=" << m_previewGroupBox->tqlayout () + << " layout=" << m_previewGroupBox->layout () << " resizeMode=" << previewGroupBoxResizeMode << endl; #endif - if (m_previewGroupBox->tqlayout ()) - m_previewGroupBox->tqlayout ()->setResizeMode (TQLayout::FreeResize); + if (m_previewGroupBox->layout ()) + m_previewGroupBox->layout ()->setResizeMode (TQLayout::FreeResize); #if DEBUG_KP_EFFECTS_DIALOG kdDebug () << "\tafter set resizeMode, previewGroupBox.size=" << m_previewGroupBox->size () << endl; @@ -300,8 +300,8 @@ void kpEffectsDialog::selectEffect (int which) kdDebug () << "\tafter set fixedSize, previewGroupBox.size=" << m_previewGroupBox->size () << endl; #endif - if (m_previewGroupBox->tqlayout ()) - m_previewGroupBox->tqlayout ()->setResizeMode (previewGroupBoxResizeMode); + if (m_previewGroupBox->layout ()) + m_previewGroupBox->layout ()->setResizeMode (previewGroupBoxResizeMode); #if DEBUG_KP_EFFECTS_DIALOG kdDebug () << "\tafter restore resizeMode, previewGroupBox.size=" << m_previewGroupBox->size () << endl; diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index 2ba8d816..4982d7ef 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -144,7 +144,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i setOrientation (orientation ()); #if DEBUG_KP_TOOL_TOOL_BAR - kdDebug () << "kpToolToolBar:: tqlayout tool widgets msec=" + kdDebug () << "kpToolToolBar:: layout tool widgets msec=" << timer.elapsed () << endl; #endif diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp index d27965a6..90167fd2 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp +++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp @@ -66,7 +66,7 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *na TQPixmap previewPixmap (s, s); if (i < 3) { - // HACK: kpToolWidgetBase's tqlayout code sucks and gives uneven spacing + // HACK: kpToolWidgetBase's layout code sucks and gives uneven spacing previewPixmap.resize ((width () - 4) / 3, 9); } -- cgit v1.2.3