TDE
/
ksystemlog
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent e65d401151
commit b6d3b22ce8
17 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

8
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

8
ksystemlog/src/detailDialog.cpp
Unescape View File

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

6
ksystemlog/src/fileList.cpp
Unescape View File

@ -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/itemFactory.cpp
Unescape View File

@ -107,7 +107,7 @@ 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));
@ -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);

2
ksystemlog/src/ksystemlog.cpp
Unescape View File

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

2
ksystemlog/src/logListItem.cpp
Unescape View File

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

6
ksystemlog/src/logManager.cpp
Unescape View File

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

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

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

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

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