From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kdict/toplevel.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'kdict/toplevel.cpp') diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 496d4d53..fb19461f 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -14,7 +14,7 @@ ------------------------------------------------------------- */ -#include +#include #include #include @@ -260,11 +260,11 @@ void TopLevel::define(const TQString &query) void TopLevel::defineClipboard() { kdDebug(5004) << "TopLevel::defineClipboard()" << endl; - kapp->clipboard()->setSelectionMode(true); - TQString text = kapp->clipboard()->text(); + kapp->tqclipboard()->setSelectionMode(true); + TQString text = kapp->tqclipboard()->text(); if (text.isEmpty()) { - kapp->clipboard()->setSelectionMode(false); - text = kapp->clipboard()->text(); + kapp->tqclipboard()->setSelectionMode(false); + text = kapp->tqclipboard()->text(); } define(text); } @@ -281,11 +281,11 @@ void TopLevel::match(const TQString &query) void TopLevel::matchClipboard() { kdDebug(5004) << "TopLevel::matchClipboard()" << endl; - kapp->clipboard()->setSelectionMode(true); - TQString text = kapp->clipboard()->text(); + kapp->tqclipboard()->setSelectionMode(true); + TQString text = kapp->tqclipboard()->text(); if (text.isEmpty()) { - kapp->clipboard()->setSelectionMode(false); - text = kapp->clipboard()->text(); + kapp->tqclipboard()->setSelectionMode(false); + text = kapp->tqclipboard()->text(); } match(text); } @@ -394,12 +394,12 @@ void TopLevel::setupStatusBar() TQString serverInfo; if (global->authEnabled) - serverInfo = TQString(" %1@%2:%3 ").arg(getShortString(global->user,50)) - .arg(getShortString(global->server,50)) - .arg(global->port); + serverInfo = TQString(" %1@%2:%3 ").tqarg(getShortString(global->user,50)) + .tqarg(getShortString(global->server,50)) + .tqarg(global->port); else - serverInfo = TQString(" %1:%3 ").arg(getShortString(global->server,50)) - .arg(global->port); + serverInfo = TQString(" %1:%3 ").tqarg(getShortString(global->server,50)) + .tqarg(global->port); statusBar()->insertItem(serverInfo, 1,3); statusBar()->setItemAlignment(1,AlignLeft | AlignVCenter); } @@ -746,12 +746,12 @@ void TopLevel::optionsChanged() { TQString serverInfo; if (global->authEnabled) - serverInfo = TQString(" %1@%2:%3 ").arg(getShortString(global->user,50)) - .arg(getShortString(global->server,50)) - .arg(global->port); + serverInfo = TQString(" %1@%2:%3 ").tqarg(getShortString(global->user,50)) + .tqarg(getShortString(global->server,50)) + .tqarg(global->port); else - serverInfo = TQString(" %1:%3 ").arg(getShortString(global->server,50)) - .arg(global->port); + serverInfo = TQString(" %1:%3 ").tqarg(getShortString(global->server,50)) + .tqarg(global->port); statusBar()->changeItem(serverInfo,1); interface->serverChanged(); // inform client queryView->optionsChanged(); // inform html-view -- cgit v1.2.1