diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:35:00 -0600 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2012-06-25 03:21:34 +0200 |
commit | 4432e0a1145b0ef95d741fea6d04b565f36fa626 (patch) | |
tree | 7b61af36dc90fbe53aefa70337c04b4bfdaf727d /src/notecontent.cpp | |
parent | 636a6a6e172e0493af4b19582e07ef8165973329 (diff) | |
download | basket-4432e0a1145b0ef95d741fea6d04b565f36fa626.tar.gz basket-4432e0a1145b0ef95d741fea6d04b565f36fa626.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 522c7294f06d294c77bc1ea7d0dec4b371c43373)
Diffstat (limited to 'src/notecontent.cpp')
-rw-r--r-- | src/notecontent.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/notecontent.cpp b/src/notecontent.cpp index 01f56dc..4ba09d1 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -138,7 +138,7 @@ void NoteContent::contentChanged(int newMinWidth) m_minWidth = newMinWidth; if (note()) { // note()->unbufferize(); - note()->requestRetqlayout(); // TODO: It should re-set the width! m_width = 0 ? contentChanged: setWidth, geteight, if size havent changed, only tqrepaint and not retqlayout + note()->requestRetqlayout(); // TODO: It should re-set the width! m_width = 0 ? contentChanged: setWidth, geteight, if size havent changed, only repaint and not retqlayout } } @@ -210,7 +210,7 @@ TQString LinkContent::toText(const TQString &/*cuttedFullPath*/) else if (title().isEmpty()) return url().prettyURL(); else - return TQString("%1 <%2>").tqarg(title(), url().prettyURL()); + return TQString("%1 <%2>").arg(title(), url().prettyURL()); } TQString ColorContent::toText(const TQString &/*cuttedFullPath*/) { return color().name(); } TQString UnknownContent::toText(const TQString &/*cuttedFullPath*/) { return ""; } @@ -223,25 +223,25 @@ TQString HtmlContent::toHtml(const TQString &/*imageName*/, const TQString &/*cu { return Tools::htmlToParagraph(html()); } TQString ImageContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("<img src=\"%1\">").tqarg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } +{ return TQString("<img src=\"%1\">").arg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } TQString AnimationContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("<img src=\"%1\">").tqarg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } +{ return TQString("<img src=\"%1\">").arg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } TQString SoundContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("<a href=\"%1\">%2</a>").tqarg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? +{ return TQString("<a href=\"%1\">%2</a>").arg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? TQString FileContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("<a href=\"%1\">%2</a>").tqarg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? +{ return TQString("<a href=\"%1\">%2</a>").arg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? TQString LinkContent::toHtml(const TQString &/*imageName*/, const TQString &/*cuttedFullPath*/) -{ return TQString("<a href=\"%1\">%2</a>").tqarg(url().prettyURL(), title()); } // With the icon? +{ return TQString("<a href=\"%1\">%2</a>").arg(url().prettyURL(), title()); } // With the icon? TQString LauncherContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("<a href=\"%1\">%2</a>").tqarg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), name()); } // With the icon? +{ return TQString("<a href=\"%1\">%2</a>").arg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), name()); } // With the icon? TQString ColorContent::toHtml(const TQString &/*imageName*/, const TQString &/*cuttedFullPath*/) -{ return TQString("<span style=\"color: %1\">%2</span>").tqarg(color().name(), color().name()); } +{ return TQString("<span style=\"color: %1\">%2</span>").arg(color().name(), color().name()); } TQString UnknownContent::toHtml(const TQString &/*imageName*/, const TQString &/*cuttedFullPath*/) { return ""; } @@ -804,7 +804,7 @@ bool ImageContent::saveToFile() void ImageContent::toolTipInfos(TQStringList *keys, TQStringList *values) { keys->append(i18n("Size")); - values->append(i18n("%1 by %2 pixels").tqarg(TQString::number(m_pixmap.width()), TQString::number(m_pixmap.height()))); + values->append(i18n("%1 by %2 pixels").arg(TQString::number(m_pixmap.width()), TQString::number(m_pixmap.height()))); } TQString ImageContent::messageWhenOpenning(OpenMessage where) @@ -983,7 +983,7 @@ void AnimationContent::movieStatus(int status) void AnimationContent::exportToHTML(HTMLExporter *exporter, int /*indent*/) { exporter->stream << TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" alt=\"\">") - .tqarg( exporter->dataFolderName + exporter->copyFile(fullPath(), /*createIt=*/true), + .arg( exporter->dataFolderName + exporter->copyFile(fullPath(), /*createIt=*/true), TQString::number(movie().framePixmap().size().width()), TQString::number(movie().framePixmap().size().height()) ); } @@ -1427,7 +1427,7 @@ void LauncherContent::toolTipInfos(TQStringList *keys, TQStringList *values) TQString exec = service.exec(); if (service.terminal()) - exec = i18n("%1 <i>(run in terminal)</i>").tqarg(exec); + exec = i18n("%1 <i>(run in terminal)</i>").arg(exec); if (!service.comment().isEmpty() && service.comment() != service.name()) { keys->append(i18n("Comment")); @@ -1570,10 +1570,10 @@ void ColorContent::toolTipInfos(TQStringList *keys, TQStringList *values) m_color.getHsv(&hue, &saturation, &value); keys->append(i18n("RGB Colorspace: Red/Green/Blue", "RGB")); - values->append(i18n("<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,").tqarg(TQString::number(m_color.red()), TQString::number(m_color.green()), TQString::number(m_color.blue()))); + values->append(i18n("<i>Red</i>: %1, <i>Green</i>: %2, <i>Blue</i>: %3,").arg(TQString::number(m_color.red()), TQString::number(m_color.green()), TQString::number(m_color.blue()))); keys->append(i18n("HSV Colorspace: Hue/Saturation/Value", "HSV")); - values->append(i18n("<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,").tqarg(TQString::number(hue), TQString::number(saturation), TQString::number(value))); + values->append(i18n("<i>Hue</i>: %1, <i>Saturation</i>: %2, <i>Value</i>: %3,").arg(TQString::number(hue), TQString::number(saturation), TQString::number(value))); static TQString cssColors[] = { "aqua", "00ffff", @@ -1778,12 +1778,12 @@ void ColorContent::exportToHTML(HTMLExporter *exporter, int /*indent*/) int rectHeight = (textRect.height() + 2)*3/2; int rectWidth = rectHeight * 14 / 10; // 1.4 times the height, like A4 papers. - TQString fileName = /*Tools::fileNameForNewFile(*/TQString(TQString("color_%1.png").tqarg(color().name()).lower().mid(1))/*, exportData.iconsFolderPath)*/; + TQString fileName = /*Tools::fileNameForNewFile(*/TQString(TQString("color_%1.png").arg(color().name()).lower().mid(1))/*, exportData.iconsFolderPath)*/; TQString fullPath = exporter->iconsFolderPath + fileName; TQPixmap colorIcon = KColorCombo2::colorRectPixmap(color(), /*isDefault=*/false, rectWidth, rectHeight); colorIcon.save(fullPath, "PNG"); TQString iconHtml = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" alt=\"\">") - .tqarg(exporter->iconsFolderName + fileName, TQString::number(colorIcon.width()), TQString::number(colorIcon.height())); + .arg(exporter->iconsFolderName + fileName, TQString::number(colorIcon.width()), TQString::number(colorIcon.height())); exporter->stream << iconHtml + " " + color().name(); } |