From ef294564d71021e58e16bed8a9959741ad30843f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:13:25 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name (cherry picked from commit e65d401151bf81fa3590435a3eed3edcd995fa89) --- ksystemlog/src/acpid/acpidReader.cpp | 2 +- ksystemlog/src/apache/apacheReader.cpp | 2 +- ksystemlog/src/defaultReader.cpp | 4 ++-- ksystemlog/src/detailDialog.cpp | 10 +++++----- ksystemlog/src/detailDialogBase.ui | 2 +- ksystemlog/src/itemFactory.cpp | 4 ++-- ksystemlog/src/ksystemlog.cpp | 6 +++--- ksystemlog/src/logListItem.cpp | 4 ++-- ksystemlog/src/loggerDialogBase.ui | 10 +++++----- ksystemlog/src/view.cpp | 2 +- ksystemlog/src/viewToolTip.cpp | 2 +- ksystemlog/src/xorg/xorgReader.cpp | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ksystemlog/src/acpid/acpidReader.cpp b/ksystemlog/src/acpid/acpidReader.cpp index 124d627..fd7c1ce 100644 --- a/ksystemlog/src/acpid/acpidReader.cpp +++ b/ksystemlog/src/acpid/acpidReader.cpp @@ -57,7 +57,7 @@ LogLine* AcpidReader::parseMessage(TQString& logLine, LogFile* logFile) { if (dateBegin==-1 || dateEnd==-1) { type=i18n("none"); message=logLine; - date=TQDate::tqcurrentDate(); + date=TQDate::currentDate(); time=TQTime::currentTime(); } else { diff --git a/ksystemlog/src/apache/apacheReader.cpp b/ksystemlog/src/apache/apacheReader.cpp index 221e49d..ee44415 100644 --- a/ksystemlog/src/apache/apacheReader.cpp +++ b/ksystemlog/src/apache/apacheReader.cpp @@ -67,7 +67,7 @@ LogLine* ApacheReader::parseMessage(TQString& logLine, LogFile* logFile) { //Special case which sometimes happens if (logLine.find("[client")==0) { - date=TQDate::tqcurrentDate(); + date=TQDate::currentDate(); time=TQTime::currentTime(); level="notice"; } diff --git a/ksystemlog/src/defaultReader.cpp b/ksystemlog/src/defaultReader.cpp index e1f3a47..fc3da3a 100644 --- a/ksystemlog/src/defaultReader.cpp +++ b/ksystemlog/src/defaultReader.cpp @@ -356,7 +356,7 @@ bool DefaultReader::insertOrReplaceLine(TQString& buffer, LogFile* originalFile) LogLine* DefaultReader::parseMessage(TQString& logLine, LogFile* originalFile) { //kdDebug() << "Please don't use parseMessage() from SortedReader class" << endl; - int year=TQDate::tqcurrentDate().year(); + int year=TQDate::currentDate().year(); //Month number TQString month; @@ -376,7 +376,7 @@ LogLine* DefaultReader::parseMessage(TQString& logLine, LogFile* originalFile) { TQDate date(year, monthNum, dayNum); if (!date.isValid()) { kdDebug() << "Malformed date" << endl; - date=TQDate::tqcurrentDate(); + date=TQDate::currentDate(); } //Time diff --git a/ksystemlog/src/detailDialog.cpp b/ksystemlog/src/detailDialog.cpp index 9ffcd47..5574071 100644 --- a/ksystemlog/src/detailDialog.cpp +++ b/ksystemlog/src/detailDialog.cpp @@ -69,21 +69,21 @@ DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) : TQHBoxLayout* l1 = new TQHBoxLayout(0, 0, 5); icon=new TQLabel(widget); - //icon->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + //icon->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); l1->addWidget(icon, 0, TQt::AlignVCenter); //header=new KActiveLabel(widget, "header"); header=new TQLabel(widget, "header"); - //header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum) ); - //header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); + //header->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum) ); + //header->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); l1->addWidget(header, 0, TQt::AlignVCenter || TQt::AlignHCenter); mainLayout->addLayout(l1); message=new TQTextEdit(widget); message->setReadOnly(true); - //message->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); - //message->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ) ); + //message->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + //message->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ) ); //message->setMinimumHeight(40); //message->setMinimumHeight(60); //message->setMinimumWidth(400); diff --git a/ksystemlog/src/detailDialogBase.ui b/ksystemlog/src/detailDialogBase.ui index 1a0b82b..5c169dc 100644 --- a/ksystemlog/src/detailDialogBase.ui +++ b/ksystemlog/src/detailDialogBase.ui @@ -147,7 +147,7 @@ Expanding - + 100 31 diff --git a/ksystemlog/src/itemFactory.cpp b/ksystemlog/src/itemFactory.cpp index 43ff4de..aa0e01d 100644 --- a/ksystemlog/src/itemFactory.cpp +++ b/ksystemlog/src/itemFactory.cpp @@ -84,7 +84,7 @@ LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line //Group by Day else if (line->getGroupBy()==GROUP_BY_DAY) { //TODO Move these tests to a dedicated static method (to be able to reuse it) - TQDate today=TQDate::tqcurrentDate(); + TQDate today=TQDate::currentDate(); TQDate yesterday=today.addDays(-1); TQDate date=line->getTime().date(); @@ -112,7 +112,7 @@ LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line item->setText(0, string); item->setPixmap(0, SmallIcon(GROUP_BY_HOUR_ICON)); - TQDate today=TQDate::tqcurrentDate(); + TQDate today=TQDate::currentDate(); TQTime time=TQTime::currentTime(); if (line->getTime().date()==today && line->getTime().time().hour()==time.hour()) { kdDebug() << "Date equals, hour equals" << TQString(line->getTime().date().toString()) << " and " << TQString(line->getTime().time().toString()) << endl; diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp index fb01837..e44d8b6 100644 --- a/ksystemlog/src/ksystemlog.cpp +++ b/ksystemlog/src/ksystemlog.cpp @@ -96,7 +96,7 @@ KSystemLog::KSystemLog() : //Accept Drag and Drop setAcceptDrops(true); - //Initialize the tqStatus Bar + //Initialize the Status Bar setupStatusBar(); //Initialize the find manager @@ -266,7 +266,7 @@ void KSystemLog::setupStatusBar() { statusBar()->insertItem("", STATUS_BAR_LINE_COUNT, 0, true); statusBar()->insertItem("", STATUS_BAR_LAST_MODIFICATION, 0, true); - //Displays the tqStatus Bar + //Displays the Status Bar statusBar()->show(); } @@ -689,7 +689,7 @@ LogManager* KSystemLog::newTab() { tabs->setCurrentPage(tabs->count()-1); - //Correctly initialize the tqStatus Bar + //Correctly initialize the Status Bar updateStatusBar(); //Returns the newly created LogManager diff --git a/ksystemlog/src/logListItem.cpp b/ksystemlog/src/logListItem.cpp index 34c7c38..b01609b 100644 --- a/ksystemlog/src/logListItem.cpp +++ b/ksystemlog/src/logListItem.cpp @@ -246,7 +246,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in TQString name = text(column); if( fmName.width(name) + text_x + lv->itemMargin()*2 > width ) { int ellWidth = fmName.width( "..." ); - TQString text = TQString::tqfromLatin1(""); + TQString text = TQString::fromLatin1(""); int i = 0; int len = name.length(); while ( i < len && fmName.width( text + name[ i ] ) + ellWidth < width - text_x - lv->itemMargin()*2 ) { @@ -347,7 +347,7 @@ TQFontMetrics fmName( font ); TQString name = text(0); if( fmName.width( name ) + text_x + lv->itemMargin()*2 > width ) { int ellWidth = fmName.width( "..." ); - TQString text = TQString::tqfromLatin1(""); + TQString text = TQString::fromLatin1(""); int i = 0; int len = name.length(); while ( i < len && fmName.width( text + name[ i ] ) + ellWidth < width - text_x - lv->itemMargin()*2 ) { diff --git a/ksystemlog/src/loggerDialogBase.ui b/ksystemlog/src/loggerDialogBase.ui index da04751..b99fd01 100644 --- a/ksystemlog/src/loggerDialogBase.ui +++ b/ksystemlog/src/loggerDialogBase.ui @@ -151,7 +151,7 @@ Expanding - + 84 24 @@ -210,7 +210,7 @@ Expanding - + 84 24 @@ -282,7 +282,7 @@ Minimum - + 100 24 @@ -333,7 +333,7 @@ Expanding - + 31 41 @@ -374,7 +374,7 @@ Expanding - + 155 26 diff --git a/ksystemlog/src/view.cpp b/ksystemlog/src/view.cpp index c4fb95c..4f12e2e 100644 --- a/ksystemlog/src/view.cpp +++ b/ksystemlog/src/view.cpp @@ -72,7 +72,7 @@ View::View(TQWidget *parent) : #if defined(KDE_MAKE_VERSION) && KDE_VERSION >= KDE_MAKE_VERSION(3,3,0) filterBar=new TQHBox(this); filterBar->setSpacing(5); - filterBar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + filterBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); clearSearch=new KToolBarButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, filterBar); diff --git a/ksystemlog/src/viewToolTip.cpp b/ksystemlog/src/viewToolTip.cpp index f1b2eaa..0567b28 100644 --- a/ksystemlog/src/viewToolTip.cpp +++ b/ksystemlog/src/viewToolTip.cpp @@ -53,7 +53,7 @@ void ViewToolTip::maybeTip(const TQPoint& p) { TQString s=item->getToolTipText(); - TQRect r= view->getLogList()->tqitemRect(item); + TQRect r= view->getLogList()->itemRect(item); //kdDebug() << "Left=" << r.left() << " Right=" << r.right() << " Top=" << r.top() << " Bottom=" << r.bottom() << endl; tip(r, s); diff --git a/ksystemlog/src/xorg/xorgReader.cpp b/ksystemlog/src/xorg/xorgReader.cpp index 921858a..7bee34a 100644 --- a/ksystemlog/src/xorg/xorgReader.cpp +++ b/ksystemlog/src/xorg/xorgReader.cpp @@ -35,7 +35,7 @@ XorgReader::XorgReader(TQObject *parent, const char *name) : DefaultReader(parent, name), newLineTime(), - newLineDate(TQDate::tqcurrentDate()), + newLineDate(TQDate::currentDate()), lineCount(1) {