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 /kopete/plugins/addbookmarks | |
| 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 'kopete/plugins/addbookmarks')
| -rw-r--r-- | kopete/plugins/addbookmarks/addbookmarksplugin.cpp | 6 | ||||
| -rw-r--r-- | kopete/plugins/addbookmarks/addbookmarkspreferences.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index 2288f62f..65e808f4 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -13,7 +13,7 @@ #include <kdebug.h> #include <kbookmark.h> #include <tqvariant.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqregexp.h> #include "addbookmarksplugin.moc" @@ -144,7 +144,7 @@ KBookmarkGroup BookmarksPlugin::getKopeteFolder() { KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager(); - return getFolder( mgr->root(), TQString::fromLatin1("kopete") ); + return getFolder( mgr->root(), TQString::tqfromLatin1("kopete") ); } KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& folder ) @@ -165,7 +165,7 @@ KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data ) { - TQString temp = TQString::fromLatin1(data); + TQString temp = TQString::tqfromLatin1(data); TQRegExp rx("<meta[^>]*(charset|CHARSET)\\s*=\\s*[^>]*>"); int pos = rx.search( temp ); TQTextCodec *codec; diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp index 114cdbc4..a6175750 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp @@ -16,7 +16,7 @@ #include <kopetepluginmanager.h> #include <kopetecontactlist.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqbuttongroup.h> #include <tqlistbox.h> #include <tqnamespace.h> |