diff options
Diffstat (limited to 'kopete/plugins/history/historydialog.cpp')
| -rw-r--r-- | kopete/plugins/history/historydialog.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index c4f5418f..4b4877c2 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -35,12 +35,12 @@ #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdir.h> #include <tqdatetime.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> #include <kdebug.h> @@ -95,7 +95,7 @@ int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, const char* name) : KDialogBase(parent, name, false, - i18n("History for %1").tqarg(mc->displayName()), 0), mSearching(false) + i18n("History for %1").arg(mc->displayName()), 0), mSearching(false) { TQString fontSize; TQString htmlCode; @@ -148,7 +148,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlView->setMarginWidth(4); mHtmlView->setMarginHeight(4); mHtmlView->setFocusPolicy(TQ_NoFocus); - mHtmlView->tqsetSizePolicy( + mHtmlView->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); l->addWidget(mHtmlView); @@ -157,7 +157,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlPart->begin(); htmlCode = "<html><head>" + fontStyle + "</head><body class=\"hf\"></body></html>"; - mHtmlPart->write( TQString::tqfromLatin1( htmlCode.latin1() ) ); + mHtmlPart->write( TQString::fromLatin1( htmlCode.latin1() ) ); mHtmlPart->end(); @@ -175,7 +175,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, //initActions KActionCollection* ac = new KActionCollection(this); mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); - mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::tqfromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); + mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); resize(650, 700); centerOnScreen(this); @@ -255,13 +255,13 @@ void HistoryDialog::init(Kopete::Contact *c) { // Get year and month list TQRegExp rx( "\\.(\\d\\d\\d\\d)(\\d\\d)" ); - const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ); + const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ); TQFileInfo *fi; // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); @@ -288,9 +288,9 @@ void HistoryDialog::init(Kopete::Contact *c) // END of kopete 0.7.x check TQString logDir = locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + - TQString::tqfromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + + TQString::fromLatin1( "/" ) + + c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) ); TQDir d(logDir); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); @@ -339,16 +339,16 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs) htmlBody.removeChild(htmlBody.childNodes().item(htmlBody.childNodes().length() - 1)); // ---- - TQString dir = (TQApplication::reverseLayout() ? TQString::tqfromLatin1("rtl") : - TQString::tqfromLatin1("ltr")); + TQString dir = (TQApplication::reverseLayout() ? TQString::fromLatin1("rtl") : + TQString::fromLatin1("ltr")); TQValueList<Kopete::Message>::iterator it = msgs.begin(); TQString accountLabel; TQString resultHTML = "<b><font color=\"red\">" + (*it).timestamp().date().toString() + "</font></b><br/>"; - DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span")); - newNode.setAttribute(TQString::tqfromLatin1("dir"), dir); + DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span")); + newNode.setAttribute(TQString::fromLatin1("dir"), dir); newNode.setInnerHTML(resultHTML); mHtmlPart->htmlDocument().body().appendChild(newNode); @@ -384,8 +384,8 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs) : "<font color=\"" + KopetePrefs::prefs()->textColor().light(200).name() + "\"><b><</b></font> ") + body + "<br/>"; - newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span")); - newNode.setAttribute(TQString::tqfromLatin1("dir"), dir); + newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span")); + newNode.setAttribute(TQString::fromLatin1("dir"), dir); newNode.setInnerHTML(resultHTML); mHtmlPart->htmlDocument().body().appendChild(newNode); @@ -553,7 +553,7 @@ void HistoryDialog::slotContactChanged(int index) else { mMetaContact = mMetaContactList.at(index-1); - setCaption(i18n("History for %1").tqarg(mMetaContact->displayName())); + setCaption(i18n("History for %1").arg(mMetaContact->displayName())); init(); } } @@ -597,16 +597,16 @@ void HistoryDialog::slotCopy() if ( qsSelection.isEmpty() ) return; disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); - TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Clipboard); - TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Selection); + TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); } void HistoryDialog::slotCopyURL() { disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); - TQApplication::tqclipboard()->setText( mURL, TQClipboard::Clipboard); - TQApplication::tqclipboard()->setText( mURL, TQClipboard::Selection); + TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard); + TQApplication::clipboard()->setText( mURL, TQClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); } |