diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:29:23 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:26:26 +0200 |
| commit | 6a1f2b1b6b19b0dd47b1e58afff29a12ae158226 (patch) | |
| tree | b3de8cec6a2df2306a13d2d884ea95a8f0c207d2 /konqueror/keditbookmarks | |
| parent | 6ca5e6d65a74d794637953bfea85c42e3bf828dd (diff) | |
| download | tdebase-6a1f2b1b6b19b0dd47b1e58afff29a12ae158226.tar.gz tdebase-6a1f2b1b6b19b0dd47b1e58afff29a12ae158226.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 628043be55ddd2f534411d028e4f68c8fe4eaabb)
Diffstat (limited to 'konqueror/keditbookmarks')
| -rw-r--r-- | konqueror/keditbookmarks/commands.cpp | 4 | ||||
| -rw-r--r-- | konqueror/keditbookmarks/main.cpp | 4 | ||||
| -rw-r--r-- | konqueror/keditbookmarks/toplevel.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index c7c5f83a6..f0855fec0 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource( bool modified = false; const char *format = 0; for (int i = 0; format = data->format(i), format; i++) { - // qt docs don't say if tqencodedData(blah) where + // qt docs don't say if encodedData(blah) where // blah is not a stored mimetype should return null // or not. so, we search. sucky... if (strcmp(format, "GALEON_BOOKMARK") == 0) { modified = true; TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); - mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK")); + mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK")); data = mydrag; break; } else if( strcmp(format, "application/x-xbel" )==0) { diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 9b19ee449..47dd324f3 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { bool gotArg = (args->count() == 1); TQString filename = gotArg - ? TQString::tqfromLatin1(args->arg(0)) - : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + ? TQString::fromLatin1(args->arg(0)) + : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); if (!isGui) { CurrentMgr::self()->createManager(filename); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 148a8b5ca..26cc4c3d6 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b) { TQDateTime dt; dt.setTime_t(b); - return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31) + return (dt.daysTo(TQDateTime::currentDateTime()) > 31) ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) : KGlobal::locale()->formatDateTime(dt, false); } @@ -233,11 +233,11 @@ KEBApp::KEBApp( vsplitter->setOrientation(Qt::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 - << m_bkinfo->tqsizeHint().height() ); + << m_bkinfo->sizeHint().height() ); setCentralWidget(vsplitter); - resize(ListView::self()->widget()->tqsizeHint().width(), - vsplitter->tqsizeHint().height()); + resize(ListView::self()->widget()->sizeHint().width(), + vsplitter->sizeHint().height()); createActions(); if (m_browser) |