From 805c2821ceaddada48b346c6d11bd0dc1351a539 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:33:07 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/modules/help/helpwidget.cpp | 14 +++++++------- src/modules/help/helpwidget.h | 4 ++-- src/modules/help/helpwindow.cpp | 4 ++-- src/modules/help/helpwindow.h | 2 +- src/modules/help/index.cpp | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/modules/help') diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 67ee30b0..cd32db5c 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include extern Index * g_pDocIndex; extern KviPointerList * g_pHelpWindowList; @@ -108,7 +108,7 @@ void KviHelpWidget::showIndex() void KviHelpWidget::resizeEvent(TQResizeEvent *e) { - int hght = m_pToolBar->tqsizeHint().height(); + int hght = m_pToolBar->sizeHint().height(); if(hght < 40)hght = 40; m_pToolBar->setGeometry(0,0,width(),hght); m_pTextBrowser->setGeometry(0,hght,width(),height() - hght); @@ -128,17 +128,17 @@ void KviHelpWidget::suicide() delete this; } -TQSize KviHelpWidget::tqsizeHint() const +TQSize KviHelpWidget::sizeHint() const { - int wdth = m_pTextBrowser->tqsizeHint().width(); - if(m_pToolBar->tqsizeHint().width() > wdth)wdth = m_pToolBar->tqsizeHint().width(); - TQSize s(wdth,m_pTextBrowser->tqsizeHint().height() + m_pToolBar->tqsizeHint().height()); + int wdth = m_pTextBrowser->sizeHint().width(); + if(m_pToolBar->sizeHint().width() > wdth)wdth = m_pToolBar->sizeHint().width(); + TQSize s(wdth,m_pTextBrowser->sizeHint().height() + m_pToolBar->sizeHint().height()); return s; } bool KviHelpWidget::eventFilter(TQObject * o, TQEvent *e) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if(e->type() == TQEvent::MouseButtonRelease) { if(m_pTextBrowser->hasSelectedText()) { diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index 9e2c1c49..b8253d65 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.h @@ -23,7 +23,7 @@ // #include "kvi_tal_hbox.h" -#include +#include #include "index.h" #include @@ -54,7 +54,7 @@ protected slots: void showIndex(); void suicide(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; TQTextBrowser * textBrowser() { return m_pTextBrowser; } }; diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 82003488..1be7f5e8 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -303,9 +303,9 @@ void KviHelpWindow::resizeEvent(TQResizeEvent *e) m_pSplitter->setGeometry(0,0,width(),height()); } -TQSize KviHelpWindow::tqsizeHint() const +TQSize KviHelpWindow::sizeHint() const { - return m_pHelpWidget->tqsizeHint(); + return m_pHelpWidget->sizeHint(); } void KviHelpWindow::fillCaptionBuffers() { diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h index 300116f8..1f243534 100644 --- a/src/modules/help/helpwindow.h +++ b/src/modules/help/helpwindow.h @@ -62,7 +62,7 @@ protected: virtual void saveProperties(KviConfig * cfg); virtual void loadProperties(KviConfig * cfg); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; TQTextBrowser * textBrowser(); public slots: void indexSelected ( int ); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 46dc4f22..596b0e44 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -5,7 +5,7 @@ #include #include "kvi_pointerhashtable.h" #include -#include +#include #include @@ -164,7 +164,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) if (text.isNull()) return; bool valid = TRUE; - const TQChar *buf = text.tqunicode(); + const TQChar *buf = text.unicode(); TQChar str[64]; TQChar c = buf[0]; int j = 0; @@ -727,7 +727,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & bool valid = TRUE; - const TQChar *buf = text.tqunicode(); + const TQChar *buf = text.unicode(); TQChar str[64]; -- cgit v1.2.1