Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 13 years ago
parent 7423126f28
commit e65d401151

@ -57,7 +57,7 @@ LogLine* AcpidReader::parseMessage(TQString& logLine, LogFile* logFile) {
if (dateBegin==-1 || dateEnd==-1) { if (dateBegin==-1 || dateEnd==-1) {
type=i18n("none"); type=i18n("none");
message=logLine; message=logLine;
date=TQDate::tqcurrentDate(); date=TQDate::currentDate();
time=TQTime::currentTime(); time=TQTime::currentTime();
} }
else { else {

@ -67,7 +67,7 @@ LogLine* ApacheReader::parseMessage(TQString& logLine, LogFile* logFile) {
//Special case which sometimes happens //Special case which sometimes happens
if (logLine.find("[client")==0) { if (logLine.find("[client")==0) {
date=TQDate::tqcurrentDate(); date=TQDate::currentDate();
time=TQTime::currentTime(); time=TQTime::currentTime();
level="notice"; level="notice";
} }

@ -356,7 +356,7 @@ bool DefaultReader::insertOrReplaceLine(TQString& buffer, LogFile* originalFile)
LogLine* DefaultReader::parseMessage(TQString& logLine, LogFile* originalFile) { LogLine* DefaultReader::parseMessage(TQString& logLine, LogFile* originalFile) {
//kdDebug() << "Please don't use parseMessage() from SortedReader class" << endl; //kdDebug() << "Please don't use parseMessage() from SortedReader class" << endl;
int year=TQDate::tqcurrentDate().year(); int year=TQDate::currentDate().year();
//Month number //Month number
TQString month; TQString month;
@ -376,7 +376,7 @@ LogLine* DefaultReader::parseMessage(TQString& logLine, LogFile* originalFile) {
TQDate date(year, monthNum, dayNum); TQDate date(year, monthNum, dayNum);
if (!date.isValid()) { if (!date.isValid()) {
kdDebug() << "Malformed date" << endl; kdDebug() << "Malformed date" << endl;
date=TQDate::tqcurrentDate(); date=TQDate::currentDate();
} }
//Time //Time

@ -69,21 +69,21 @@ DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) :
TQHBoxLayout* l1 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout* l1 = new TQHBoxLayout(0, 0, 5);
icon=new TQLabel(widget); icon=new TQLabel(widget);
//icon->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); //icon->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
l1->addWidget(icon, 0, TQt::AlignVCenter); l1->addWidget(icon, 0, TQt::AlignVCenter);
//header=new KActiveLabel(widget, "header"); //header=new KActiveLabel(widget, "header");
header=new TQLabel(widget, "header"); header=new TQLabel(widget, "header");
//header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum) ); //header->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum) );
//header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); //header->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) );
l1->addWidget(header, 0, TQt::AlignVCenter || TQt::AlignHCenter); l1->addWidget(header, 0, TQt::AlignVCenter || TQt::AlignHCenter);
mainLayout->addLayout(l1); mainLayout->addLayout(l1);
message=new TQTextEdit(widget); message=new TQTextEdit(widget);
message->setReadOnly(true); message->setReadOnly(true);
//message->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); //message->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
//message->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ) ); //message->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ) );
//message->setMinimumHeight(40); //message->setMinimumHeight(40);
//message->setMinimumHeight(60); //message->setMinimumHeight(60);
//message->setMinimumWidth(400); //message->setMinimumWidth(400);

@ -147,7 +147,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>31</height> <height>31</height>

@ -84,7 +84,7 @@ LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line
//Group by Day //Group by Day
else if (line->getGroupBy()==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) //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 yesterday=today.addDays(-1);
TQDate date=line->getTime().date(); TQDate date=line->getTime().date();
@ -112,7 +112,7 @@ LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line
item->setText(0, string); item->setText(0, string);
item->setPixmap(0, SmallIcon(GROUP_BY_HOUR_ICON)); item->setPixmap(0, SmallIcon(GROUP_BY_HOUR_ICON));
TQDate today=TQDate::tqcurrentDate(); TQDate today=TQDate::currentDate();
TQTime time=TQTime::currentTime(); TQTime time=TQTime::currentTime();
if (line->getTime().date()==today && line->getTime().time().hour()==time.hour()) { 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; kdDebug() << "Date equals, hour equals" << TQString(line->getTime().date().toString()) << " and " << TQString(line->getTime().time().toString()) << endl;

@ -96,7 +96,7 @@ KSystemLog::KSystemLog() :
//Accept Drag and Drop //Accept Drag and Drop
setAcceptDrops(true); setAcceptDrops(true);
//Initialize the tqStatus Bar //Initialize the Status Bar
setupStatusBar(); setupStatusBar();
//Initialize the find manager //Initialize the find manager
@ -266,7 +266,7 @@ void KSystemLog::setupStatusBar() {
statusBar()->insertItem("", STATUS_BAR_LINE_COUNT, 0, true); statusBar()->insertItem("", STATUS_BAR_LINE_COUNT, 0, true);
statusBar()->insertItem("", STATUS_BAR_LAST_MODIFICATION, 0, true); statusBar()->insertItem("", STATUS_BAR_LAST_MODIFICATION, 0, true);
//Displays the tqStatus Bar //Displays the Status Bar
statusBar()->show(); statusBar()->show();
} }
@ -689,7 +689,7 @@ LogManager* KSystemLog::newTab() {
tabs->setCurrentPage(tabs->count()-1); tabs->setCurrentPage(tabs->count()-1);
//Correctly initialize the tqStatus Bar //Correctly initialize the Status Bar
updateStatusBar(); updateStatusBar();
//Returns the newly created LogManager //Returns the newly created LogManager

@ -246,7 +246,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
TQString name = text(column); TQString name = text(column);
if( fmName.width(name) + text_x + lv->itemMargin()*2 > width ) { if( fmName.width(name) + text_x + lv->itemMargin()*2 > width ) {
int ellWidth = fmName.width( "..." ); int ellWidth = fmName.width( "..." );
TQString text = TQString::tqfromLatin1(""); TQString text = TQString::fromLatin1("");
int i = 0; int i = 0;
int len = name.length(); int len = name.length();
while ( i < len && fmName.width( text + name[ i ] ) + ellWidth < width - text_x - lv->itemMargin()*2 ) { 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); TQString name = text(0);
if( fmName.width( name ) + text_x + lv->itemMargin()*2 > width ) { if( fmName.width( name ) + text_x + lv->itemMargin()*2 > width ) {
int ellWidth = fmName.width( "..." ); int ellWidth = fmName.width( "..." );
TQString text = TQString::tqfromLatin1(""); TQString text = TQString::fromLatin1("");
int i = 0; int i = 0;
int len = name.length(); int len = name.length();
while ( i < len && fmName.width( text + name[ i ] ) + ellWidth < width - text_x - lv->itemMargin()*2 ) { while ( i < len && fmName.width( text + name[ i ] ) + ellWidth < width - text_x - lv->itemMargin()*2 ) {

@ -151,7 +151,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>84</width> <width>84</width>
<height>24</height> <height>24</height>
@ -210,7 +210,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>84</width> <width>84</width>
<height>24</height> <height>24</height>
@ -282,7 +282,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>24</height> <height>24</height>
@ -333,7 +333,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>41</height> <height>41</height>
@ -374,7 +374,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>155</width> <width>155</width>
<height>26</height> <height>26</height>

@ -72,7 +72,7 @@ View::View(TQWidget *parent) :
#if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0) #if defined(KDE_MAKE_VERSION) && TDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
filterBar=new TQHBox(this); filterBar=new TQHBox(this);
filterBar->setSpacing(5); 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); clearSearch=new KToolBarButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, filterBar);

@ -53,7 +53,7 @@ void ViewToolTip::maybeTip(const TQPoint& p) {
TQString s=item->getToolTipText(); 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; //kdDebug() << "Left=" << r.left() << " Right=" << r.right() << " Top=" << r.top() << " Bottom=" << r.bottom() << endl;
tip(r, s); tip(r, s);

@ -35,7 +35,7 @@
XorgReader::XorgReader(TQObject *parent, const char *name) : XorgReader::XorgReader(TQObject *parent, const char *name) :
DefaultReader(parent, name), DefaultReader(parent, name),
newLineTime(), newLineTime(),
newLineDate(TQDate::tqcurrentDate()), newLineDate(TQDate::currentDate()),
lineCount(1) lineCount(1)
{ {

Loading…
Cancel
Save