diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
tree | 591f1dc22278addb439726c42896376b17bb42bd /knewsticker/newssourcedlgimpl.cpp | |
parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'knewsticker/newssourcedlgimpl.cpp')
-rw-r--r-- | knewsticker/newssourcedlgimpl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp index e5c50090..e78321c7 100644 --- a/knewsticker/newssourcedlgimpl.cpp +++ b/knewsticker/newssourcedlgimpl.cpp @@ -56,7 +56,7 @@ SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const if (url.isLocalFile()) u = TQString(); else - u.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); + u.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(u); } @@ -138,12 +138,12 @@ void NewsSourceDlgImpl::slotOkClicked() KURL iconURL ( leIcon->text() ); if (iconURL.protocol().isEmpty()) - if (iconURL.host().startsWith(TQString::fromLatin1("ftp."))) - iconURL.setProtocol(TQString::fromLatin1("ftp")); - else if (iconURL.host().startsWith(TQString::fromLatin1("www."))) - iconURL.setProtocol(TQString::fromLatin1("http")); + if (iconURL.host().startsWith(TQString::tqfromLatin1("ftp."))) + iconURL.setProtocol(TQString::tqfromLatin1("ftp")); + else if (iconURL.host().startsWith(TQString::tqfromLatin1("www."))) + iconURL.setProtocol(TQString::tqfromLatin1("http")); else - iconURL.setProtocol(TQString::fromLatin1("file")); + iconURL.setProtocol(TQString::tqfromLatin1("file")); NewsSourceBase::Data nsd(leName->text(), url.url(), iconURL.url(), subject, sbMaxArticles->value(), true, cbProgram->isChecked()); @@ -191,7 +191,7 @@ void NewsSourceDlgImpl::setup(const NewsSourceBase::Data &nsd, bool modify) comboCategory->setCurrentItem(nsd.subject); sbMaxArticles->setValue(nsd.maxArticles); KURL iconURL ( nsd.icon ); - if (iconURL.protocol() == TQString::fromLatin1("file")) + if (iconURL.protocol() == TQString::tqfromLatin1("file")) iconURL.setProtocol(TQString()); leIcon->setText(iconURL.url()); NewsIconMgr::self()->getIcon(iconURL); @@ -205,10 +205,10 @@ KURL NewsSourceDlgImpl::polishedURL(const KURL &url) const KURL newURL = url; if (url.protocol().isEmpty()) - if (url.url().startsWith(TQString::fromLatin1("ftp"))) - newURL = TQString::fromLatin1("ftp://") + url.url(); + if (url.url().startsWith(TQString::tqfromLatin1("ftp"))) + newURL = TQString::tqfromLatin1("ftp://") + url.url(); else - newURL = TQString::fromLatin1("http://") + url.url(); + newURL = TQString::tqfromLatin1("http://") + url.url(); return newURL; } @@ -222,7 +222,7 @@ bool NewsSourceDlgImpl::validateURL(const KURL &url) return false; } - if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::fromLatin1("/")) { + if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::tqfromLatin1("/")) { KMessageBox::error(this, i18n("KNewsTicker needs a valid RDF or RSS file to" " suggest sensible values. The specified source file is invalid."), i18n("Invalid Source File")); |