TDE
/
ksystemlog
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ksystemlog
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent ac1454e9bd
commit 4ce24ff375
37 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File

6
ksystemlog/src/acpid/acpidOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -46,8 +46,8 @@ AcpidOptions::AcpidOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description=i18n("<qt><p>These files will be analyzed to display <b>ACPId log</b>. This list also determines the order in which the files are read.</p></qt>");
fileList=new FileList(this, description);

2
ksystemlog/src/acpid/acpidReader.cpp
Unescape View File

@ -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 {

6
ksystemlog/src/apache/apacheOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -49,8 +49,8 @@ ApacheOptions::ApacheOptions(TQWidget *parent) :
apacheAccessFileList(this, i18n("<qt><p>These files will be analyzed to display <b>Apache Access log</b>. This list also determines the order in which the files are read.</p></qt>"))
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
tabs.addTab(&apacheFileList, Globals::apacheMode->pixmap, Globals::apacheMode->name);
tabs.addTab(&apacheAccessFileList, Globals::apacheAccessMode->pixmap, Globals::apacheAccessMode->name);

2
ksystemlog/src/apache/apacheReader.cpp
Unescape View File

@ -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";
}

12
ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
Unescape View File

@ -20,7 +20,7 @@
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqvgroupbox.h>
#include <tqbutton.h>
@ -46,8 +46,8 @@ BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
TQWidget(parent)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
tqlayout->setSpacing(10);
TQVBoxLayout *layout = new TQVBoxLayout(this);
layout->setSpacing(10);
//Boot log file
TQVGroupBox* bootBox=new TQVGroupBox(i18n("Boot Log File"), this);
@ -75,9 +75,9 @@ BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
TQSpacerItem* spacer=new TQSpacerItem(0, 0, TQSizePolicy::Preferred, TQSizePolicy::Expanding);
tqlayout->addWidget(bootBox);
tqlayout->addWidget(authenticationBox);
tqlayout->addItem(spacer);
layout->addWidget(bootBox);
layout->addWidget(authenticationBox);
layout->addItem(spacer);
readConfig();
}

6
ksystemlog/src/cron/cronOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -46,8 +46,8 @@ CronOptions::CronOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>Cron Logs</b> (i.e. planned tasks logs). This list also determines the order in which the files are read.</p></qt>");
fileList=new SpecificFileList(this, description);

6
ksystemlog/src/cups/cupsOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -49,8 +49,8 @@ CupsOptions::CupsOptions(TQWidget *parent) :
cupsAccessFileList(this, i18n("<qt><p>These files will be analyzed to display <b>Cups Web Server log</b>. This list also determines the order in which the files are read.</p></qt>"))
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
tabs.addTab(&cupsFileList, Globals::cupsMode->pixmap, Globals::cupsMode->name);
tabs.addTab(&cupsAccessFileList, Globals::cupsAccessMode->pixmap, Globals::cupsAccessMode->name);

6
ksystemlog/src/daemon/daemonOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -46,8 +46,8 @@ DaemonOptions::DaemonOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>daemons Logs</b>. This list also determine the order in which the files are read.</p></qt>");
fileList=new SpecificFileList(this, description);

12
ksystemlog/src/defaultReader.cpp
Unescape View File

@ -90,7 +90,7 @@ void DefaultReader::readLog() {
}
void DefaultReader::readFile(LogFile* logFile) {
TQString message=i18n("Opening file '%1'...").tqarg(logFile->url.path());
TQString message=i18n("Opening file '%1'...").arg(logFile->url.path());
emit statusbarChanged(message);
//Inform connected TQObject that we are now reading the "index" file
@ -120,7 +120,7 @@ void DefaultReader::readFile(LogFile* logFile) {
//If there is no line
if (rawBuffer->size()==0) {
TQString message=i18n("No log line in '%1'.").tqarg(logFile->url.path());
TQString message=i18n("No log line in '%1'.").arg(logFile->url.path());
emit statusbarChanged(message);
delete rawBuffer;
@ -174,7 +174,7 @@ void DefaultReader::readFile(LogFile* logFile) {
// Close the file
this->closeFile(file);
message=i18n("Log file '%1' loaded successfully.").tqarg(logFile->url.path());
message=i18n("Log file '%1' loaded successfully.").arg(logFile->url.path());
emit statusbarChanged(message);
}
@ -268,7 +268,7 @@ void DefaultReader::logChanged(LogFile* logFile) {
this->closeFile(file);
TQString message;
message=i18n("Log file '%1' has changed.").tqarg(logFile->url.path());
message=i18n("Log file '%1' has changed.").arg(logFile->url.path());
emit statusbarChanged(message);
//Emit a signal which informs connected slots that there are new lines
@ -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

20
ksystemlog/src/detailDialog.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@ -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);
@ -205,10 +205,10 @@ void DetailDialog::previousItem() {
}
currentLine->setSelected(false);
currentLine->tqrepaint();
currentLine->repaint();
currentLine=static_cast<LogListItem*> (currentLine->itemAbove());
currentLine->setSelected(true);
currentLine->tqrepaint();
currentLine->repaint();
updateDetails();
@ -230,10 +230,10 @@ void DetailDialog::nextItem() {
}
currentLine->setSelected(false);
currentLine->tqrepaint();
currentLine->repaint();
currentLine=static_cast<LogListItem*> (currentLine->itemBelow());
currentLine->setSelected(true);
currentLine->tqrepaint();
currentLine->repaint();
updateDetails();

4
ksystemlog/src/detailDialogBase.ui
Unescape View File

@ -75,7 +75,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>31</height>

12
ksystemlog/src/fileList.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "fileList.h"
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -44,8 +44,8 @@ FileList::FileList(TQWidget *parent, TQString description) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQVGroupBox* dirBox = new TQVGroupBox(i18n( "Files" ), this);
@ -156,21 +156,21 @@ bool FileList::isValidFile(KURL url) {
//If it is not valid
if (!url.isValid()) {
message=i18n("'%1' is not valid.").tqarg(url.path());
message=i18n("'%1' is not valid.").arg(url.path());
KMessageBox::error(this, message, i18n("File selection failed"), KMessageBox::Notify);
return(false);
}
//If it is not a local file
if (!url.isLocalFile()) {
message=i18n("'%1' is not a local file.").tqarg(url.path());
message=i18n("'%1' is not a local file.").arg(url.path());
KMessageBox::error(this, message, i18n("File selection failed"), KMessageBox::Notify);
return(false);
}
//If it's a directory, it's not valid
if (TQDir(url.path()).exists()) {
message=i18n("'%1' is a folder.").tqarg(url.path());
message=i18n("'%1' is a folder.").arg(url.path());
KMessageBox::error(this, message, i18n("File selection failed"), KMessageBox::Notify);
return(false);
}

14
ksystemlog/src/generalOptions.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqvgroupbox.h>
#include <tqbutton.h>
@ -42,8 +42,8 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
TQWidget(parent)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
tqlayout->setSpacing(10);
TQVBoxLayout *layout = new TQVBoxLayout(this);
layout->setSpacing(10);
//Maximum Lines
TQVGroupBox* logLinesBox=new TQVGroupBox(i18n("Log Lines List"), this);
@ -88,11 +88,11 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
TQSpacerItem* spacer=new TQSpacerItem(0, 0, TQSizePolicy::Preferred, TQSizePolicy::Expanding);
tqlayout->addWidget(logLinesBox);
tqlayout->addWidget(maxCharBox);
tqlayout->addWidget(options);
layout->addWidget(logLinesBox);
layout->addWidget(maxCharBox);
layout->addWidget(options);
tqlayout->addItem(spacer);
layout->addItem(spacer);
readConfig();
}

18
ksystemlog/src/itemFactory.cpp
Unescape View File

@ -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();
@ -107,12 +107,12 @@ LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line
}
//Group by Hour
else if (line->getGroupBy()==GROUP_BY_HOUR) {
TQString string(i18n("%1, %2h").tqarg(line->getTime().date().toString(), line->getTime().time().toString("h")));
TQString string(i18n("%1, %2h").arg(line->getTime().date().toString(), line->getTime().time().toString("h")));
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;
@ -271,17 +271,17 @@ TQString ItemFactory::createParentFormattedText(LogLine* line) {
//All Group By cases are showed here
if (parent->getGroupBy()==GROUP_BY_LOG_LEVEL) {
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(line->getLogLevel()->name));
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").arg(line->getLogLevel()->name));
}
else if (parent->getGroupBy()==GROUP_BY_DAY) {
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(line->getTime().date().toString()));
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").arg(line->getTime().date().toString()));
}
else if (parent->getGroupBy()==GROUP_BY_HOUR) {
TQString string(i18n("%1, %2 hour").tqarg(line->getTime().date().toString(), line->getTime().time().toString("h")));
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(string));
TQString string(i18n("%1, %2 hour").arg(line->getTime().date().toString(), line->getTime().time().toString("h")));
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").arg(string));
}
else if (parent->getGroupBy()==GROUP_BY_LOG_FILE) {
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(line->getOriginalFile()));
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").arg(line->getOriginalFile()));
}
else {
TQStringList& list=line->getItemList();
@ -289,7 +289,7 @@ TQString ItemFactory::createParentFormattedText(LogLine* line) {
if (index<0 || index>=(int) list.size())
result.append(i18n("<div align='center'><b>Group:</b> none</div>"));
else
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(list[index]));
result.append(i18n("<div align='center'><b>Group:</b> %1</div>").arg(list[index]));
}
return(result);

6
ksystemlog/src/kernel/kernelOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -47,8 +47,8 @@ KernelOptions::KernelOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>Kernel logs</b>. This list also determines the order in which the files are read.</p></qt>");
fileList=new SpecificFileList(this, description);

8
ksystemlog/src/ksystemlog.cpp
Unescape View File

@ -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
@ -870,7 +870,7 @@ void KSystemLog::updateStatusBar() {
statusBar()->changeItem(lineCount, STATUS_BAR_LINE_COUNT);
TQString time=i18n("Last updated: %1.").tqarg(currentManager->getLastUpdate().toString(Qt::LocalDate));
TQString time=i18n("Last updated: %1.").arg(currentManager->getLastUpdate().toString(Qt::LocalDate));
statusBar()->changeItem(time, STATUS_BAR_LAST_MODIFICATION);

16
ksystemlog/src/loadingDialog.cpp
Unescape View File

@ -108,16 +108,16 @@ void LoadingDialog::setLoadingLog(const TQString& text) {
//Several tabs to load
if (tabCount>1 && currentTab>=1) {
if (firstLoading)
setLabel(i18n("<qt>Loading <b>%1</b> [<b>%2</b>/%3 file] (<b>%4</b>/%5)...</qt>").tqarg(text).tqarg(currentFile).tqarg(fileCount).tqarg(currentTab).tqarg(tabCount));
setLabel(i18n("<qt>Loading <b>%1</b> [<b>%2</b>/%3 file] (<b>%4</b>/%5)...</qt>").arg(text).arg(currentFile).arg(fileCount).arg(currentTab).arg(tabCount));
else
setLabel(i18n("<qt>Reloading <b>%1</b> [<b>%2</b>/%3 file] (<b>%4</b>/%5)...</qt>").tqarg(text).tqarg(currentFile).tqarg(fileCount).tqarg(currentTab).tqarg(tabCount));
setLabel(i18n("<qt>Reloading <b>%1</b> [<b>%2</b>/%3 file] (<b>%4</b>/%5)...</qt>").arg(text).arg(currentFile).arg(fileCount).arg(currentTab).arg(tabCount));
}
//Only one tab to load
else {
if (firstLoading)
setLabel(i18n("<qt>Loading <b>%1</b> [<b>%2</b>/%3 file]...</qt>").tqarg(text).tqarg(currentFile).tqarg(fileCount));
setLabel(i18n("<qt>Loading <b>%1</b> [<b>%2</b>/%3 file]...</qt>").arg(text).arg(currentFile).arg(fileCount));
else
setLabel(i18n("<qt>Reloading <b>%1</b> [<b>%2</b>/%3 file]...</qt>").tqarg(text).tqarg(currentFile).tqarg(fileCount));
setLabel(i18n("<qt>Reloading <b>%1</b> [<b>%2</b>/%3 file]...</qt>").arg(text).arg(currentFile).arg(fileCount));
}
}
@ -126,16 +126,16 @@ void LoadingDialog::setLoadingLog(const TQString& text) {
//Several tabs to load
if (tabCount>1 && currentTab>=1) {
if (firstLoading)
setLabel(i18n("<qt>Loading <b>%1</b> (<b>%2</b>/%3)...</qt>").tqarg(text).tqarg(currentTab).tqarg(tabCount));
setLabel(i18n("<qt>Loading <b>%1</b> (<b>%2</b>/%3)...</qt>").arg(text).arg(currentTab).arg(tabCount));
else
setLabel(i18n("<qt>Reloading <b>%1</b> (<b>%2</b>/%3)...</qt>").tqarg(text).tqarg(currentTab).tqarg(tabCount));
setLabel(i18n("<qt>Reloading <b>%1</b> (<b>%2</b>/%3)...</qt>").arg(text).arg(currentTab).arg(tabCount));
}
//Only one tab to load
else {
if (firstLoading)
setLabel(i18n("<qt>Loading <b>%1</b>...</qt>").tqarg(text));
setLabel(i18n("<qt>Loading <b>%1</b>...</qt>").arg(text));
else
setLabel(i18n("<qt>Reloading <b>%1</b>...</qt>").tqarg(text));
setLabel(i18n("<qt>Reloading <b>%1</b>...</qt>").arg(text));
}
}

2
ksystemlog/src/logLine.cpp
Unescape View File

@ -62,7 +62,7 @@ void LogLine::setRecent(bool recent) {
this->recent=recent;
if (item!=NULL) {
//TODO This is certainly the main problem of the unknown crash bug !
//item->tqrepaint();
//item->repaint();
}
}

6
ksystemlog/src/logLineFilter.cpp
Unescape View File

@ -35,7 +35,7 @@ LogLineFilter::LogLineFilter(TQWidget* parent, KListView* listView, const char*
drawFilterMessage = true;
tqrepaint();
repaint();
}
@ -61,7 +61,7 @@ void LogLineFilter::focusInEvent( TQFocusEvent *ev )
{
if ( drawFilterMessage == true ) {
drawFilterMessage = false;
tqrepaint();
repaint();
}
KListViewSearchLine::focusInEvent( ev );
}
@ -71,7 +71,7 @@ void LogLineFilter::focusOutEvent( TQFocusEvent *ev )
{
if ( text().isEmpty() ) {
drawFilterMessage = true;
tqrepaint();
repaint();
}
KListViewSearchLine::focusOutEvent( ev );
}

6
ksystemlog/src/logLineTree.cpp
Unescape View File

@ -123,7 +123,7 @@ LogLine* LogLineTree::synchronizeAddedLines(View* view) {
bool LogLineTree::remove(LogLine* line) {
/**
* Parent log line actions :
* - Only remove this line is it does not have any tqchildren left
* - Only remove this line is it does not have any children left
*/
if (line->isParentLogLine()==true) {
ParentLogLine* parent=(ParentLogLine*) line;
@ -145,13 +145,13 @@ bool LogLineTree::remove(LogLine* line) {
ParentLogLine* parent=child->getParent();
parent->removeChild(child);
//Remove parent if it does not have longer tqchildren
//Remove parent if it does not have longer children
if (parent->hasChildren()==false) {
parents.remove(parent);
LogLineList::remove(parent);
}
//Remove the tqchildren
//Remove the children
return(LogLineList::remove(line));
}

8
ksystemlog/src/logListItem.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqpainter.h>
#include <tqpen.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include <tqcolor.h>
//KDE includes
@ -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 ) {
@ -375,7 +375,7 @@ if( fmName.width( name ) + text_x + lv->itemMargin()*2 > width ) {
// draw the number of tracks and the total length of the playlist
info += i18n("1 Track", "%n Tracks", m_trackCount);
if( m_length )
info += TQString(" - [%2]").tqarg( MetaBundle::prettyTime( m_length ) );
info += TQString(" - [%2]").arg( MetaBundle::prettyTime( m_length ) );
}
pBuf.drawText( text_x, textHeight, width, fm.lineSpacing(), AlignVCenter, info);

12
ksystemlog/src/logManager.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqclipboard.h>
#include <clipboard.h>
//KDE includes
#include <kpopupmenu.h>
@ -241,7 +241,7 @@ void LogManager::slotLogUpdated(int lineCount) {
//If the user is in this log manager, he does have to see that some new log lines have appeared
if (isCurrent()==false) {
TQString title(i18n("%1 (%2)").tqarg(logMode->name).tqarg(newLinesSinceLastSelection));
TQString title(i18n("%1 (%2)").arg(logMode->name).arg(newLinesSinceLastSelection));
//This signal is emitted only if the selected tab is not this one
emit changeTitle(view, title);
@ -311,10 +311,10 @@ void LogManager::slotFileSave() {
ioDev->close();
emit changeStatusbar(i18n("1 log line saved to '%1'.", "%n log lines saved to '%1'.", nbCopied).tqarg(filename));
emit changeStatusbar(i18n("1 log line saved to '%1'.", "%n log lines saved to '%1'.", nbCopied).arg(filename));
}
else {
TQString message(i18n("Unable to save file '%1': Permission Denied.").tqarg(filename));
TQString message(i18n("Unable to save file '%1': Permission Denied.").arg(filename));
KMessageBox::error(main, message, i18n("Unable to save file."), KMessageBox::Notify);
}
@ -521,8 +521,8 @@ void LogManager::slotCopyToClipboard() {
}
else {
//Copy both to clipboard and X11-selection
TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
TQApplication::clipboard()->setText(text, TQClipboard::Clipboard);
TQApplication::clipboard()->setText(text, TQClipboard::Selection);
emit changeStatusbar(i18n("1 log line copied to clipboard.", "%n log lines copied to clipboard.", nbCopied));
}

18
ksystemlog/src/loggerDialogBase.ui
Unescape View File

@ -116,7 +116,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout9_2</cstring>
<cstring>layout9_2</cstring>
</property>
<hbox>
<property name="name">
@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>84</width>
<height>24</height>
@ -175,7 +175,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>84</width>
<height>24</height>
@ -255,7 +255,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -282,7 +282,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>24</height>
@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
@ -342,7 +342,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -374,7 +374,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>155</width>
<height>26</height>

2
ksystemlog/src/options.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>

6
ksystemlog/src/parentLogLine.cpp
Unescape View File

@ -51,7 +51,7 @@ LogViewColumns* ParentLogLine::getColumns() {
}
void ParentLogLine::addChild(LogLine* child) {
tqchildren.append(child);
children.append(child);
}
bool ParentLogLine::isParentLogLine() {
@ -153,10 +153,10 @@ int ParentLogLine::getGroupedColumnIndex(LogViewColumns* columns, int column) {
}
void ParentLogLine::removeChild(LogLine* child) {
tqchildren.remove(child);
children.remove(child);
}
bool ParentLogLine::hasChildren() {
return(tqchildren.count()!=0);
return(children.count()!=0);
}

2
ksystemlog/src/parentLogLine.h
Unescape View File

@ -61,7 +61,7 @@ class ParentLogLine : public LogLine {
static int getGroupedColumnIndex(LogViewColumns* columns, int column);
protected:
TQPtrList<LogLine> tqchildren;
TQPtrList<LogLine> children;
groupByType groupBy;
int groupByColumn;

8
ksystemlog/src/parsingHelper.cpp
Unescape View File

@ -84,18 +84,18 @@ TQString ParsingHelper::parseSize(const TQString& stringSize) {
long size=stringSize.toLong();
if (size<1024)
return(i18n("Size format", "%1 B").tqarg(size));
return(i18n("Size format", "%1 B").arg(size));
else if (size<1024*1024) {
double newSize=size / 1024.;
TQString strNewSize;
strNewSize.sprintf("%0.2f", newSize);
return(i18n("Size format", "%1 KB").tqarg(strNewSize));
return(i18n("Size format", "%1 KB").arg(strNewSize));
}
else {
double newSize=size / (1024.*1024.);
TQString strNewSize;
strNewSize.sprintf("%0.2f", newSize);
return(i18n("Size format", "%1 MB").tqarg(strNewSize));
return(i18n("Size format", "%1 MB").arg(strNewSize));
}
}
@ -156,7 +156,7 @@ TQString ParsingHelper::parseHTTPResponse(const TQString& response) {
//Search the response string in the map
TQMap<TQString, TQString>::Iterator it=ParsingHelper::mapHTTPResponse.find(response);
if (it!=ParsingHelper::mapHTTPResponse.end())
return(TQString("%1 %2").tqarg(response).tqarg(*it));
return(TQString("%1 %2").arg(response).arg(*it));
else
return(response);

6
ksystemlog/src/postfix/postfixOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -47,8 +47,8 @@ PostfixOptions::PostfixOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>Postfix Logs</b>. This list also determine the order in which the files are read.</p></qt>");
fileList=new SpecificFileList(this, description);

4
ksystemlog/src/reader.cpp
Unescape View File

@ -137,7 +137,7 @@ TQFile* Reader::openFile(TQString name) {
//If the file does not exist
if(! file->exists()) {
message=i18n("The file '%1' does not exist.").tqarg(name);
message=i18n("The file '%1' does not exist.").arg(name);
KMessageBox::error(logManager->getView(), message, i18n("The File Does Not Exist"), KMessageBox::Notify);
emit statusbarChanged(message);
return(NULL);
@ -146,7 +146,7 @@ TQFile* Reader::openFile(TQString name) {
//If we can open the file
if( !file->open( IO_ReadOnly ) ) {
//It could not be opened
message=i18n("You do not have sufficient permissions to read '%1'.").tqarg(name);
message=i18n("You do not have sufficient permissions to read '%1'.").arg(name);
KMessageBox::error(logManager->getView(), message, i18n("Insufficient Permissions"), KMessageBox::Notify);
emit statusbarChanged(message);
return(NULL);

6
ksystemlog/src/readerFactory.cpp
Unescape View File

@ -335,7 +335,7 @@ LogFile* ReaderFactory::getGenericLogFile(TQString& file) {
KURL url(file);
if (!url.isValid()) {
kdDebug() << i18n("URL '%1' is not valid, skipping this URL.").tqarg(url.path()) << endl;
kdDebug() << i18n("URL '%1' is not valid, skipping this URL.").arg(url.path()) << endl;
return(NULL);
}
@ -367,7 +367,7 @@ LogFiles* ReaderFactory::getGenericLogFiles(TQStringList& stringList, TQValueLis
KURL url(*itString);
if (!url.isValid()) {
kdDebug() << i18n("URL '%1' is not valid, skipping this URL.").tqarg(url.path()) << endl;
kdDebug() << i18n("URL '%1' is not valid, skipping this URL.").arg(url.path()) << endl;
continue;
itString++;
itInt++;
@ -398,7 +398,7 @@ LogFiles* ReaderFactory::getNoModeLogFiles(TQStringList& stringList) {
KURL url(*it);
if (!url.isValid()) {
kdDebug() << i18n("URL '%1' is not valid, skipping this URL.").tqarg(url.path()) << endl;
kdDebug() << i18n("URL '%1' is not valid, skipping this URL.").arg(url.path()) << endl;
continue;
}

6
ksystemlog/src/samba/sambaOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -46,8 +46,8 @@ SambaOptions::SambaOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>Samba log</b>. This list also determines the order in which the files are read.</p></qt>");
fileList=new FileList(this, description);

2
ksystemlog/src/specificFileList.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include <tqlayout.h>
#include <layout.h>
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqtooltip.h>

8
ksystemlog/src/system/systemOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -46,15 +46,15 @@ SystemOptions::SystemOptions(TQWidget *parent) :
TQWidget(parent)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
//tqlayout->setAutoAdd(true);
TQVBoxLayout* layout = new TQVBoxLayout(this);
//layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>System logs</b>. This list also determines the order in which the files are read.</p></qt>");
fileList=new SpecificFileList(this, description);
connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
tqlayout->addWidget(fileList);
layout->addWidget(fileList);
readConfig();

8
ksystemlog/src/view.cpp
Unescape View File

@ -20,7 +20,7 @@
//TQt includes
#include <tqpainter.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqstring.h>
@ -64,7 +64,7 @@ View::View(TQWidget *parent) :
firstLoad(true)
{
// setup our tqlayout manager to automatically add our widgets
// setup our layout manager to automatically add our widgets
TQVBoxLayout* topLayout = new TQVBoxLayout(this);
topLayout->setAutoAdd(true);
@ -72,7 +72,7 @@ View::View(TQWidget *parent) :
#if defined(KDE_MAKE_VERSION) && TDE_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);
@ -210,7 +210,7 @@ void View::setColumns(LogViewColumns* list) {
TQString group="List";
group.append(logManager->getIndex());
//We first restore the tqlayout from the config
//We first restore the layout from the config
table->restoreLayout(configXT->config(), group);
//Then we delete it from config, to avoid reloading problem

2
ksystemlog/src/viewToolTip.cpp
Unescape View File

@ -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);

6
ksystemlog/src/xorg/xorgOptions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
//TQt includes
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
@ -46,8 +46,8 @@ XorgOptions::XorgOptions(TQWidget *parent) :
TQWidget(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
TQString description= i18n("<qt><p>These files will be analyzed to display <b>X.org log</b>. This list also determines the order in which the files are read.</p></qt>");
fileList=new FileList(this, description);

4
ksystemlog/src/xorg/xorgReader.cpp
Unescape View File

@ -35,7 +35,7 @@
XorgReader::XorgReader(TQObject *parent, const char *name) :
DefaultReader(parent, name),
newLineTime(),
newLineDate(TQDate::tqcurrentDate()),
newLineDate(TQDate::currentDate()),
lineCount(1)
{
@ -76,7 +76,7 @@ LogLine* XorgReader::parseMessage(TQString& string, LogFile* originalFile) {
}
TQStringList list;
//list.append(i18n("# %1").tqarg(lineCount));
//list.append(i18n("# %1").arg(lineCount));
list.append(logLineType->name);
list.append(string);

Write Preview
Loading…
Cancel
Save