summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/configdialog.cpp2
-rw-r--r--src/crashhandler.cpp2
-rw-r--r--src/hiddensrvs.ui.h4
-rw-r--r--src/likeback.cpp38
-rw-r--r--src/likeback.h2
-rw-r--r--src/newstreamosd.cpp2
-rw-r--r--src/tork.cpp32
-rw-r--r--src/torkapplet/tork_mnu.cpp2
-rw-r--r--src/torkview.cpp2
-rw-r--r--src/torkview_base.ui.h8
-rw-r--r--src/trayicon.cpp2
11 files changed, 48 insertions, 48 deletions
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 2c105f5..fecfb26 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -54,7 +54,7 @@ email : [email protected]
#include <tqlistview.h>
#include <tqcheckbox.h>
-#include <tdeapplication.h> //kapp
+#include <tdeapplication.h> //tdeApp
#include <kcombobox.h>
#include <kiconloader.h>
#include <klineedit.h>
diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp
index 96b4cd5..235eb5f 100644
--- a/src/crashhandler.cpp
+++ b/src/crashhandler.cpp
@@ -214,7 +214,7 @@ namespace torK
body += kdBacktrace();
//TODO startup notification
- kapp->invokeMailer(
+ tdeApp->invokeMailer(
/*to*/ "[email protected]",
/*cc*/ TQString(),
/*bcc*/ TQString(),
diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h
index 1cda611..ac78996 100644
--- a/src/hiddensrvs.ui.h
+++ b/src/hiddensrvs.ui.h
@@ -183,7 +183,7 @@ void MyHidden::testService_clicked()
if ((TorkConfig::tDEUsesTor()) &&
(static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor())){
KURL url = TQString("http://%1").arg(servicesList->currentItem()->text(0));
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}else{
TQString caption = i18n("Not Connected To Tor!");
TQString message = i18n("<p>Konqueror and TorK need to be using Tor in order to test a hidden service. <br>"
@@ -200,7 +200,7 @@ void MyHidden::publishService_clicked()
(static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor())){
KURL url = TQString("tor:6sxoyfb3h2nvok2d.onion/tor/FrontPage?action=edit");
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}else{
TQString caption = i18n("Not Connected To Tor!");
TQString message = i18n("<p>Konqueror and TorK need to be using Tor in order to publish a hidden service. <br>"
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 976e328..4c7c1cb 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -64,10 +64,10 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
{
TQHBoxLayout *layout = new TQHBoxLayout(this);
- TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like_tork", TDEIcon::Small);
- TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", TDEIcon::Small);
- TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug_tork", TDEIcon::Small);
- TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", TDEIcon::Small);
+ TQIconSet likeIconSet = tdeApp->iconLoader()->loadIconSet("likeback_like_tork", TDEIcon::Small);
+ TQIconSet dislikeIconSet = tdeApp->iconLoader()->loadIconSet("likeback_dislike_tork", TDEIcon::Small);
+ TQIconSet bugIconSet = tdeApp->iconLoader()->loadIconSet("likeback_bug_tork", TDEIcon::Small);
+ TQIconSet featureIconSet = tdeApp->iconLoader()->loadIconSet("likeback_feature_tork", TDEIcon::Small);
m_likeButton = new TQToolButton(this, "likeback_like_tork");
m_likeButton->setIconSet(likeIconSet);
@@ -124,7 +124,7 @@ void LikeBackBar::autoMove()
{
static TQWidget *lastWindow = 0;
- TQWidget *window = kapp->activeWindow();
+ TQWidget *window = tdeApp->activeWindow();
// When a Kicker applet has the focus, like the Commandline TQLineEdit,
// the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon.
// It's obviously bad ;-) :
@@ -219,9 +219,9 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, con
// Use default TDEApplication config and aboutData if not provided:
if (d->config == 0)
- d->config = kapp->config();
+ d->config = tdeApp->config();
if (d->aboutData == 0)
- d->aboutData = kapp->aboutData();
+ d->aboutData = tdeApp->aboutData();
// Initialize properties (2/2) [Needs aboutData to be set]:
d->showBar = userWantsToShowBar();
@@ -411,10 +411,10 @@ void LikeBack::setUserWantsToShowBar(bool showBar)
void LikeBack::showInformationMessage()
{
// Load and register the images needed by the message:
- TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::Small);
- TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::Small);
- TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::Small);
- TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::Small);
+ TQPixmap likeIcon = tdeApp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::Small);
+ TQPixmap dislikeIcon = tdeApp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::Small);
+ TQPixmap bugIcon = tdeApp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::Small);
+ TQPixmap featureIcon = tdeApp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::Small);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon);
@@ -490,7 +490,7 @@ TQString LikeBack::activeWindowPath()
{
// Compute the window hierarchy (from the latest to the oldest):
TQStringList windowNames;
- TQWidget *window = kapp->activeWindow();
+ TQWidget *window = tdeApp->activeWindow();
while (window) {
TQString name = window->name();
// Append the class name to the window name if it is unnamed:
@@ -558,7 +558,7 @@ void LikeBack::askEmailAddress()
"<p><b>" + i18n("Please provide your email address.") + "</b></p>" +
"<p>" + i18n("It will only be used to contact you back if more information is needed about your comments, ask you how to reproduce the bugs you report, send bug corrections for you to test, etc.") + "</p>" +
"<p>" + i18n("The email address is optional. If you do not provide any, your comments will be sent anonymously.") + "</p>",
- currentEmailAddress, &ok, kapp->activeWindow(), /*name=*/(const char*)0, &emailValidator);
+ currentEmailAddress, &ok, tdeApp->activeWindow(), /*name=*/(const char*)0, &emailValidator);
enableBar();
if (ok)
@@ -631,7 +631,7 @@ void LikeBack::fetchUserEmail()
LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialComment, const TQString &windowPath, const TQString &context, LikeBack *likeBack)
: KDialogBase(KDialogBase::Swallow, i18n("Send a Comment to Developers"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Default,
- KDialogBase::Ok, kapp->activeWindow(), /*name=*/"_likeback_feedback_window_", /*modal=*/true, /*separator=*/true)
+ KDialogBase::Ok, tdeApp->activeWindow(), /*name=*/"_likeback_feedback_window_", /*modal=*/true, /*separator=*/true)
, m_likeBack(likeBack)
, m_windowPath(windowPath)
, m_context(context)
@@ -667,7 +667,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
TQWidget *buttons = new TQWidget(box);
TQGridLayout *buttonsGrid = new TQGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint());
if (m_likeBack->buttons() & LikeBack::Like) {
- TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+ TQPixmap likePixmap = tdeApp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *likeIcon = new TQLabel(buttons);
likeIcon->setPixmap(likePixmap);
likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -677,7 +677,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
m_group->insert(likeButton, LikeBack::Like);
}
if (m_likeBack->buttons() & LikeBack::Dislike) {
- TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+ TQPixmap dislikePixmap = tdeApp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *dislikeIcon = new TQLabel(buttons);
dislikeIcon->setPixmap(dislikePixmap);
dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -687,7 +687,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
m_group->insert(dislikeButton, LikeBack::Dislike);
}
if (m_likeBack->buttons() & LikeBack::Bug) {
- TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+ TQPixmap bugPixmap = tdeApp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *bugIcon = new TQLabel(buttons);
bugIcon->setPixmap(bugPixmap);
bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -697,7 +697,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
m_group->insert(bugButton, LikeBack::Bug);
}
if (m_likeBack->buttons() & LikeBack::Feature) {
- TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+ TQPixmap featurePixmap = tdeApp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *featureIcon = new TQLabel(buttons);
featureIcon->setPixmap(featurePixmap);
featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -725,7 +725,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic"));
- resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint()));
+ resize(TQSize(tdeApp->desktop()->width() * 1 / 2, tdeApp->desktop()->height() * 3 / 5).expandedTo(sizeHint()));
TQAction *sendShortcut = new TQAction(this);
sendShortcut->setAccel(TQString("Ctrl+Return"));
diff --git a/src/likeback.h b/src/likeback.h
index 42cb97e..7be3a22 100644
--- a/src/likeback.h
+++ b/src/likeback.h
@@ -57,7 +57,7 @@ class LikeBackDialog;
* Here is an example of code to call to quickly setup LikeBack on the client:
* @code
* // Instanciate the LikeBack system, and show the first-use information dialog if the button-bar is shown:
- * LikeBack *likeBack = new LikeBack(LikeBack::AllButtons, LikeBack::isDevelopmentVersion(kapp->aboutData->version())); // Show button-bar only in beta-versions
+ * LikeBack *likeBack = new LikeBack(LikeBack::AllButtons, LikeBack::isDevelopmentVersion(tdeApp->aboutData->version())); // Show button-bar only in beta-versions
* likeBack->setServer("myapp.kde.org", "/likeback/send.php");
* likeBack->setAcceptedLanguages(TQStringList::split(";", "en;fr"), i18n("Please write in English or French."));
*
diff --git a/src/newstreamosd.cpp b/src/newstreamosd.cpp
index 76b4022..4c0e2ad 100644
--- a/src/newstreamosd.cpp
+++ b/src/newstreamosd.cpp
@@ -197,7 +197,7 @@ void StreamOSD::renderOSD()
infoList = new TQListView( this, "infoList" );
infoList->addColumn( "StreamID" );
infoList->addColumn( "Host" );
- infoList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
+ infoList->addColumn( tdeApp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
infoList->addColumn( "KB/s" );
infoList->addColumn( "Exit" );
infoList->setColumnWidthMode(0, TQListView::Manual);
diff --git a/src/tork.cpp b/src/tork.cpp
index 8357211..4b7372f 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -137,9 +137,9 @@ tork::tork()
// Register with DCOP
-// if ( !kapp->dcopClient()->isRegistered() ) {
- kapp->dcopClient()->registerAs( "tork", false );
- kapp->dcopClient()->setDefaultObject( objId() );
+// if ( !tdeApp->dcopClient()->isRegistered() ) {
+ tdeApp->dcopClient()->registerAs( "tork", false );
+ tdeApp->dcopClient()->setDefaultObject( objId() );
// }
tdemain = this;
@@ -323,7 +323,7 @@ tork::tork()
showTipOnStart();
turnOffTDE();
- if ((TDEApplication::kApplication()->isRestored()))
+ if ((tdeApp->isRestored()))
startEverything();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -467,7 +467,7 @@ void tork::prepareToShut()
bool tork::queryClose()
{
- if (client && !kapp->sessionSaving()) {
+ if (client && !tdeApp->sessionSaving()) {
hide();
return false;
}
@@ -492,7 +492,7 @@ void tork::shuttingDown()
prepareToShut();
- kapp->quit();
+ tdeApp->quit();
}
void tork::setupActions()
@@ -771,7 +771,7 @@ void tork::setupActions()
//set up all other actions
- KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
setStandardToolBarMenuEnabled(true);
@@ -2582,7 +2582,7 @@ TQString tork::doHashPassword()
hashproc->start(TDEProcIO::NotifyOnExit,TRUE);
while (hashproc->isRunning() && m_hashedpassword.isEmpty())
- kapp->processEvents();
+ tdeApp->processEvents();
return m_hashedpassword;
}
@@ -3342,21 +3342,21 @@ void tork::mixminionHome()
{
KURL url = "http://www.mixminion.net";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
void tork::hiddenServices()
{
KURL url = "tor://nnqtnsoohprzqcke.onion";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
void tork::networkList()
{
KURL url = "http://torstatus.blutmagie.de/";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
void tork::toggleTDESetting()
@@ -3768,7 +3768,7 @@ void tork::serverHelp()
{
KURL url = "http://tork.sourceforge.net/wiki/index.php/FAQ#Tor.2FTorK_say_my_server_isn.27t_reachable._What_do_I_do.3F";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
@@ -3777,7 +3777,7 @@ void tork::readEavesdropping()
{
KURL url = "http://tork.sourceforge.net/wiki/index.php/FAQ#Is_Tor_more_secure_than_ordinary_internet_use.3F";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
@@ -3785,7 +3785,7 @@ void tork::aboutTorify()
{
KURL url = "http://tork.sourceforge.net/wiki/index.php/FAQ#How_do_I_use_TorK_to_anonymize_applications.3F";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
@@ -3802,7 +3802,7 @@ void tork::configurePrivoxy()
{
KURL url = "http://config.privoxy.org";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
@@ -3810,7 +3810,7 @@ void tork::aboutParanoidMode()
{
KURL url = "http://tork.sourceforge.net/wiki/index.php/FAQ#What_is_.27Paranoid_Mode.27.3F";
- kapp->invokeBrowser(url.url(), "0");
+ tdeApp->invokeBrowser(url.url(), "0");
}
diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp
index 67914ed..1a06748 100644
--- a/src/torkapplet/tork_mnu.cpp
+++ b/src/torkapplet/tork_mnu.cpp
@@ -76,7 +76,7 @@ void TorkMenu::initialize()
}
else
{
- kapp->iconLoader()->addAppDir("tork");
+ tdeApp->iconLoader()->addAppDir("tork");
}
setInitialized(true);
diff --git a/src/torkview.cpp b/src/torkview.cpp
index 3720e0c..efafa4a 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -1484,7 +1484,7 @@ void torkView::showServerBW(const TQString &fp )
fl = TQString("http://www.noreply.org/tor-running-routers/%1/node-traf-%2.png")
.arg(fp.left(2)).arg(fp);
TDEIO::NetAccess::download( fl, tmpFile, 0L );
- kapp->processEvents();
+ tdeApp->processEvents();
streamList-> setPaletteBackgroundPixmap( TQPixmap(tmpFile) );
}
diff --git a/src/torkview_base.ui.h b/src/torkview_base.ui.h
index c550472..9cf9ddb 100644
--- a/src/torkview_base.ui.h
+++ b/src/torkview_base.ui.h
@@ -57,7 +57,7 @@ void torkview_base::init()
connect(clearButton, TQ_SIGNAL( clicked() ),
serverFilter, TQ_SLOT(clear()) );
- serverList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall",
+ serverList->addColumn( tdeApp->iconLoader()->loadIconSet("tork_torsmall",
TDEIcon::Small),"", 24 );
serverList->addColumn( "Server" );
serverList->addColumn( "FP" );
@@ -81,7 +81,7 @@ void torkview_base::init()
streamList->addColumn( "ID" );
streamList->addColumn( tr2i18n("Source") );
streamList->addColumn( tr2i18n("Host/Port") );
- streamList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
+ streamList->addColumn( tdeApp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
streamList->addColumn( tr2i18n("Speed") );
streamList->addColumn( tr2i18n("Exit") );
streamList->addColumn( tr2i18n("Circuit") );
@@ -94,7 +94,7 @@ void torkview_base::init()
circuitList->addColumn( tr2i18n( "ID" ) );
- circuitList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
+ circuitList->addColumn( tdeApp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
circuitList->addColumn( tr2i18n( "Path" ) );
circuitList->setSelectionMode( TQListView::Extended );
circuitList->setColumnWidthMode(0, TQListView::Manual);
@@ -103,7 +103,7 @@ void torkview_base::init()
circuitList->setResizeMode( TQListView::LastColumn );
- ORList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
+ ORList->addColumn( tdeApp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
ORList->addColumn( tr2i18n( "Server" ) );
ORList->setSelectionMode( TQListView::Extended );
ORList->setColumnWidthMode(0, TQListView::Manual);
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index e26a70e..36a9fa7 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -68,7 +68,7 @@ TrayIcon::TrayIcon( tork *parent, const char *name)
setAcceptDrops( TRUE );
m_hover_popup = new TrayHoverPopup(m_kt_pix,this);
- connect(this,TQ_SIGNAL(quitSelected()),kapp,TQ_SLOT(quit()));
+ connect(this,TQ_SIGNAL(quitSelected()),tdeApp,TQ_SLOT(quit()));
connect(this->contextMenu(),TQ_SIGNAL(aboutToShow()),m_hover_popup,TQ_SLOT(contextMenuAboutToShow()));
connect(this->contextMenu(),TQ_SIGNAL(aboutToHide()),m_hover_popup,TQ_SLOT(contextMenuAboutToHide()));
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-12 21:22:11 +0000