summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--amor/amor.cpp12
-rw-r--r--amor/amoranim.cpp2
-rw-r--r--amor/amorbubble.cpp4
-rw-r--r--amor/amorconfig.cpp4
-rw-r--r--amor/amordialog.cpp2
-rw-r--r--amor/amortips.cpp2
-rw-r--r--doc/kworldclock/index.docbook4
-rw-r--r--kmoon/kmoondlg.cpp2
-rw-r--r--kodo/kodometer.cpp6
-rw-r--r--kteatime/TODO2
-rw-r--r--kteatime/toplevel.cpp12
-rw-r--r--kweather/kweather.cpp2
-rw-r--r--kweather/sidebarwidget.cpp4
-rw-r--r--kweather/stationsconfigwidget.cpp2
-rw-r--r--kweather/weatherbar.cpp2
-rw-r--r--kweather/weatherbutton.cpp8
-rw-r--r--kweather/weatherservice.cpp10
-rw-r--r--kworldwatch/main.cpp6
-rw-r--r--kworldwatch/mapwidget.cpp4
19 files changed, 45 insertions, 45 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp
index c6de8af..79e7612 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -191,7 +191,7 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject()
}
else
{
- kapp->quit();
+ tdeApp->quit();
}
}
@@ -315,7 +315,7 @@ bool Amor::readConfig()
// Store relative paths into files to avoid storing absolute pathnames.
TDEGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files);
- int randomTheme = kapp->random() % files.count();
+ int randomTheme = tdeApp->random() % files.count();
mConfig.mTheme = (TQString)*files.at(randomTheme);
}
@@ -473,7 +473,7 @@ void Amor::selectAnimation(State state)
if (mTargetRect.width() == mCurrAnim->frame()->width())
mPosition = mCurrAnim->hotspot().x();
else
- mPosition = ( kapp->random() %
+ mPosition = ( tdeApp->random() %
(mTargetRect.width() - mCurrAnim->frame()->width()) )
+ mCurrAnim->hotspot().x();
}
@@ -613,7 +613,7 @@ void Amor::slotMouseClicked(const TQPoint &pos)
mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQ_SLOT(slotConfigure()));
mMenu->insertSeparator();
mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
- mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQ_SLOT(quit()));
+ mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), tdeApp, TQ_SLOT(quit()));
}
mMenu->exec(pos);
@@ -680,7 +680,7 @@ void Amor::slotTimeout()
// only displayed on the first frame of mBaseAnim (the old way of doing this).
if ( !mTipsQueue.isEmpty() && !mBubble && mConfig.mAppTips)
showBubble();
- else if (kapp->random()%TIP_FREQUENCY == 1 && mConfig.mTips && !mBubble && !mCurrAnim->frameNum())
+ else if (tdeApp->random()%TIP_FREQUENCY == 1 && mConfig.mTips && !mBubble && !mCurrAnim->frameNum())
{
mTipsQueue.enqueue(new QueueItem(QueueItem::Tip, mTips.tip()));
showBubble();
@@ -1014,7 +1014,7 @@ AmorSessionWidget::AmorSessionWidget()
{
// the only function of this widget is to catch & forward the
// saveYourself() signal from the session manager
- connect(kapp, TQ_SIGNAL(saveYourself()), TQ_SLOT(wm_saveyourself()));
+ connect(tdeApp, TQ_SIGNAL(saveYourself()), TQ_SLOT(wm_saveyourself()));
}
void AmorSessionWidget::wm_saveyourself()
diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp
index 3dcfef5..a95dcc6 100644
--- a/amor/amoranim.cpp
+++ b/amor/amoranim.cpp
@@ -198,7 +198,7 @@ AmorAnim *AmorThemeManager::random(const TQString & group)
AmorAnimationGroup *animGroup = mAnimations.find(grp);
if (animGroup) {
- int idx = kapp->random()%animGroup->count();
+ int idx = tdeApp->random()%animGroup->count();
return animGroup->at( idx );
}
diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp
index fce5df8..fcb7fe7 100644
--- a/amor/amorbubble.cpp
+++ b/amor/amorbubble.cpp
@@ -119,7 +119,7 @@ void AmorBubble::calcGeometry()
// The actual position of the bubble may change if it is too close to
// the desktop boundary.
- if (mOriginX + w > kapp->desktop()->width())
+ if (mOriginX + w > tdeApp->desktop()->width())
{
// source on right
xpos = mOriginX - w - BUBBLE_OFFSET;
@@ -127,7 +127,7 @@ void AmorBubble::calcGeometry()
mBound.moveBy( -ARROW_WIDTH, 0 );
}
- if (mOriginY + h > kapp->desktop()->height())
+ if (mOriginY + h > tdeApp->desktop()->height())
{
// source at bottom
ypos = mOriginY - h + BORDER_SIZE + ARROW_HEIGHT / 2;
diff --git a/amor/amorconfig.cpp b/amor/amorconfig.cpp
index b58c2b5..d5896e0 100644
--- a/amor/amorconfig.cpp
+++ b/amor/amorconfig.cpp
@@ -48,7 +48,7 @@ AmorConfig::AmorConfig()
//
void AmorConfig::read()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TDEConfigGroupSaver cs(config, "General");
mOnTop = config->readBoolEntry("OnTop", false);
@@ -66,7 +66,7 @@ void AmorConfig::read()
//
void AmorConfig::write()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TDEConfigGroupSaver cs(config, "General");
config->writeEntry("OnTop", mOnTop);
diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp
index 9af3b47..3d99a25 100644
--- a/amor/amordialog.cpp
+++ b/amor/amordialog.cpp
@@ -251,7 +251,7 @@ void AmorDialog::slotApply()
void AmorDialog::slotCancel()
{
// restore offset
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TDEConfigGroupSaver cs(config, "General");
emit offsetChanged(config->readNumEntry("Offset"));
reject();
diff --git a/amor/amortips.cpp b/amor/amortips.cpp
index 7c0c0d4..60479bb 100644
--- a/amor/amortips.cpp
+++ b/amor/amortips.cpp
@@ -75,7 +75,7 @@ TQString AmorTips::tip()
{
if (mTips.count())
{
- TQString tip = *mTips.at(kapp->random() % mTips.count());
+ TQString tip = *mTips.at(tdeApp->random() % mTips.count());
return i18n(tip.utf8());
}
diff --git a/doc/kworldclock/index.docbook b/doc/kworldclock/index.docbook
index 8937d3b..1f77f60 100644
--- a/doc/kworldclock/index.docbook
+++ b/doc/kworldclock/index.docbook
@@ -65,7 +65,7 @@ Please report any problems or feature requests to the &kde; mailing lists.
</para>
</chapter>
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
<title>Using &kworldclock;</title>
<sect1><title>The main display</title>
@@ -469,7 +469,7 @@ Documentation Copyright &copy; 2004 &Brad.Hards; &Brad.Hards.mail;.
<appendix id="installation">
<title>Installation</title>
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
<title>How to obtain &kworldclock;</title>
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index eeafbcc..2190151 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -94,7 +94,7 @@ void KMoonDlg::angleChanged(int value) {
}
void KMoonDlg::help() {
- kapp->invokeHelp(TQString::fromLatin1("config"));
+ tdeApp->invokeHelp(TQString::fromLatin1("config"));
}
void KMoonDlg::toggleHemi() {
diff --git a/kodo/kodometer.cpp b/kodo/kodometer.cpp
index 473b27e..dc0bd01 100644
--- a/kodo/kodometer.cpp
+++ b/kodo/kodometer.cpp
@@ -56,7 +56,7 @@ Kodometer::Kodometer(TQWidget* parent, const char* name)
pollInterval(10),
saveFrequency(10)
{
- display = TDEApplication::kApplication()->getDisplay();
+ display = tdeApp->getDisplay();
FindAllScreens();
root = RootWindow(display, DefaultScreen(display));
@@ -86,7 +86,7 @@ Kodometer::Kodometer(TQWidget* parent, const char* name)
// Make the popup menu
menu = new TDEPopupMenu();
- menu->insertTitle(kapp->miniIcon(), TDEGlobal::instance()->aboutData()->programName());
+ menu->insertTitle(tdeApp->miniIcon(), TDEGlobal::instance()->aboutData()->programName());
enabledID = menu->insertItem(i18n("&Enable"), this, TQ_SLOT(toggleEnabled()));
metricID = menu->insertItem(i18n("&Metric Display"), this,
@@ -594,7 +594,7 @@ void Kodometer::saveSettings(void)
void Kodometer::quit()
{
saveSettings();
- kapp->quit();
+ tdeApp->quit();
}
#include "kodometer.moc"
diff --git a/kteatime/TODO b/kteatime/TODO
index b1b096d..4aa36a3 100644
--- a/kteatime/TODO
+++ b/kteatime/TODO
@@ -24,7 +24,7 @@
internals:
- 'int2time()' somewhere into class-namespace? (ie. not as global function)
-- do kapp->closeAllWindows() on slotFileQuit() ?
+- do tdeApp->closeAllWindows() on slotFileQuit() ?
- when in "ready"-state, left-click -> auto-go to initial state
before opening left-click menu(?)
- remember geometry of config-dialog (and its QListView!)
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index f38437a..281583b 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -69,7 +69,7 @@ TopLevel::TopLevel() : KSystemTray()
teas.clear();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Teas");
if (config->hasKey("Number")) {
@@ -152,7 +152,7 @@ TopLevel::TopLevel() : KSystemTray()
menu->insertSeparator();
confAct->plug(menu);
menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
- menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQ_SLOT(quit()));
+ menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), tdeApp, TQ_SLOT(quit()));
// quitAct->plug(menu); // FIXME: this doesn't seem to work with above definition of quitAct?
// (need special 'quit'-method?)
@@ -186,7 +186,7 @@ TopLevel::TopLevel() : KSystemTray()
/* (not currently needed)
void TopLevel::queryExit()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
// config->sync();
}
*/
@@ -421,7 +421,7 @@ void TopLevel::teaSelected(int index)
menu->setItemChecked(index, true);
current_selected = index;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
config->writeEntry("Tea", current_selected);
}
@@ -657,7 +657,7 @@ void TopLevel::actionEnableToggled(bool on)
/* config-slot: "help" button clicked */
void TopLevel::help()
{
- kapp->invokeHelp();
+ tdeApp->invokeHelp();
}
/* config-slot: "Configure Events..." button clicked */
@@ -845,7 +845,7 @@ void TopLevel::config()
rebuildTeaMenus();
// and store to config
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
// remove old-style entries from default-group (if present)
if (config->hasKey("UserTea"))
config->deleteEntry("UserTea");
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 61e5eb4..9843914 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -173,7 +173,7 @@ void kweather::preferences()
/** The help handler */
void kweather::help()
{
- kapp->invokeHelp(TQString(), TQString::fromLatin1("kweather"));
+ tdeApp->invokeHelp(TQString(), TQString::fromLatin1("kweather"));
}
/** Display the current weather report. */
diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp
index dc481ec..6a785d1 100644
--- a/kweather/sidebarwidget.cpp
+++ b/kweather/sidebarwidget.cpp
@@ -63,9 +63,9 @@ sidebarwidget::sidebarwidget(TQWidget* parent, const char* name)
mainLayout->addWidget(toolbar);
mainLayout->addWidget(reportGrid);
- if(!kapp->dcopClient()->isAttached())
+ if(!tdeApp->dcopClient()->isAttached())
{
- kapp->dcopClient()->attach();
+ tdeApp->dcopClient()->attach();
}
dcopCall = new DCOPRef( "KWeatherService", "WeatherService" );
diff --git a/kweather/stationsconfigwidget.cpp b/kweather/stationsconfigwidget.cpp
index 5ba7aee..365650b 100644
--- a/kweather/stationsconfigwidget.cpp
+++ b/kweather/stationsconfigwidget.cpp
@@ -204,7 +204,7 @@ bool StationsConfigWidget::dcopActive()
TQString error;
TQCString appID;
bool isGood = true;
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if ( !client->isApplicationRegistered( "KWeatherService" ) ) {
if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) )
isGood = false;
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index 98cad49..e9f5309 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -187,7 +187,7 @@ bool KonqSidebarWeather::startWeatherService()
TQDataStream arg(data, IO_WriteOnly);
arg << TQString("KWeatherService") << TQStringList();
- if ( !kapp->dcopClient()->call(
+ if ( !tdeApp->dcopClient()->call(
"tdelauncher", "tdelauncher",
"start_service_by_name(TQString,TQStringList)",
data, replyType, replyData) ) {
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index 986eebf..9f1dc21 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -34,13 +34,13 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name )
{
setBackgroundOrigin( AncestorOrigin );
- connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+ connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ),
TQ_SLOT( slotSettingsChanged( int ) ) );
- connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+ connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ),
TQ_SLOT( slotIconChanged( int ) ) );
- kapp->addKipcEventMask( KIPC::SettingsChanged );
- kapp->addKipcEventMask( KIPC::IconChanged );
+ tdeApp->addKipcEventMask( KIPC::SettingsChanged );
+ tdeApp->addKipcEventMask( KIPC::IconChanged );
slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
}
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index 3ec47c9..1418cdd 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -47,7 +47,7 @@ WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (p
connect(m_weatherLib, TQ_SIGNAL(stationRemoved(const TQString&)),
TQ_SLOT(slotStationRemoved(const TQString&)));
- TDEConfig *conf = kapp->config();
+ TDEConfig *conf = tdeApp->config();
conf->setGroup("WEATHERSTATIONS");
TQStringList stations =conf->readListEntry("stations");
@@ -61,7 +61,7 @@ WeatherService::~WeatherService()
kdDebug(12006) << "Going away... " << endl;
// Don't need to call saveSettings() because WeatherService::exit
// already does that. Plus it wouldn't work here anyway because
- // we can't get the config after calling kapp->quit();
+ // we can't get the config after calling tdeApp->quit();
delete stationDB;
}
@@ -141,7 +141,7 @@ TQString WeatherService::pressure(const TQString &stationID)
TQPixmap WeatherService::icon(const TQString &stationID, uint iconSize)
{
- return kapp->iconLoader()->loadIcon(
+ return tdeApp->iconLoader()->loadIcon(
iconPath(stationID, iconSize),
TDEIcon::Panel, iconSize
);
@@ -249,7 +249,7 @@ void WeatherService::addStation(const TQString &stationID)
void WeatherService::exit()
{
saveSettings();
- kapp->quit();
+ tdeApp->quit();
}
TQStringList WeatherService::listStations()
@@ -259,7 +259,7 @@ TQStringList WeatherService::listStations()
void WeatherService::saveSettings()
{
- TDEConfig *conf = kapp->config();
+ TDEConfig *conf = tdeApp->config();
conf->setGroup("WEATHERSTATIONS");
conf->writeEntry( "stations", m_weatherLib->stations());
conf->sync();
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index 3195d55..78bd401 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -70,7 +70,7 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name)
connect(_map, TQ_SIGNAL(saveSettings()), this, TQ_SLOT(doSave()));
if (restore)
- load(kapp->config());
+ load(tdeApp->config());
}
@@ -96,14 +96,14 @@ void WorldWideWatch::save(TDEConfig *config)
void WorldWideWatch::doSave()
{
- save(kapp->config());
+ save(tdeApp->config());
}
void WatchApplication::dumpMap()
{
// guess some default parameters
- TQSize mapSize(kapp->desktop()->size());
+ TQSize mapSize(tdeApp->desktop()->size());
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 452a0ba..25bdea8 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -69,7 +69,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
if (restore)
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
if (applet)
config = new TDEConfig("kwwwappletrc");
_theme = config->readEntry("Theme", "depths");
@@ -152,7 +152,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
_cityIndicator->setPalette(TQToolTip::palette());
if (restore && !applet)
- load(kapp->config());
+ load(tdeApp->config());
connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCityIndicator()));
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-14 19:49:23 +0000