summaryrefslogtreecommitdiffstats
path: root/src/libgui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:40:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:40:25 -0600
commit4374b9aebc67cce74e5c1099d5f4ad1749b05fc6 (patch)
tree8f99491ad0bd6e9632a912f07acdccebd2af9127 /src/libgui
parent9d9fe02a944fe0719c2475739411727a729251ad (diff)
downloadpiklab-4374b9aebc67cce74e5c1099d5f4ad1749b05fc6.tar.gz
piklab-4374b9aebc67cce74e5c1099d5f4ad1749b05fc6.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/libgui')
-rw-r--r--src/libgui/device_editor.cpp4
-rw-r--r--src/libgui/device_gui.cpp4
-rw-r--r--src/libgui/editor.cpp2
-rw-r--r--src/libgui/editor_manager.cpp4
-rw-r--r--src/libgui/global_config.cpp4
-rw-r--r--src/libgui/hex_editor.cpp8
-rw-r--r--src/libgui/likeback.cpp2
-rw-r--r--src/libgui/log_view.cpp2
-rw-r--r--src/libgui/object_view.cpp2
-rw-r--r--src/libgui/project.cpp2
-rw-r--r--src/libgui/project_manager.cpp10
-rw-r--r--src/libgui/project_wizard.cpp8
-rw-r--r--src/libgui/text_editor.cpp2
-rw-r--r--src/libgui/toplevel.cpp2
14 files changed, 28 insertions, 28 deletions
diff --git a/src/libgui/device_editor.cpp b/src/libgui/device_editor.cpp
index 9b3b852..c48ffb2 100644
--- a/src/libgui/device_editor.cpp
+++ b/src/libgui/device_editor.cpp
@@ -63,7 +63,7 @@ void DeviceEditor::setDevice(bool force)
if ( name==Device::AUTO_DATA.name )
_labelDevice->setText(i18n("The target device is not configured and cannot be guessed from source file. "
"The source file either cannot be found or does not contain any processor directive."));
- else _labelDevice->setText(i18n("Device guessed from file: %1").tqarg(name));
+ else _labelDevice->setText(i18n("Device guessed from file: %1").arg(name));
_labelDevice->show();
} else {
if ( !force && Main::device()==_device ) return;
@@ -71,7 +71,7 @@ void DeviceEditor::setDevice(bool force)
_labelDevice->hide();
}
if ( _view && isModified() ) {
- if ( MessageBox::questionYesNo(i18n("File %1 not saved.").tqarg(filename()), KStdGuiItem::save(), KStdGuiItem::discard()) )
+ if ( MessageBox::questionYesNo(i18n("File %1 not saved.").arg(filename()), KStdGuiItem::save(), KStdGuiItem::discard()) )
Editor::save();
}
_labelWarning->hide();
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index fafd5a1..e5c6d4a 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -260,12 +260,12 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
TQListViewItem *selected = 0;
const Programmer::Group *pgroup = programmerGroup();
if ( pgroup && pgroup->supportedDevices().isEmpty() && pgroup->isSoftware() ) {
- _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").tqarg(pgroup->label()));
+ _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").arg(pgroup->label()));
return;
}
const Tool::Group *tgroup = toolGroup();
if ( tgroup && tgroup->supportedDevices().isEmpty() ) {
- _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").tqarg(tgroup->label()));
+ _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").arg(tgroup->label()));
return;
}
for (int i=list.count()-1; i>=0; i--) {
diff --git a/src/libgui/editor.cpp b/src/libgui/editor.cpp
index 2999b1e..e5cea2e 100644
--- a/src/libgui/editor.cpp
+++ b/src/libgui/editor.cpp
@@ -77,7 +77,7 @@ TQString Editor::filename() const
bool Editor::checkSaved()
{
if ( !isModified() ) return true;
- MessageBox::Result res = MessageBox::questionYesNoCancel(i18n("File %1 not saved.").tqarg(filename()),
+ MessageBox::Result res = MessageBox::questionYesNoCancel(i18n("File %1 not saved.").arg(filename()),
KStdGuiItem::save(), KStdGuiItem::discard());
if ( res==MessageBox::Cancel ) return false;
if ( res==MessageBox::Yes ) save();
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index 5c9c193..8713c9e 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -106,7 +106,7 @@ bool EditorManager::openFile(const PURL::Url &url)
if ( url.isEmpty() ) return false;
Editor *e = findEditor(url);
if (e) { // document already loaded
- if ( !MessageBox::askContinue(i18n("File \"%1\" already loaded. Reload?").tqarg(url.kurl().prettyURL()),
+ if ( !MessageBox::askContinue(i18n("File \"%1\" already loaded. Reload?").arg(url.kurl().prettyURL()),
i18n("Warning"), i18n("Reload")) ) return true;
if ( !e->slotLoad() ) {
closeEditor(e, false);
@@ -439,7 +439,7 @@ void EditorManager::switchToEditor()
SwitchToDialog dialog(names, this);
if ( dialog.exec()!=TQDialog::Accepted ) return;
for (uint i=0; i<names.count(); i++) {
- if ( dialog.name()!=names[i] && dialog.name()!=TQString("%1").tqarg(i+1) ) continue;
+ if ( dialog.name()!=names[i] && dialog.name()!=TQString("%1").arg(i+1) ) continue;
showEditor(_editors[i]);
return;
}
diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp
index 8d246fc..e8fa5ca 100644
--- a/src/libgui/global_config.cpp
+++ b/src/libgui/global_config.cpp
@@ -40,7 +40,7 @@ PURL::UrlList GlobalConfig::openedFiles()
PURL::UrlList files;
uint i = 0;
for (;;) {
- TQString file = config.readEntry(TQString("file%1").tqarg(i), TQString::null);
+ TQString file = config.readEntry(TQString("file%1").arg(i), TQString::null);
if ( file.isEmpty() ) break;
files += PURL::Url::fromPathOrUrl(file);
i++;
@@ -52,7 +52,7 @@ void GlobalConfig::writeOpenedFiles(const PURL::UrlList &files)
GenericConfig config(TQString::null);
for (uint i=0; i<=files.count(); i++) {
TQString s = (i==files.count() ? TQString::null : files[i].filepath());
- config.writeEntry(TQString("file%1").tqarg(i), s);
+ config.writeEntry(TQString("file%1").arg(i), s);
}
}
diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp
index c8b2727..438996c 100644
--- a/src/libgui/hex_editor.cpp
+++ b/src/libgui/hex_editor.cpp
@@ -99,7 +99,7 @@ bool HexEditor::simpleLoad()
TQStringList warnings;
if ( _memory->fromHexBuffer(_hexBuffer, warnings)!=Device::Memory::NoWarning ) {
_labelWarning->setText(i18n("<b>Warning:</b> hex file seems to be incompatible with the selected device %1:<br>%2")
- .tqarg(_memory->device().name()).tqarg(warnings.join("<br>")));
+ .arg(_memory->device().name()).arg(warnings.join("<br>")));
_labelWarning->show();
} else _labelWarning->hide();
display();
@@ -139,7 +139,7 @@ bool HexEditor::open(const PURL::Url &url)
bool HexEditor::save(const PURL::Url &url)
{
- return save(url, i18n("File URL: \"%1\".").tqarg(url.pretty()));
+ return save(url, i18n("File URL: \"%1\".").arg(url.pretty()));
}
bool HexEditor::save(const PURL::Url &url, const TQString &fileErrorString)
@@ -147,7 +147,7 @@ bool HexEditor::save(const PURL::Url &url, const TQString &fileErrorString)
PURL::File file(url, Main::compileLog());
if ( !file.openForWrite() ) return false;
if ( !_memory->save(file.stream(), HexBuffer::IHX32) ) {
- MessageBox::detailedSorry(i18n("Error while writing file \"%1\".").tqarg(url.pretty()), fileErrorString, Log::Show);
+ MessageBox::detailedSorry(i18n("Error while writing file \"%1\".").arg(url.pretty()), fileErrorString, Log::Show);
return false;
}
_originalMemory->copyFrom(*_memory);
@@ -186,7 +186,7 @@ void HexEditor::statusChanged()
TQString s;
if (_memory) {
BitValue cs = static_cast<Device::HexView *>(_view)->checksum();
- s = i18n("Checksum: %1").tqarg(toHexLabel(cs, 4));
+ s = i18n("Checksum: %1").arg(toHexLabel(cs, 4));
}
emit statusTextChanged(s);
}
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index bac822c..df00d39 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -171,7 +171,7 @@ void LikeBack::showInformationMessage()
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon);
KMessageBox::information(0,
- "<p><b>" + i18n("This is a quick feedback system for %1.").tqarg(s_about->programName()) + "</b></p>"
+ "<p><b>" + i18n("This is a quick feedback system for %1.").arg(s_about->programName()) + "</b></p>"
"<p>" + i18n("To help us improve it, your comments are important.") + "</p>"
"<p>" + i18n("Each time you have a great or frustrating experience, "
"please click the appropriate hand below the window title-bar, "
diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp
index 2442bc3..cdb92f2 100644
--- a/src/libgui/log_view.cpp
+++ b/src/libgui/log_view.cpp
@@ -48,7 +48,7 @@ void Log::Widget::doLog(DebugLevel level, const TQString &text, Action action)
void Log::Widget::doLog(const TQString &text, const TQString &color, bool bold, Action action)
{
logExtra(text + "\n");
- TQString s = TQString("<font color=%1>").tqarg(color);
+ TQString s = TQString("<font color=%1>").arg(color);
if (bold) s += "<b>";
s += escapeXml(text);
if (bold) s += "</b>";
diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp
index fa5239d..1854b8a 100644
--- a/src/libgui/object_view.cpp
+++ b/src/libgui/object_view.cpp
@@ -123,7 +123,7 @@ bool DisassemblyEditor::open(const PURL::Url &url)
Device::Memory *memory = 0;
if ( _editor==0 ) {
- log(Log::LineType::Information, i18n("Disassembling hex file: %1").tqarg(_source.pretty()));
+ log(Log::LineType::Information, i18n("Disassembling hex file: %1").arg(_source.pretty()));
PURL::File file(_source, Main::compileLog());
if ( !file.openForRead() ) return false;
memory = _device.group().createMemory(_device);
diff --git a/src/libgui/project.cpp b/src/libgui/project.cpp
index 8ece518..c7a043f 100644
--- a/src/libgui/project.cpp
+++ b/src/libgui/project.cpp
@@ -21,7 +21,7 @@ bool Project::load(TQString &error)
if ( _url.fileType()==PURL::Project ) return XmlDataFile::load(error);
if ( !_url.exists() ) {
- error = i18n("Project file %1 does not exist.").tqarg(_url.pretty());
+ error = i18n("Project file %1 does not exist.").arg(_url.pretty());
return false;
}
PURL::Url tmp = _url;
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index ce58146..c9eabc1 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -242,7 +242,7 @@ void ProjectManager::View::closeProject()
_project->setWatchedRegisters(Register::list().watched());
TQString error;
if ( !_project->save(error) )
- MessageBox::detailedSorry(i18n("Could not save project file \"%1\".").tqarg(_project->url().pretty()), error, Log::Show);
+ MessageBox::detailedSorry(i18n("Could not save project file \"%1\".").arg(_project->url().pretty()), error, Log::Show);
delete _project;
_project = 0;
}
@@ -304,25 +304,25 @@ void ProjectManager::View::insertObjectFiles()
void ProjectManager::View::insertFile(const PURL::Url &url)
{
if ( !url.exists() ) {
- MessageBox::detailedSorry(i18n("Could not find file."), i18n("File: %1").tqarg(url.pretty()), Log::Show);
+ MessageBox::detailedSorry(i18n("Could not find file."), i18n("File: %1").arg(url.pretty()), Log::Show);
return;
}
PURL::Url purl = url;
MessageBox::Result copy = MessageBox::No;
if ( !url.isInto(_project->directory()) ) {
- copy = MessageBox::questionYesNoCancel(i18n("File \"%1\" is not inside the project directory. Do you want to copy the file to your project directory?").tqarg(url.pretty()),
+ copy = MessageBox::questionYesNoCancel(i18n("File \"%1\" is not inside the project directory. Do you want to copy the file to your project directory?").arg(url.pretty()),
i18n("Copy and Add"), i18n("Add only"));
if ( copy==MessageBox::Cancel ) return;
if ( copy==MessageBox::Yes ) purl = PURL::Url(_project->directory(), url.filename());
}
if ( _project->absoluteFiles().contains(purl) ) {
- MessageBox::detailedSorry(i18n("File is already in the project."), i18n("File: %1").tqarg(purl.pretty()), Log::Show);
+ MessageBox::detailedSorry(i18n("File is already in the project."), i18n("File: %1").arg(purl.pretty()), Log::Show);
return;
}
if ( copy==MessageBox::Yes ) {
Log::StringView sview;
if ( !url.copyTo(purl, sview) ) {
- MessageBox::detailedSorry(i18n("Copying file to project directory failed."), i18n("File: %1\n").tqarg(url.pretty()) + sview.string(), Log::Show);
+ MessageBox::detailedSorry(i18n("Copying file to project directory failed."), i18n("File: %1\n").arg(url.pretty()) + sview.string(), Log::Show);
return;
}
}
diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp
index 35e76b5..15fe174 100644
--- a/src/libgui/project_wizard.cpp
+++ b/src/libgui/project_wizard.cpp
@@ -36,7 +36,7 @@ FileListItem::FileListItem(KListView *view)
void FileListItem::toggle()
{
_copy = !_copy;
- tqrepaint();
+ repaint();
}
PURL::FileGroup FileListItem::fileGroup() const
@@ -184,7 +184,7 @@ void ProjectWizard::next()
return;
}
} else if ( url().exists() ) {
- if ( !MessageBox::askContinue(i18n("Project \"%1\"already exists. Overwrite it?").tqarg(url().filename())) ) return;
+ if ( !MessageBox::askContinue(i18n("Project \"%1\"already exists. Overwrite it?").arg(url().filename())) ) return;
}
if ( !toolchain().check(device(), &Main::compileLog()) ) return;
_files->setDirectory(_directory->directory());
@@ -203,7 +203,7 @@ void ProjectWizard::next()
for (uint i=0; i<_files->count(); i++)
if ( static_cast<const FileListItem *>(_files->item(i))->fileGroup()==PURL::Source ) nb++;
if ( toolchain().compileType()==Tool::SingleFile && nb>1 ) {
- if ( !MessageBox::askContinue(i18n("The selected toolchain can only compile a single source file and you have selected %1 source files. Continue anyway? ").tqarg(nb)) ) return;
+ if ( !MessageBox::askContinue(i18n("The selected toolchain can only compile a single source file and you have selected %1 source files. Continue anyway? ").arg(nb)) ) return;
}
}
KWizard::next();
@@ -243,7 +243,7 @@ void ProjectWizard::done(int r)
}
Log::StringView sview;
if ( turl.write(text, sview) ) files += turl;
- else MessageBox::detailedSorry(i18n("Error creating template file."), i18n("File: %1\n").tqarg(turl.pretty()) + sview.string(), Log::Show);
+ else MessageBox::detailedSorry(i18n("Error creating template file."), i18n("File: %1\n").arg(turl.pretty()) + sview.string(), Log::Show);
_project->setOpenedFiles(files);
} else {
Log::StringView sview;
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index d9d0692..f78ebb8 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -167,7 +167,7 @@ void TextEditor::statusChanged()
{
uint line, col;
_view->cursorPosition(&line, &col) ;
- TQString text = i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1);
+ TQString text = i18n("Line: %1 Col: %2").arg(line+1).arg(col+1);
if( isReadOnly() ) text += " " + i18n("R/O");
emit statusTextChanged(" " + text + " ");
if ( isReadOnly()!=_oldReadOnly || isModified()!=_oldModified ) emit guiChanged();
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index b909b82..0be3a13 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -728,7 +728,7 @@ void MainWindow::runPikloops()
_pikloopsProcess->setup("pikloops", TQStringList(), false);
connect(_pikloopsProcess, TQT_SIGNAL(done(int)), TQT_SLOT(pikloopsDone()));
if ( !_pikloopsProcess->start(0) )
- MessageBox::detailedSorry(i18n("Could not run \"pikloops\""), i18n("The Pikloops utility (%1) is not installed in your system.").tqarg("http://pikloops.sourceforge.net"), Log::Show);
+ MessageBox::detailedSorry(i18n("Could not run \"pikloops\""), i18n("The Pikloops utility (%1) is not installed in your system.").arg("http://pikloops.sourceforge.net"), Log::Show);
}
void MainWindow::pikloopsDone()