diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/multibuffer.cpp | 2 | ||||
-rw-r--r-- | src/newui/button.cpp | 2 | ||||
-rw-r--r-- | src/newui/docksplitter.cpp | 4 | ||||
-rw-r--r-- | src/simplemainwindow.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 2ec9fd44..5fbc1cc9 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -147,7 +147,7 @@ void MultiBuffer::registerURL( const KURL &url, KParts::Part *part ) void MultiBuffer::registerDelayedActivation( KParts::Part *part, int line, int col ) { - m_delayedActivation[ part ] = tqMakePair( line, col ); + m_delayedActivation[ part ] = qMakePair( line, col ); } KParts::Part* MultiBuffer::createPart( const TQString &mimeType, diff --git a/src/newui/button.cpp b/src/newui/button.cpp index ef572a2e..ea63ea51 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index c3ca883b..3b447b80 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock) for (uint i = 0; i < m_docks.count(); ++i) for (uint j = 0; j < m_docks[i].count(); ++j) if (dock == m_docks[i][j]) - return tqMakePair(i, j); - return tqMakePair(0u, 0u); + return qMakePair(i, j); + return qMakePair(0u, 0u); } } diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index c1ce8002..65bf0792 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -772,12 +772,12 @@ void SimpleMainWindow::fillWindowMenu() int i = 0; if (list.count() > 0) - m_windowList << tqMakePair(m_windowMenu->insertSeparator(), KURL()); + m_windowList << qMakePair(m_windowMenu->insertSeparator(), KURL()); while (itt != list.end()) { temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() ); - m_windowList << tqMakePair(temp, *itt); + m_windowList << qMakePair(temp, *itt); ++i; ++itt; } |