diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:13 -0600 |
| commit | 56160bf4dfe503631ef6373367b281f081bab2b4 (patch) | |
| tree | 7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdeui/ktip.cpp | |
| parent | 13281e2856a2ef43bbab78c5528470309c23aa77 (diff) | |
| download | tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdeui/ktip.cpp')
| -rw-r--r-- | tdeui/ktip.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index fba5174fc..70290f62c 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqfile.h> #include <tqhbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqregexp.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqimage.h> #include <kaboutdata.h> @@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) { TQString tipFile = _tipFile; if (tipFile.isEmpty()) - tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; + tipFile = TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; loadTips(tipFile); @@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) { if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) ) { - addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); + addTips(TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); } else { @@ -347,10 +347,10 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo const int oneDay = 24*60*60; TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown"); // Show tip roughly once a week - if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) + if (lastShown.secsTo(TQDateTime::tqcurrentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) return; } - configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime()); + configGroup.writeEntry("TipLastShown", TQDateTime::tqcurrentDateTime()); kapp->config()->sync(); if (!hasLastShown) return; // Don't show tip on first start @@ -384,7 +384,7 @@ static TQString fixTip(TQString tip) void KTipDialog::prevTip() { mDatabase->prevTip(); - TQString currentTip = TQString::fromLatin1( + TQString currentTip = TQString::tqfromLatin1( "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>") .arg(mTextColor.name()) .arg(mBaseColor.name()) @@ -399,7 +399,7 @@ static TQString fixTip(TQString tip) void KTipDialog::nextTip() { mDatabase->nextTip(); - TQString currentTip = TQString::fromLatin1( + TQString currentTip = TQString::tqfromLatin1( "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>") .arg(mTextColor.name()) .arg(mBaseColor.name()) |