TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Use tdeApp

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/575/head
Michele Calgaro 2 months ago
parent 1a5b54f42c
commit 834496cf73
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
302 changed files with 1056 additions and 1056 deletions
Show Stats Download Patch File Download Diff File

2
doc/khelpcenter/userguide/index.docbook
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "<replaceable>KApp</replaceable>">
<!ENTITY kappname "<replaceable>TDEApp</replaceable>">
<!ENTITY % addindex "INCLUDE">
<!ENTITY % imageobjectco.module "INCLUDE">
<!ENTITY getting-help SYSTEM "getting-help.docbook">

2
doc/khelpcenter/userguide/programs-and-documents.docbook
Unescape Escape View File

@ -251,7 +251,7 @@ the <guilabel>Preview and Metafiles</guilabel> tab and change the
<title>Configuring Programs</title>
<sect2 id="configure-kapp">
<sect2 id="configure-tdeApp">
<title>Application Configuration</title>
<!-- FIXME: Make a more friendly title -->
<indexterm><primary>Configuration</primary></indexterm>

4
doc/ksplashml/index.docbook
Unescape Escape View File

@ -606,13 +606,13 @@ or before it starts loading plugins, &etc;, invoke &ksplash; as
follows:</para>
<programlisting>
DCOPClient *c = kapp-&gt;dcopClient();
DCOPClient *c = tdeApp-&gt;dcopClient();
TQString error;
QCString KSplashName;
int pid = 0;
QStringList args;
args &lt;&lt; "--theme=MyCoolTheme" &lt;&lt; "--managed";
if (kapp-&gt;startServiceByDesktopName("ksplash", args, &amp;error,
if (tdeApp-&gt;startServiceByDesktopName("ksplash", args, &amp;error,
&amp;KSplashName, &amp;pid))
{
KMessageBox::sorry(0, error, "Unable to invoke KSplash");

2
doc/tdeprint/index.docbook
Unescape Escape View File

@ -20,7 +20,7 @@
<!ENTITY external-command-doc SYSTEM "external-command.docbook">
<!ENTITY extensions-doc SYSTEM "extensions.docbook">
<!ENTITY final-word-doc SYSTEM "final-word.docbook">
<!ENTITY kappname "&tdeprint;"><!-- replace kapp here -->
<!ENTITY kappname "&tdeprint;"><!-- replace tdeApp here -->
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here -->
]>

4
drkonqi/toplevel.cpp
Unescape Escape View File

@ -92,8 +92,8 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(accept()));
connect(m_krashconf, TQ_SIGNAL(newDebuggingApplication(const TQString&)), TQ_SLOT(slotNewDebuggingApp(const TQString&)));
if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() )
kapp->dcopClient()->registerAs( kapp->name() );
if ( !m_krashconf->safeMode() && tdeApp->dcopClient()->attach() )
tdeApp->dcopClient()->registerAs( tdeApp->name() );
}
Toplevel :: ~Toplevel()

6
kappfinder/toplevel.cpp
Unescape Escape View File

@ -88,12 +88,12 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
bbox->addStretch( 5 );
mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQ_SLOT( slotCreate() ) );
mApplyButton->setEnabled( false );
bbox->addButton( KStdGuiItem::close(), kapp, TQ_SLOT( quit() ) );
bbox->addButton( KStdGuiItem::close(), tdeApp, TQ_SLOT( quit() ) );
bbox->layout();
layout->addWidget( bbox );
connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) );
connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) );
mAppCache.setAutoDelete( true );
@ -105,7 +105,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
TDEStartupInfo::appStarted();
TQAccel *accel = new TQAccel( this );
accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQ_SLOT( quit() ) );
accel->connectItem( accel->insertItem( Key_Q + CTRL ), tdeApp, TQ_SLOT( quit() ) );
TDEAcceleratorManager::manage( this );
}

2
kate/app/kateapp.cpp
Unescape Escape View File

@ -113,7 +113,7 @@ KateApp::~KateApp ()
KateApp *KateApp::self ()
{
return (KateApp *) kapp;
return (KateApp *) tdeApp;
}
Kate::Application *KateApp::application ()

2
kate/app/katefilelist.cpp
Unescape Escape View File

@ -741,7 +741,7 @@ void KFLConfigPage::apply()
void KFLConfigPage::reload()
{
// read in from config file
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup( "Filelist" );
cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) );
kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) );

8
kate/app/katefileselector.cpp
Unescape Escape View File

@ -230,7 +230,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) );
cmbPath->setURLs( config->readPathListEntry( "dir history" ) );
// if we restore history
if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) {
if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) {
TQString loc( config->readPathEntry( "location" ) );
if ( ! loc.isEmpty() ) {
// waitingDir = loc;
@ -245,7 +245,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
filter->setHistoryItems( config->readListEntry("filter history"), true );
lastFilter = config->readEntry( "last filter" );
TQString flt("");
if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() )
if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() )
flt = config->readEntry("current filter");
filter->lineEdit()->setText( flt );
slotFilterChange( flt );
@ -629,7 +629,7 @@ void KFSConfigPage::apply()
m_changed = false;
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup( "fileselector" );
// toolbar
TQStringList l;
@ -671,7 +671,7 @@ void KFSConfigPage::reload()
}
void KFSConfigPage::init()
{
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup( "fileselector" );
// toolbar
TQStringList l = config->readListEntry( "toolbar actions", ',' );

2
kate/app/kategrepdialog.cpp
Unescape Escape View File

@ -321,7 +321,7 @@ void GrepTool::processOutput()
lbResult->insertItem(item);
buf = buf.mid(pos+1);
}
kapp->processEvents();
tdeApp->processEvents();
}
void GrepTool::slotSearch()

4
kate/app/katemdi.cpp
Unescape Escape View File

@ -149,7 +149,7 @@ GUIClient::GUIClient ( MainWindow *mw )
m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) );
// read shortcuts
actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
actionCollection()->readShortcutSettings( "Shortcuts", tdeApp->config() );
}
GUIClient::~GUIClient()
@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv)
// try to read the action shortcut
TDEShortcut sc;
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
TQString _grp = cfg->group();
cfg->setGroup("Shortcuts");
sc = TDEShortcut( cfg->readEntry( aname, "" ) );

18
kate/app/kwritemain.cpp
Unescape Escape View File

@ -81,7 +81,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
{
KMessageBox::error(this, i18n("A TDE text-editor component could not be found;\n"
"please check your TDE installation."));
kapp->exit(1);
tdeApp->exit(1);
}
docList.append(doc);
@ -134,7 +134,7 @@ KWrite::~KWrite()
delete m_view->document();
}
kapp->config()->sync ();
tdeApp->config()->sync ();
}
void KWrite::setupActions()
@ -297,7 +297,7 @@ void KWrite::editKeys()
void KWrite::editToolbars()
{
saveMainWindowSettings( kapp->config(), "MainWindow" );
saveMainWindowSettings( tdeApp->config(), "MainWindow" );
KEditToolbar *dlg = new KEditToolbar(guiFactory());
connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
dlg->exec();
@ -306,7 +306,7 @@ void KWrite::editToolbars()
void KWrite::slotNewToolbarConfig()
{
applyMainWindowSettings( kapp->config(), "MainWindow" );
applyMainWindowSettings( tdeApp->config(), "MainWindow" );
}
@ -431,13 +431,13 @@ void KWrite::writeConfig(TDEConfig *config)
//config file
void KWrite::readConfig()
{
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
readConfig(config);
}
void KWrite::writeConfig()
{
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
writeConfig(config);
}
@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(TDEConfig *config) //save documents
//restore session
void KWrite::restore()
{
TDEConfig *config = kapp->sessionConfig();
TDEConfig *config = tdeApp->sessionConfig();
if (!config)
return;
@ -595,7 +595,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
TDEGlobal::locale()->insertCatalogue("katepart");
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
if (!client->isRegistered())
{
client->attach();
@ -604,7 +604,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (kapp->isRestored())
if (tdeApp->isRestored())
{
KWrite::restore();
}

8
kcminit/main.cpp
Unescape Escape View File

@ -180,8 +180,8 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
}
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
// This key has no GUI apparently
TDEConfig config("kcmdisplayrc", true );
@ -194,13 +194,13 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << name << value;
kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
setenv( name, value, 1 ); // apply effect also to itself
if( startup )
{
runModules( 0 );
kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
tdeApp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
sendReady();
TQTimer::singleShot( 300 * 1000, tqApp, TQ_SLOT( quit())); // just in case
tqApp->exec(); // wait for runPhase1() and runPhase2()

4
kcontrol/access/kaccess.cpp
Unescape Escape View File

@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
lay->setSpacing(KDialog::spacingHint());
TQLabel *label1 = new TQLabel( contents);
TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
TQPixmap pixmap = tdeApp->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
if (pixmap.isNull())
pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
label1->setPixmap(pixmap);
@ -751,7 +751,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event)
+" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") );
KWin::setState( dialog->winId(), NET::KeepAbove );
kapp->updateUserTimestamp();
tdeApp->updateUserTimestamp();
dialog->show();
}
}

4
kcontrol/access/kcmaccess.cpp
Unescape Escape View File

@ -717,7 +717,7 @@ void KAccessConfig::save()
// When turning things off, it needs to be done by kaccess,
// so don't actually kill it *shrug*.
if ( true /*needToRunKAccessDaemon( config )*/ )
kapp->startServiceByDesktopName("kaccess");
tdeApp->startServiceByDesktopName("kaccess");
else // don't need it -> kill it
{
@ -814,7 +814,7 @@ extern "C"
delete config;
if (run)
kapp->startServiceByDesktopName("kaccess");
tdeApp->startServiceByDesktopName("kaccess");
}
}

4
kcontrol/arts/arts.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ static bool startArts()
delete config;
if (startServer)
kapp->tdeinitExec(startRealtime?"artswrapper":"artsd",
tdeApp->tdeinitExec(startRealtime?"artswrapper":"artsd",
TQStringList::split(" ",args));
return startServer;
}
@ -600,7 +600,7 @@ void KArtsModule::restartServer()
}
// Restart knotify
kapp->startServiceByDesktopName("knotify");
tdeApp->startServiceByDesktopName("knotify");
}
bool KArtsModule::artsdIsRunning()

2
kcontrol/background/bgrender.cpp
Unescape Escape View File

@ -402,7 +402,7 @@ wp_load:
// HACK: Use KFileMetaInfo only when we're attached to DCOP.
// KFileMetaInfo needs tdesycoca and so on, but this code is
// used also in krootimage (which in turn is used by tdm).
if( kapp->dcopClient()->isAttached()) {
if( tdeApp->dcopClient()->isAttached()) {
KFileMetaInfo metaInfo(file);
if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {
switch (metaInfo.item("Orientation").string().toInt()) {

2
kcontrol/background/bgsettings.cpp
Unescape Escape View File

@ -1275,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings()
// tell kdesktop to get it's butt in gear and pick up the new settings
TQByteArray data;
kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
}

2
kcontrol/background/main.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ void KBackground::save()
m_base->save();
// reconfigure kdesktop. kdesktop will notify all clients
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
client->attach();

16
kcontrol/bell/bell.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ extern "C"
XKeyboardState kbd;
XKeyboardControl kbdc;
XGetKeyboardControl(kapp->getDisplay(), &kbd);
XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
TDEConfig config("kcmbellrc", true, false);
config.setGroup("General");
@ -58,7 +58,7 @@ extern "C"
kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent);
kbdc.bell_pitch = config.readNumEntry("Pitch", kbd.bell_pitch);
kbdc.bell_duration = config.readNumEntry("Duration", kbd.bell_duration);
XChangeKeyboardControl(kapp->getDisplay(),
XChangeKeyboardControl(tdeApp->getDisplay(),
KBBellPercent | KBBellPitch | KBBellDuration,
&kbdc);
}
@ -154,7 +154,7 @@ void KBellConfig::load()
void KBellConfig::load( bool useDefaults )
{
XKeyboardState kbd;
XGetKeyboardControl(kapp->getDisplay(), &kbd);
XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
m_volume->setValue(kbd.bell_percent);
m_pitch->setValue(kbd.bell_pitch);
@ -179,7 +179,7 @@ void KBellConfig::save()
kbd.bell_percent = bellVolume;
kbd.bell_pitch = bellPitch;
kbd.bell_duration = bellDuration;
XChangeKeyboardControl(kapp->getDisplay(),
XChangeKeyboardControl(tdeApp->getDisplay(),
KBBellPercent | KBBellPitch | KBBellDuration,
&kbd);
@ -216,7 +216,7 @@ void KBellConfig::ringBell()
// store the old state
XKeyboardState old_state;
XGetKeyboardControl(kapp->getDisplay(), &old_state);
XGetKeyboardControl(tdeApp->getDisplay(), &old_state);
// switch to the test state
XKeyboardControl kbd;
@ -226,17 +226,17 @@ void KBellConfig::ringBell()
kbd.bell_duration = m_duration->value();
else
kbd.bell_duration = 0;
XChangeKeyboardControl(kapp->getDisplay(),
XChangeKeyboardControl(tdeApp->getDisplay(),
KBBellPercent | KBBellPitch | KBBellDuration,
&kbd);
// ring bell
XBell(kapp->getDisplay(),0);
XBell(tdeApp->getDisplay(),0);
// restore old state
kbd.bell_percent = old_state.bell_percent;
kbd.bell_pitch = old_state.bell_pitch;
kbd.bell_duration = old_state.bell_duration;
XChangeKeyboardControl(kapp->getDisplay(),
XChangeKeyboardControl(tdeApp->getDisplay(),
KBBellPercent | KBBellPitch | KBBellDuration,
&kbd);
}

2
kcontrol/clock/main.cpp
Unescape Escape View File

@ -89,7 +89,7 @@ void KclockModule::save()
#endif
// Tell the clock applet about the change so that it can update its timezone
kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
tdeApp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
}
void KclockModule::load()

6
kcontrol/colors/widgetcanvas.cpp
Unescape Escape View File

@ -433,7 +433,7 @@ void WidgetCanvas::drawSampleWidgets()
// Menu bar
//qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
paint.setFont( menuFont );
@ -441,7 +441,7 @@ void WidgetCanvas::drawSampleWidgets()
TQString file = i18n("File");
textLen = paint.fontMetrics().width( file );
//qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
TQRect(30, 59, textLen + 10, 21), cg);
paint.drawText( 35, 74, file );
@ -526,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets()
cg2.setColor(TQColorGroup::Button, button);
cg2.setColor(TQColorGroup::Background, window);
//qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
paint.setPen(buttonTxt);
paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,

4
kcontrol/componentchooser/componentchooser.cpp
Unescape Escape View File

@ -203,7 +203,7 @@ void CfgEmailClient::save(TDEConfig *)
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
tdeApp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
emit changed(false);
}
@ -298,7 +298,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
delete config;
KIPC::sendMessageAll(KIPC::SettingsChanged);
kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
tdeApp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
emit changed(false);
}

2
kcontrol/css/kcmcss.cpp
Unescape Escape View File

@ -193,7 +193,7 @@ void CSSConfig::save()
{
CSSTemplate css(templ);
dest = kapp->dirs()->saveLocation("data", "kcmcss");
dest = tdeApp->dirs()->saveLocation("data", "kcmcss");
dest += "/override.css";
css.expand(dest, cssDict());

2
kcontrol/dnssd/kcmdnssd.cpp
Unescape Escape View File

@ -122,7 +122,7 @@ void KCMDnssd::load()
TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
avahiStatus.start();
while (avahiStatus.isRunning()) {
kapp->processEvents();
tdeApp->processEvents();
}
int exitStatus = avahiStatus.exitStatus();
if (exitStatus == 0) { // disabled

4
kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
Unescape Escape View File

@ -223,7 +223,7 @@ void FilterOptions::save()
// kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl;
int changedProviderCount = 0;
TQString path = kapp->dirs()->saveLocation("services", "searchproviders/");
TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/");
m_favoriteEngines.clear();
@ -291,7 +291,7 @@ void FilterOptions::save()
for (TQStringList::ConstIterator it = m_deletedProviders.begin();
it != m_deletedProviders.end(); ++it)
{
TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
// Shouldn't happen
if (!matches.count())

4
kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
Unescape Escape View File

@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig()
// contains the sycoca based search provider configuration (malte).
// TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
{
KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
KSimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc");
oldConfig.setGroup("General");
if (oldConfig.hasKey("SearchEngines"))
@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig()
delete provider;
}
KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
KSimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
desktop.setGroup("Desktop Entry");
desktop.writeEntry("Type", "Service");
desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider");

2
kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
enableButtonSeparator(true);
m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40);
m_dlg->leQuery->setMinimumWidth(tdeApp->fontMetrics().maxWidth() * 40);
connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));

4
kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
Unescape Escape View File

@ -379,7 +379,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
u.setRef(ref);
u.setQuery(query);
if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
{
// No authorisation, we pretend it's a file will get
// an access denied error later on.
@ -514,7 +514,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
u.setPath(path);
u.setRef(ref);
if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
{
// No authorisation, we pretend it exists and will get
// an access denied error later on.

2
kcontrol/fonts/fonts.cpp
Unescape Escape View File

@ -757,7 +757,7 @@ void TDEFonts::save()
KIPC::sendMessageAll(KIPC::FontChanged);
kapp->processEvents(); // Process font change ourselves
tdeApp->processEvents(); // Process font change ourselves
bool aaSave = false;
// Don't overwrite global settings unless explicitly asked for - e.g. the system

4
kcontrol/hwmanager/hwdevicetray.cpp
Unescape Escape View File

@ -166,7 +166,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
globalKeys->setEnabled(true);
globalKeys->updateConnections();
connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
doDiskNotifications(true);
@ -760,7 +760,7 @@ void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point,
}
void HwDeviceSystemTray::slotHelpContents() {
kapp->invokeHelp(TQString::null, "hwdevicetray");
tdeApp->invokeHelp(TQString::null, "hwdevicetray");
}
#include "hwdevicetray.moc"

8
kcontrol/icons/icons.cpp
Unescape Escape View File

@ -477,8 +477,8 @@ void TDEIconConfig::save()
g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
mpConfig->sync();
mpSystrayConfig->sync();
@ -497,10 +497,10 @@ void TDEIconConfig::save()
}
// Signal kicker to reload icon configuration
kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
tdeApp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
// Signal system tray to reload icon configuration
kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
tdeApp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
}
void TDEIconConfig::defaults()

4
kcontrol/icons/iconthemes.cpp
Unescape Escape View File

@ -214,7 +214,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString
KTar archive(archiveName);
archive.open(IO_ReadOnly);
kapp->processEvents();
tdeApp->processEvents();
const KArchiveDirectory* rootDir = archive.directory();
@ -225,7 +225,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString
progressDiag.setLabel(
i18n("<qt>Installing <strong>%1</strong> theme</qt>")
.arg(*it));
kapp->processEvents();
tdeApp->processEvents();
if (progressDiag.wasCancelled())
break;

14
kcontrol/input/mouse.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) );
unsigned char map[20];
int buttonCount = XGetPointerMapping(kapp->getDisplay(), map, 20);
int buttonCount = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
// Only allow setting reversing scroll polarity if we have scroll buttons
tab1->cbScrollPolarity->setEnabled(buttonCount >= 5);
@ -624,7 +624,7 @@ void MouseConfig::save()
themetab->save();
// restart kaccess
kapp->startServiceByDesktopName("kaccess");
tdeApp->startServiceByDesktopName("kaccess");
TDECModule::changed(false);
@ -686,14 +686,14 @@ void MouseSettings::load(TDEConfig *config)
{
int accel_num, accel_den, threshold;
double accel;
XGetPointerControl( kapp->getDisplay(),
XGetPointerControl( tdeApp->getDisplay(),
&accel_num, &accel_den, &threshold );
accel = float(accel_num) / float(accel_den);
// get settings from X server
int h = RIGHT_HANDED;
unsigned char map[20];
num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20);
num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
handedEnabled = true;
@ -781,14 +781,14 @@ void MouseConfig::slotWheelScrollLinesChanged(int value)
void MouseSettings::apply(bool force)
{
XChangePointerControl( kapp->getDisplay(),
XChangePointerControl( tdeApp->getDisplay(),
true, true, int(tqRound(accelRate*10)), 10, thresholdMove);
// 256 might seems extreme, but X has already been known to return 32,
// and we don't want to truncate things. Xlib limits the table to 256 bytes,
// so it's a good uper bound..
unsigned char map[256];
num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 256);
num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 256);
int remap=(num_buttons>=1);
if (handedEnabled && (m_handedNeedsApply || force)) {
@ -857,7 +857,7 @@ void MouseSettings::apply(bool force)
}
int retval;
if (remap)
while ((retval=XSetPointerMapping(kapp->getDisplay(), map,
while ((retval=XSetPointerMapping(tdeApp->getDisplay(), map,
num_buttons)) == MappingBusy)
/* keep trying until the pointer is free */
{ };

2
kcontrol/input/tdesyndaemon.cpp
Unescape Escape View File

@ -90,7 +90,7 @@ TDESynDaemon::~TDESynDaemon()
void TDESynDaemon::stop()
{
kapp->quit();
tdeApp->quit();
}
void TDESynDaemon::poll()

2
kcontrol/input/touchpad_settings.cpp
Unescape Escape View File

@ -345,7 +345,7 @@ void TouchpadSettings::apply(bool force)
if (offWhileTyping)
{
kapp->tdeinitExec("tdesyndaemon");
tdeApp->tdeinitExec("tdesyndaemon");
}
}

2
kcontrol/kcontrol/aboutwidget.cpp
Unescape Escape View File

@ -112,7 +112,7 @@ void AboutWidget::updatePixmap()
TQString res = t.read();
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
if ( tdeApp->reverseLayout() )
res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else
res = res.arg( "" );

4
kcontrol/kcontrol/dockcontainer.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ void ModuleTitle::clear()
{
m_icon->setPixmap( TQPixmap() );
m_name->setText( TQString::null );
kapp->processEvents();
tdeApp->processEvents();
}
ModuleWidget::ModuleWidget( TQWidget *parent, const char *name )
@ -214,7 +214,7 @@ i18n("There are unsaved changes in the active module.\n"
}
raiseWidget( _busyw );
kapp->processEvents();
tdeApp->processEvents();
deleteModule();
if (!module) return true;

2
kcontrol/kcontrol/helpwidget.cpp
Unescape Escape View File

@ -80,7 +80,7 @@ bool HelpWidget::clicked(const TQString & _url)
}
if ( textUrl.find('@') > -1 ) {
kapp->invokeMailer(textUrl);
tdeApp->invokeMailer(textUrl);
return true;
}

4
kcontrol/kcontrol/modules.cpp
Unescape Escape View File

@ -101,7 +101,7 @@ void ConfigModule::deleteClient()
_embedStack = 0;
delete _embedFrame;
_embedFrame = 0;
kapp->syncX();
tdeApp->syncX();
if(_module)
_module->close(true);
@ -282,7 +282,7 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path)
if (p->isType(KST_KService))
{
KService *s = static_cast<KService*>(p);
if (!kapp->authorizeControlModule(s->menuId()))
if (!tdeApp->authorizeControlModule(s->menuId()))
continue;
ConfigModule *module = new ConfigModule(s);

10
kcontrol/kcontrol/proxywidget.cpp
Unescape Escape View File

@ -169,7 +169,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
TQCString replyType;
TQByteArray replyData;
if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
replyType, replyData))
if ( replyType == "TQPalette") {
TQDataStream reply( replyData, IO_ReadOnly );
@ -178,7 +178,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
setPalette(pal);
}
/* // Doesn't work ...
if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
replyType, replyData))
if ( replyType == "TQString") {
TQDataStream reply( replyData, IO_ReadOnly );
@ -187,7 +187,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
setStyle(style);
}
*/
if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
replyType, replyData))
if ( replyType == "TQFont") {
TQDataStream reply( replyData, IO_ReadOnly );
@ -273,7 +273,7 @@ void ProxyWidget::handbookClicked()
if (getuid()!=0)
emit handbookRequest();
else
kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
}
void ProxyWidget::helpClicked()
@ -281,7 +281,7 @@ void ProxyWidget::helpClicked()
if (getuid()!=0)
emit helpRequest();
else
kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
}
void ProxyWidget::defaultClicked()

6
kcontrol/kded/kcmkded.cpp
Unescape Escape View File

@ -229,7 +229,7 @@ void KDEDConfig::getServiceStatus()
TQByteArray replyData;
if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
if (!tdeApp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
replyType, replyData ) ) {
_lvLoD->setEnabled( false );
@ -310,7 +310,7 @@ void KDEDConfig::slotStartService()
TQCString replyType;
TQDataStream arg( data, IO_WriteOnly );
arg << service;
if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
if (tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
TQDataStream reply(replyData, IO_ReadOnly);
if ( replyType == "bool" )
{
@ -337,7 +337,7 @@ void KDEDConfig::slotStopService()
TQDataStream arg( data, IO_WriteOnly );
arg << service;
if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
if (tdeApp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
slotServiceRunningToggled();
}
else {

10
kcontrol/keys/keyconfig.cpp
Unescape Escape View File

@ -206,12 +206,12 @@ void KKeyModule::load()
kc->commitChanges();
actions.writeActions( KeySet, 0, true, true );
if ( KeyType == "global" ) {
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
// TODO: create a reconfigureKeys() method.
kapp->dcopClient()->send("twin", "", "reconfigure()", "");
kapp->dcopClient()->send("kdesktop", "", "configure()", "");
kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
tdeApp->dcopClient()->send("twin", "", "reconfigure()", "");
tdeApp->dcopClient()->send("kdesktop", "", "configure()", "");
tdeApp->dcopClient()->send("kicker", "Panel", "configure()", "");
}
}*/

2
kcontrol/keys/modifiers.cpp
Unescape Escape View File

@ -116,7 +116,7 @@ void ModifiersModule::save()
if( bMacSwap )
setupMacModifierKeys();
else
kapp->tdeinitExec("kxkb");
tdeApp->tdeinitExec("kxkb");
m_bMacSwapOrig = bMacSwap;
updateWidgets();
}

16
kcontrol/kicker/main.cpp
Unescape Escape View File

@ -63,10 +63,10 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
init();
kapp->dcopClient()->setNotifications(true);
tdeApp->dcopClient()->setNotifications(true);
connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)",
"jumpToPanel(TQString)", false);
kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
connect(this, TQ_SIGNAL(hidingPanelChanged(int)),
this, TQ_SLOT(setCurrentPanelIndex(int)));
@ -135,13 +135,13 @@ void KickerConfig::init()
void KickerConfig::restartKicker()
{
// Tell kicker to restart
if (!kapp->dcopClient()->isAttached())
if (!tdeApp->dcopClient()->isAttached())
{
kapp->dcopClient()->attach();
tdeApp->dcopClient()->attach();
}
TQCString appname;
appname = "kicker";
kapp->dcopClient()->send(appname, appname, "restart", TQString(""));
tdeApp->dcopClient()->send(appname, appname, "restart", TQString(""));
}
void KickerConfig::notifyKicker()
@ -151,9 +151,9 @@ void KickerConfig::notifyKicker()
emit aboutToNotifyKicker();
// Tell kicker about the new config file.
if (!kapp->dcopClient()->isAttached())
if (!tdeApp->dcopClient()->isAttached())
{
kapp->dcopClient()->attach();
tdeApp->dcopClient()->attach();
}
TQByteArray data;
@ -168,7 +168,7 @@ void KickerConfig::notifyKicker()
appname.sprintf("kicker-screen-%d", m_screenNumber);
}
kapp->dcopClient()->send(appname, appname, "configure()", data);
tdeApp->dcopClient()->send(appname, appname, "configure()", data);
}
void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)

54
kcontrol/kicker/positiontab_impl.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
/*
* set the tooltips on the buttons properly for RTL langs
*/
if (kapp->reverseLayout())
if (tdeApp->reverseLayout())
{
TQToolTip::add(locationTopRight, i18n("Top left"));
TQToolTip::add(locationTop, i18n("Top center"));
@ -229,7 +229,7 @@ void PositionTab::movePanel(int whichButton)
setPositionButtons();
return;
}
m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft;
m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft;
m_panelPos = PosTop;
}
else if (pushed == locationTop)
@ -249,38 +249,38 @@ void PositionTab::movePanel(int whichButton)
setPositionButtons();
return;
}
m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight;
m_panelPos = PosTop;
}
else if (pushed == locationLeftTop)
{
if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
{
setPositionButtons();
return;
}
m_panelAlign = AlignLeft;
m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
}
else if (pushed == locationLeft)
{
if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
{
setPositionButtons();
return;
}
m_panelAlign = AlignCenter;
m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
}
else if (pushed == locationLeftBottom)
{
if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
{
setPositionButtons();
return;
}
m_panelAlign = AlignRight;
m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
}
else if (pushed == locationBottomLeft)
{
@ -289,7 +289,7 @@ void PositionTab::movePanel(int whichButton)
setPositionButtons();
return;
}
m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft;
m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft;
m_panelPos = PosBottom;
}
else if (pushed == locationBottom)
@ -309,38 +309,38 @@ void PositionTab::movePanel(int whichButton)
setPositionButtons();
return;
}
m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight;
m_panelPos = PosBottom;
}
else if (pushed == locationRightTop)
{
if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
{
setPositionButtons();
return;
}
m_panelAlign = AlignLeft;
m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
}
else if (pushed == locationRight)
{
if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
{
setPositionButtons();
return;
}
m_panelAlign = AlignCenter;
m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
}
else if (pushed == locationRightBottom)
{
if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
{
setPositionButtons();
return;
}
m_panelAlign = AlignRight;
m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
}
lengthenPanel(-1);
@ -582,47 +582,47 @@ void PositionTab::setPositionButtons() {
if (m_panelPos == PosTop)
{
if (m_panelAlign == AlignLeft)
kapp->reverseLayout() ? locationTopRight->setOn(true) :
tdeApp->reverseLayout() ? locationTopRight->setOn(true) :
locationTopLeft->setOn(true);
else if (m_panelAlign == AlignCenter)
locationTop->setOn(true);
else // if (m_panelAlign == AlignRight
kapp->reverseLayout() ? locationTopLeft->setOn(true) :
tdeApp->reverseLayout() ? locationTopLeft->setOn(true) :
locationTopRight->setOn(true);
}
else if (m_panelPos == PosRight)
{
if (m_panelAlign == AlignLeft)
kapp->reverseLayout() ? locationLeftTop->setOn(true) :
tdeApp->reverseLayout() ? locationLeftTop->setOn(true) :
locationRightTop->setOn(true);
else if (m_panelAlign == AlignCenter)
kapp->reverseLayout() ? locationLeft->setOn(true) :
tdeApp->reverseLayout() ? locationLeft->setOn(true) :
locationRight->setOn(true);
else // if (m_panelAlign == AlignRight
kapp->reverseLayout() ? locationLeftBottom->setOn(true) :
tdeApp->reverseLayout() ? locationLeftBottom->setOn(true) :
locationRightBottom->setOn(true);
}
else if (m_panelPos == PosBottom)
{
if (m_panelAlign == AlignLeft)
kapp->reverseLayout() ? locationBottomRight->setOn(true) :
tdeApp->reverseLayout() ? locationBottomRight->setOn(true) :
locationBottomLeft->setOn(true);
else if (m_panelAlign == AlignCenter)
locationBottom->setOn(true);
else // if (m_panelAlign == AlignRight
kapp->reverseLayout() ? locationBottomLeft->setOn(true) :
tdeApp->reverseLayout() ? locationBottomLeft->setOn(true) :
locationBottomRight->setOn(true);
}
else // if (m_panelPos == PosLeft
{
if (m_panelAlign == AlignLeft)
kapp->reverseLayout() ? locationRightTop->setOn(true) :
tdeApp->reverseLayout() ? locationRightTop->setOn(true) :
locationLeftTop->setOn(true);
else if (m_panelAlign == AlignCenter)
kapp->reverseLayout() ? locationRight->setOn(true) :
tdeApp->reverseLayout() ? locationRight->setOn(true) :
locationLeft->setOn(true);
else // if (m_panelAlign == AlignRight
kapp->reverseLayout() ? locationRightBottom->setOn(true) :
tdeApp->reverseLayout() ? locationRightBottom->setOn(true) :
locationLeftBottom->setOn(true);
}

2
kcontrol/knotify/knotify.cpp
Unescape Escape View File

@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply()
save();
dataChanged = false;
enableButton(Apply, false);
kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
KDialogBase::slotApply();
}

10
kcontrol/konq/behaviour.cpp
Unescape Escape View File

@ -285,7 +285,7 @@ void KBehaviourOptions::save()
config.sync();
// Tell the running server
if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
if ( tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
{
UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
uiserver.setListMode( cbListProgress->isChecked() );
@ -293,10 +293,10 @@ void KBehaviourOptions::save()
// Send signal to konqueror
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
}
TQString KBehaviourOptions::handbookSection() const

6
kcontrol/konq/desktop.cpp
Unescape Escape View File

@ -221,11 +221,11 @@ void KDesktopConfig::save()
delete config;
// Tell kdesktop about the new config file
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
TQByteArray data;
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
emit changed(false);
}

12
kcontrol/konq/desktopbehavior_impl.cpp
Unescape Escape View File

@ -418,8 +418,8 @@ void DesktopBehavior::save()
g_pConfig->sync();
// Tell kdesktop about the new config file
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
TQByteArray data;
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@ -428,11 +428,11 @@ void DesktopBehavior::save()
appname = "kdesktop";
else
appname.sprintf("kdesktop-screen-%d", konq_screen_number);
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
// for the standalone menubar setting
kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
tdeApp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
}
void DesktopBehavior::enableChanged()

8
kcontrol/konq/fontopts.cpp
Unescape Escape View File

@ -330,9 +330,9 @@ void KonqFontOptions::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
// Tell kdesktop about the new config file
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@ -341,7 +341,7 @@ void KonqFontOptions::save()
appname = "kdesktop";
else
appname.sprintf("kdesktop-screen-%d", konq_screen_number);
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
}
TQString KonqFontOptions::handbookSection() const

6
kcontrol/konq/previews.cpp
Unescape Escape View File

@ -206,9 +206,9 @@ void KPreviewOptions::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
}
TQString KPreviewOptions::handbookSection() const

6
kcontrol/konq/rootopts.cpp
Unescape Escape View File

@ -512,8 +512,8 @@ void DesktopPathConfig::save()
}
// Tell kdesktop about the new config file
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
TQByteArray data;
int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@ -524,7 +524,7 @@ void DesktopPathConfig::save()
else {
appname.sprintf("kdesktop-screen-%d", konq_screen_number);
}
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
}
bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type )

6
kcontrol/konqhtml/appearance.cpp
Unescape Escape View File

@ -408,9 +408,9 @@ void KAppearanceOptions::save()
m_pConfig->sync();
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
emit changed(false);
}

6
kcontrol/konqhtml/htmlopts.cpp
Unescape Escape View File

@ -362,9 +362,9 @@ void KMiscHTMLOptions::save()
kdeglobals.sync();
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
emit changed(false);
}

6
kcontrol/konqhtml/main.cpp
Unescape Escape View File

@ -149,9 +149,9 @@ void KJSParts::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
}

6
kcontrol/konqhtml/pluginopts.cpp
Unescape Escape View File

@ -230,9 +230,9 @@ void KPluginOptions::save()
// instantly
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
/*****************************************************************************/

6
kcontrol/konqhtml/userInterOpts_impl.cpp
Unescape Escape View File

@ -104,9 +104,9 @@ void userInterOpts::save()
else m_pConfig->writeEntry( "MultipleTabConfirm", true );
TQByteArray data;
if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( m_pPermanentCloseButton->isChecked() )
m_pHoverCloseButton->setEnabled(false);

2
kcontrol/konsole/kcmkonsole.cpp
Unescape Escape View File

@ -165,7 +165,7 @@ void KCMKonsole::save()
emit changed(false);
DCOPClient *dcc = kapp->dcopClient();
DCOPClient *dcc = tdeApp->dcopClient();
dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
dcc->send("kdesktop", "default", "configure()", TQByteArray());
dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray());

6
kcontrol/konsole/schemaeditor.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool)));
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
client->attach();
TQByteArray data;
@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
continue;
if (!(0 <= bo && bo <= 1))
continue;
color[fi] = kapp->palette().active().text();
color[fi] = tdeApp->palette().active().text();
transparent[fi] = tr;
bold[fi] = bo;
type[fi] = 1;
@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
continue;
if (!(0 <= bo && bo <= 1))
continue;
color[fi] = kapp->palette().active().base();
color[fi] = tdeApp->palette().active().base();
transparent[fi] = tr;
bold[fi] = bo;
type[fi] = 2;

6
kcontrol/krdb/krdb.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version)
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << name << value;
kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
}
// -----------------------------------------------------------------------------
@ -168,9 +168,9 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
TQMap <TQString, bool> pathDb;
// OK, this isn't fun at all.
// KApp adds paths ending with /, QApp those without slash, and if
// TDEApp adds paths ending with /, QApp those without slash, and if
// one gives it something that is other way around, it will complain and scare
// users. So we need to know whether a path being added is from KApp, and in this case
// users. So we need to know whether a path being added is from TDEApp, and in this case
// end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified..
TQString qversion = tqVersion();

2
kcontrol/kthememanager/ktheme.cpp
Unescape Escape View File

@ -436,7 +436,7 @@ void KTheme::apply()
desktopConf.sync(); // TODO sync and signal only if <desktop> elem present
// reconfigure kdesktop. kdesktop will notify all clients
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
if ( !client->isAttached() ) {
client->attach();
}

8
kcontrol/launch/kcmlaunch.cpp
Unescape Escape View File

@ -212,11 +212,11 @@ LaunchConfig::save()
emit changed( false );
if (!kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
if (!tdeApp->dcopClient()->isAttached())
tdeApp->dcopClient()->attach();
TQByteArray data;
kapp->dcopClient()->send( "kicker", "Panel", "restart()", data );
kapp->dcopClient()->send( "kdesktop", "", "configure()", data );
tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", data );
tdeApp->dcopClient()->send( "kdesktop", "", "configure()", data );
}
void

18
kcontrol/privacy/kprivacymanager.cpp
Unescape Escape View File

@ -36,8 +36,8 @@
KPrivacyManager::KPrivacyManager()
{
if (!kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
if (!tdeApp->dcopClient()->isAttached())
tdeApp->dcopClient()->attach();
m_error = false;
}
@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails()
bool KPrivacyManager::clearRunCommandHistory() const
{
return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
}
bool KPrivacyManager::clearAllCookies() const
{
return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
}
bool KPrivacyManager::clearSavedClipboardContents()
@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
return true;
}
return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
}
bool KPrivacyManager::clearFormCompletion() const
@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const
bool KPrivacyManager::clearQuickStartMenu() const
{
return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
}
bool KPrivacyManager::clearWebHistory()
@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory()
if(!isApplicationRegistered("konqueror"))
{
kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
kapp->tdeinitExec("konqueror", args, 0,0);
tdeApp->tdeinitExec("konqueror", args, 0,0);
}
return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyClear(TQCString)", TQString("") );
}
@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData()
bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
{
QCStringList regApps = kapp->dcopClient()->registeredApplications();
QCStringList regApps = tdeApp->dcopClient()->registeredApplications();
for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it )
if((*it).find(appName.latin1()) != -1) return true;

2
kcontrol/randr/tderandrpassivepopup.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
}
}
if( x11_events )
kapp->installX11EventFilter( this );
tdeApp->installX11EventFilter( this );
}
bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )

6
kcontrol/randr/tderandrtray.cpp
Unescape Escape View File

@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
globalKeys->setEnabled(true);
globalKeys->updateConnections();
connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQ_SLOT( desktopResized()));
// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), tdeApp->desktop(), TQ_SLOT( desktopResized()));
#endif
randr_display = XOpenDisplay(NULL);
@ -924,6 +924,6 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
void KRandRSystemTray::slotHelpContents()
{
kapp->invokeHelp(TQString::null, "tderandrtray");
tdeApp->invokeHelp(TQString::null, "tderandrtray");
}

8
kcontrol/screensaver/scrnsave.cpp
Unescape Escape View File

@ -497,7 +497,7 @@ void KScreenSaver::save()
// TODO (GJ): When you changed anything, these two lines will give a segfault
// on exit. I don't know why yet.
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
client->send("kdesktop", "KScreensaverIface", "configure()", TQString(""));
mChanged = false;
@ -842,7 +842,7 @@ void KScreenSaver::slotSetup()
}
mSetupBt->setEnabled( false );
kapp->flushX();
tdeApp->flushX();
mSetupProc->start();
}
@ -886,8 +886,8 @@ void KScreenSaver::slotTest()
{
mTestWin = new TestWin();
mTestWin->setBackgroundMode(TQWidget::NoBackground);
mTestWin->setGeometry(0, 0, kapp->desktop()->width(),
kapp->desktop()->height());
mTestWin->setGeometry(0, 0, tdeApp->desktop()->width(),
tdeApp->desktop()->height());
}
mTestWin->show();

16
kcontrol/smartcard/smartcard.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
config = new TDEConfig("ksmartcardrc", false, false);
DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
DCOPClient *dc = tdeApp->dcopClient();
_ok = false;
dc->remoteInterfaces("kded", "kardsvc", &_ok);
@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
// New view items
TDEListViewItem * temp;
kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
data, rettype, retval);
(void) new TDEListViewItem(base->_readerHostsListView,
@ -217,7 +217,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
TQDataStream argATR(dataATR,IO_WriteOnly);
argATR << *_slot;
kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
tdeApp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
dataATR, rettype, retval);
@ -304,7 +304,7 @@ void KSmartcardConfig::load(bool useDefaults )
}
// We call kardsvc to retrieve the current readers
kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
tdeApp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
data, rettype, retval);
TQStringList readers;
readers.clear();
@ -337,17 +337,17 @@ if (_ok) {
// Start or stop the server as needed
if (base->enableSupport->isChecked()) {
kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
data, rettype, retval);
config->sync();
kapp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
tdeApp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
data, rettype, retval);
} else {
kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
data, rettype, retval);
}
@ -389,7 +389,7 @@ extern "C"
TQDataStream arg(data, IO_WriteOnly);
TQCString modName = "kardsvc";
arg << modName;
kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
data, rettype, retval);
}
}

2
kcontrol/smserver/kcmsmserver.cpp
Unescape Escape View File

@ -135,7 +135,7 @@ void SMServerConfig::save()
// update the k menu if necessary
TQByteArray data;
kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data );
}
void SMServerConfig::defaults()

6
kcontrol/spellchecking/spellchecking.cpp
Unescape Escape View File

@ -56,9 +56,9 @@ void KSpellCheckingConfig::save()
{
spellConfig->writeGlobalSettings();
TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
}
void KSpellCheckingConfig::defaults()

6
kcontrol/style/kcmstyle.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ extern "C"
TQByteArray properties;
TQDataStream d(properties, IO_WriteOnly);
d.setVersion( 3 ); // Qt2 apps need this.
d << kapp->palette() << TDEGlobalSettings::generalFont();
d << tdeApp->palette() << TDEGlobalSettings::generalFont();
Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
// do it for all root windows - multihead support
@ -668,12 +668,12 @@ void KCMStyle::save()
if (m_bEffectsDirty) {
KIPC::sendMessageAll(KIPC::SettingsChanged);
kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
}
//update kicker to re-used tooltips kicker parameter otherwise, it overwritted
//by style tooltips parameters.
TQByteArray data;
kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data );
// Clean up
m_bEffectsDirty = false;

10
kcontrol/taskbar/kcmtaskbar.cpp
Unescape Escape View File

@ -292,7 +292,7 @@ TaskbarConfig::~TaskbarConfig()
void TaskbarConfig::slotEditGlobalConfiguration() {
TQByteArray data;
kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
tdeApp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
}
void TaskbarConfig::processLockouts()
@ -445,7 +445,7 @@ void TaskbarConfig::load()
m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
int iconSize = m_settingsObject->iconSize();
if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
if(tdeApp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
{
m_widget->smallIcons->setChecked(false);
}
@ -457,11 +457,11 @@ void TaskbarConfig::save()
if(m_widget->smallIcons->isChecked())
{
m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small));
m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Small));
}
else
{
m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel));
m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Panel));
}
m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked());
@ -474,7 +474,7 @@ void TaskbarConfig::save()
m_settingsObject->writeConfig();
TQByteArray data;
kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
tdeApp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
}
void TaskbarConfig::defaults()

2
kcontrol/tdefontinst/viewpart/FontPreview.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
{
if(!itsCurrentUrl.isEmpty())
{
paint.setPen(kapp->palette().active().text());
paint.setPen(tdeApp->palette().active().text());
paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
}
}

12
kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
if(factory)
{
KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
itsPreview->openURL(openURL);
TQSize defSize(450, 380);
TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
show();
}
else
@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
{
TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
kapp->config()->writeEntry(CFG_SIZE_KEY, size());
kapp->config()->sync();
TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
tdeApp->config()->writeEntry(CFG_SIZE_KEY, size());
tdeApp->config()->sync();
}
void CFontViewerAppMainWindow::fileOpen()

6
kcontrol/tdeio/socks.cpp
Unescape Escape View File

@ -194,7 +194,7 @@ void KSocksConfig::libSelection()
void KSocksConfig::load()
{
TDEConfigGroup config(kapp->config(), "Socks");
TDEConfigGroup config(tdeApp->config(), "Socks");
base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false));
int id = config.readNumEntry("SOCKS_method", 1);
base->bg->setButton(id);
@ -228,7 +228,7 @@ void KSocksConfig::load()
void KSocksConfig::save()
{
TDEConfigGroup config(kapp->config(), "Socks");
TDEConfigGroup config(tdeApp->config(), "Socks");
config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true);
config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true);
config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true);
@ -241,7 +241,7 @@ void KSocksConfig::save()
}
config.writePathEntry("SOCKS_lib_path", libs, ',', true, true);
kapp->config()->sync();
tdeApp->config()->sync();
emit changed(false);
}

6
kcontrol/xinerama/kcmxinerama.cpp
Unescape Escape View File

@ -175,9 +175,9 @@ void KCMXinerama::save() {
config->writeEntry("Unmanaged", item == _displays ? -3 : item);
config->sync();
if (!kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
kapp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
if (!tdeApp->dcopClient()->isAttached())
tdeApp->dcopClient()->attach();
tdeApp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
ksplashrc->setGroup("Xinerama");
ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */);

14
kdcop/kdcopwindow.cpp
Unescape Escape View File

@ -133,7 +133,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
TQString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
TQByteArray data;
int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
int callId=tdeApp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
if(!callId)
{
@ -142,7 +142,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
TQDataStream arg(data, IO_WriteOnly);
arg << TQCString( "MainWindow" );
kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
tdeApp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
}
}
@ -163,7 +163,7 @@ DCOPBrowserApplicationItem::populate()
bool ok = false;
bool isDefault = false;
QCStringList objs = kapp->dcopClient()->remoteObjects(app_, &ok);
QCStringList objs = tdeApp->dcopClient()->remoteObjects(app_, &ok);
for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it)
{
@ -191,7 +191,7 @@ void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCStri
if(!mainWindowName.isEmpty())
{
TQByteArray data;
kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
tdeApp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
}
}
@ -245,7 +245,7 @@ DCOPBrowserInterfaceItem::populate()
bool ok = false;
QCStringList funcs = kapp->dcopClient()->remoteFunctions(app_, object_, &ok);
QCStringList funcs = tdeApp->dcopClient()->remoteFunctions(app_, object_, &ok);
for (QCStringList::ConstIterator it = funcs.begin(); it != funcs.end(); ++it)
if ((*it) != "QCStringList functions()")
@ -283,7 +283,7 @@ DCOPBrowserFunctionItem::setOpen(bool o)
KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
: TDEMainWindow(parent, name)
{
dcopClient = kapp->dcopClient();
dcopClient = tdeApp->dcopClient();
resize( 377, 480 );
statusBar()->message(i18n("Welcome to the TDE DCOP browser"));
setIcon(TDEGlobal::iconLoader()->loadIcon("enhanced_browsing", TDEIcon::NoGroup, TDEIcon::SizeSmall));
@ -797,7 +797,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
}
}
DCOPRef( fitem->app(), "MainApplication-Interface" ).call( "updateUserTimestamp", kapp->userTimestamp());
DCOPRef( fitem->app(), "MainApplication-Interface" ).call( "updateUserTimestamp", tdeApp->userTimestamp());
// Now do the DCOP call

8
kdesktop/bgmanager.cpp
Unescape Escape View File

@ -102,7 +102,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
}
#ifdef COMPOSITE
m_tPixmap = new KPixmap(kapp->desktop()->size());
m_tPixmap = new KPixmap(tdeApp->desktop()->size());
m_tPixmap->fill(TQColor(0, 0x0));
connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )),
TQ_SLOT(slotCmBackgroundChanged( bool )));
@ -130,7 +130,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
#if (TQT_VERSION-0 >= 0x030200)
connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
#endif
TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@ -1026,13 +1026,13 @@ void KBackgroundManager::desktopResized()
#ifdef COMPOSITE
if (m_tPixmap)
delete m_tPixmap;
m_tPixmap = new KPixmap(kapp->desktop()->size());
m_tPixmap = new KPixmap(tdeApp->desktop()->size());
m_tPixmap->fill(TQColor(0, 0x0));
#endif
m_Hash = 0;
if( m_pDesktop ) {
m_pDesktop->resize( kapp->desktop()->geometry().size());
m_pDesktop->resize( tdeApp->desktop()->geometry().size());
if (m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){
m_Renderer[effectiveDesktop()]->renderer(0)->changeWallpaper();
}

40
kdesktop/desktop.cpp
Unescape Escape View File

@ -71,8 +71,8 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
KRootWidget::KRootWidget() : TQObject()
{
kapp->desktop()->installEventFilter(this);
kapp->desktop()->setAcceptDrops( true );
tdeApp->desktop()->installEventFilter(this);
tdeApp->desktop()->setAcceptDrops( true );
}
bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
@ -157,8 +157,8 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setAcceptDrops(true); // WStyle_Customize seems to disable that
m_pKwinmodule = new KWinModule( this );
kapp->dcopClient()->setNotifications(true);
kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
tdeApp->dcopClient()->setNotifications(true);
tdeApp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
"KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
// Dont repaint on configuration changes during construction
@ -184,15 +184,15 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setGeometry( TQApplication::desktop()->geometry() );
lower();
connect( kapp, TQ_SIGNAL( shutDown() ),
connect( tdeApp, TQ_SIGNAL( shutDown() ),
this, TQ_SLOT( slotShutdown() ) );
connect(kapp, TQ_SIGNAL(settingsChanged(int)),
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)),
this, TQ_SLOT(slotSettingsChanged(int)));
kapp->addKipcEventMask(KIPC::SettingsChanged);
tdeApp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged);
connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
tdeApp->addKipcEventMask(KIPC::IconChanged);
connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
this, TQ_SLOT(slotDatabaseChanged()));
@ -205,7 +205,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
TQTimer::singleShot(0, this, TQ_SLOT( slotStart() ));
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
#endif
}
@ -301,7 +301,7 @@ KDesktop::initRoot()
TQCString replyType;
TQRect area;
if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
data, replyType, result, false, 2000) )
{
TQDataStream res(result, IO_ReadOnly);
@ -364,7 +364,7 @@ KDesktop::backgroundInitDone()
m_pIconView->setErasePixmap( *bg );
show();
kapp->sendPostedEvents();
tdeApp->sendPostedEvents();
}
DCOPRef r( "ksmserver", "ksmserver" );
@ -404,7 +404,7 @@ KDesktop::slotStart()
keys->readSettings();
keys->updateConnections();
connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
}
@ -504,7 +504,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
if (m_bInit)
return;
if (!kapp->authorize("run_command"))
if (!tdeApp->authorize("run_command"))
return;
// Created on demand
@ -839,7 +839,7 @@ void KDesktop::refresh()
m_bNeedRepaint |= 1;
updateWorkArea();
#endif
kapp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
tdeApp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
refreshIcons();
}
@ -907,7 +907,7 @@ void KDesktop::desktopIconsAreaChanged(const TQRect &area, int screen)
if (screen <= -2)
screen = kdesktop_screen_number;
else if (screen == -1)
screen = kapp->desktop()->primaryScreen();
screen = tdeApp->desktop()->primaryScreen();
// This is pretty broken, mixes Xinerama and non-Xinerama multihead
// and generally doesn't seem to be required anyway => ignore screen.
@ -1032,7 +1032,7 @@ void KDesktop::logout()
void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
TDEApplication::ShutdownType sdtype )
{
if( !kapp->requestShutDown( confirm, sdtype ) )
if( !tdeApp->requestShutDown( confirm, sdtype ) )
// this i18n string is also in kicker/applets/run/runapplet
KMessageBox::error( this, i18n("Could not log out properly.\nThe session manager cannot "
"be contacted. You can try to force a shutdown by pressing "
@ -1124,7 +1124,7 @@ void KDesktop::setIconsEnabled( bool enable )
void KDesktop::desktopResized()
{
resize(kapp->desktop()->size());
resize(tdeApp->desktop()->size());
if ( m_pIconView )
{
@ -1132,7 +1132,7 @@ void KDesktop::desktopResized()
// remove all icons, resize desktop, tell kdiconview new iconsArea size
// tell kdiconview to reget all icons
m_pIconView->slotClear();
m_pIconView->resize(kapp->desktop()->size());
m_pIconView->resize(tdeApp->desktop()->size());
// get new desktopIconsArea from kicker
TQByteArray data, result;
@ -1141,7 +1141,7 @@ void KDesktop::desktopResized()
TQCString replyType;
TQRect area;
if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
data, replyType, result, false, 2000) )
{
TQDataStream res(result, IO_ReadOnly);

2
kdesktop/init.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ static TQString realDesktopPath()
*/
static void copyDesktopLinks()
{
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup("General");
if (!config->readBoolEntry("CopyDesktopLinks", true))
return;

2
kdesktop/kcustommenu.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ KCustomMenu::slotActivated(int id)
KService::Ptr s = d->entryMap[id];
if (!s)
return;
kapp->startServiceByDesktopPath(s->desktopEntryPath());
tdeApp->startServiceByDesktopPath(s->desktopEntryPath());
}
// The following is copied from kicker's PanelServiceMenu

8
kdesktop/kdesktopbindings.cpp
Unescape Escape View File

@ -14,7 +14,7 @@
keys->insert( "Program:kdesktop", i18n("Desktop") );
#ifndef NOSLOTS
if (kapp->authorize("run_command"))
if (tdeApp->authorize("run_command"))
{
#endif
DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
@ -25,20 +25,20 @@
DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
#ifndef NOSLOTS
if (kapp->authorize("lock_screen"))
if (tdeApp->authorize("lock_screen"))
{
#endif
DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) );
DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) );
#ifndef NOSLOTS
}
if (kapp->authorize("start_screensaver"))
if (tdeApp->authorize("start_screensaver"))
{
#endif
DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) );
#ifndef NOSLOTS
}
if (kapp->authorize("logout"))
if (tdeApp->authorize("logout"))
{
#endif
DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );

12
kdesktop/kdiconview.cpp
Unescape Escape View File

@ -138,7 +138,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
m_bNeedSave( false ),
m_autoAlign( false ),
m_hasExistingPos( false ),
m_bEditableDesktopIcons( kapp->authorize("editable_desktop_icons") ),
m_bEditableDesktopIcons( tdeApp->authorize("editable_desktop_icons") ),
m_bShowDot( false ),
m_bVertAlign( true ),
m_dirLister( 0L ),
@ -379,7 +379,7 @@ void KDIconView::start()
// Start the directory lister !
m_dirLister->setShowingDotFiles( m_bShowDot );
kapp->allowURLAction("list", KURL(), url());
tdeApp->allowURLAction("list", KURL(), url());
startDirLister();
createActions();
}
@ -566,7 +566,7 @@ void KDIconView::startDirLister()
u.setPath( *it );
m_mergeDirs.append( u );
// And start listing this dir right now
kapp->allowURLAction("list", KURL(), u);
tdeApp->allowURLAction("list", KURL(), u);
m_dirLister->openURL( u, true );
}
configureMedia();
@ -749,7 +749,7 @@ void KDIconView::slotReturnPressed( TQIconViewItem *item )
void KDIconView::slotExecuted( TQIconViewItem *item )
{
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
m_lastDeletedIconPos = TQPoint(); // user action -> not renaming an icon
if (item) {
visualActivate(item);
@ -839,7 +839,7 @@ void KDIconView::saveMediaListView()
appname = "kdesktop";
else
appname.sprintf("kdesktop-screen-%d", konq_screen_number);
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
delete g_pConfig;
}
@ -947,7 +947,7 @@ void KDIconView::slotDelete()
// Not to be confused with the global popup-menu, KRootWm, when doing RMB on the desktop
void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items )
{
if (!kapp->authorize("action/kdesktop_rmb")) return;
if (!tdeApp->authorize("action/kdesktop_rmb")) return;
if (!m_dirLister) return;
if ( _items.count() == 1 )
m_popupURL = _items.getFirst()->url();

38
kdesktop/krootwm.cpp
Unescape Escape View File

@ -86,7 +86,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
// Creates the new menu
menuBar = 0; // no menubar yet
menuNew = 0;
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
{
menuNew = new KNewMenu( m_actionCollection, "new_menu" );
connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ),
@ -95,7 +95,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) );
}
if (kapp->authorizeTDEAction("bookmarks"))
if (tdeApp->authorizeTDEAction("bookmarks"))
{
bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
// The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
@ -132,7 +132,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
}
#endif
if (kapp->authorize("run_command"))
if (tdeApp->authorize("run_command"))
{
new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ),
@ -153,7 +153,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
m_actionCollection, "cascade" );
// arrange menu actions
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
{
new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ),
m_actionCollection, "sort_ncs");
@ -189,22 +189,22 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
m_actionCollection, "refresh" );
}
// Icons in sync with kicker
if (kapp->authorize("lock_screen"))
if (tdeApp->authorize("lock_screen"))
{
new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
if (kapp->authorize("logout"))
if (tdeApp->authorize("logout"))
{
new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
if (kapp->authorize("start_new_session") && DM().isSwitchable())
if (tdeApp->authorize("start_new_session") && DM().isSwitchable())
{
new TDEAction(i18n("Start New Session"), "fork", 0, this,
TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen"))
if (tdeApp->authorize("lock_screen"))
{
new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
@ -249,7 +249,7 @@ void KRootWm::initConfig()
// Read configuration for icons alignment
if ( m_bDesktopEnabled ) {
m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
if ( kapp->authorize( "editable_desktop_icons" ) ) {
if ( tdeApp->authorize( "editable_desktop_icons" ) ) {
m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
if (aLockIcons)
@ -464,7 +464,7 @@ void KRootWm::buildMenus()
}
int lastSep = desktopMenu->insertSeparator();
if (sessionsMenu && kapp->authorize("switch_user"))
if (sessionsMenu && tdeApp->authorize("switch_user"))
{
desktopMenu->insertItem(SmallIconSet("switchuser" ), i18n("Switch User"), sessionsMenu);
needSeparator = true;
@ -618,7 +618,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
activateMenu( middleButtonChoice, _global );
break;
case TQt::RightButton:
if (!kapp->authorize("action/kdesktop_rmb")) return;
if (!tdeApp->authorize("action/kdesktop_rmb")) return;
activateMenu( rightButtonChoice, _global );
break;
default:
@ -791,7 +791,7 @@ void KRootWm::slotConfigureDesktop() {
TQStringList modules = configModules();
for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
{
if (kapp->authorizeControlModule(*it))
if (tdeApp->authorizeControlModule(*it))
{
m_configDialog->addModule(*it);
}
@ -815,22 +815,22 @@ void KRootWm::slotToggleDesktopMenu()
KDesktopSettings::writeConfig();
TQByteArray data;
kapp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
tdeApp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
// for the standalone menubar setting
kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
tdeApp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
}
void KRootWm::slotUnclutterWindows()
{
kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
tdeApp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
}
void KRootWm::slotCascadeWindows() {
kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
tdeApp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
}
@ -840,7 +840,7 @@ void KRootWm::slotLock() {
void KRootWm::slotSave() {
kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
tdeApp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
}

4
kdesktop/kwebdesktop/kwebdesktop.cpp
Unescape Escape View File

@ -79,7 +79,7 @@ void KWebDesktopRun::slotFinished( TDEIO::Job * job )
if (job->error())
{
kdDebug() << job->errorString() << endl;
kapp->exit(1);
tdeApp->exit(1);
}
}
@ -141,7 +141,7 @@ void KWebDesktop::slotCompleted()
TQPixmap snapshot = TQPixmap::grabWidget( m_part->widget() );
snapshot.save( m_imageFile, "PNG" );
// And terminate the app.
kapp->quit();
tdeApp->quit();
}
KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )

4
kdesktop/lock/lockdlg.cpp
Unescape Escape View File

@ -244,7 +244,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser()));
if (!DM().isSwitchable() || !kapp->authorize("switch_user")) {
if (!DM().isSwitchable() || !tdeApp->authorize("switch_user")) {
mNewSessButton->hide();
}
@ -939,7 +939,7 @@ void PasswordDlg::slotSwitchUser()
vbox2->addStretch( 2 );
}
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) );
connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );

22
kdesktop/lock/lockprocess.cpp
Unescape Escape View File

@ -247,7 +247,7 @@ LockProcess::LockProcess()
kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_BLACK", False);
kapp->installX11EventFilter(this);
tdeApp->installX11EventFilter(this);
mForceContinualLockDisplayTimer = new TQTimer( this );
mHackDelayStartupTimer = new TQTimer( this );
@ -413,7 +413,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
#endif
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
#endif
if (!trinity_desktop_lock_use_system_modal_dialogs) {
@ -622,7 +622,7 @@ void LockProcess::quitSaver()
return;
}
stopSaver();
kapp->quit();
tdeApp->quit();
}
//---------------------------------------------------------------------------
@ -650,7 +650,7 @@ void LockProcess::startSecureDialog()
mInSecureDialog = false;
if (ret == 0) {
mClosingWindows = 1;
kapp->quit();
tdeApp->quit();
}
if (ret == 1) {
// In case of a forced lock we don't react to events during
@ -699,12 +699,12 @@ void LockProcess::startSecureDialog()
if (system("ksysguard &") == -1) {
// Error handler to shut up gcc warnings
}
kapp->quit();
tdeApp->quit();
}
if (ret == 3) {
mClosingWindows = 1;
DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
kapp->quit();
tdeApp->quit();
}
// FIXME
// Handle remaining case (switch user)
@ -798,8 +798,8 @@ void LockProcess::readSaver()
if (!mSaver.isEmpty()) {
TQString file = locate("scrsav", mSaver);
bool opengl = kapp->authorize("opengl_screensavers");
bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
bool opengl = tdeApp->authorize("opengl_screensavers");
bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers");
KDesktopFile config(file, true);
if (config.readEntry("X-TDE-Type").utf8() != 0) {
TQString saverType = config.readEntry("X-TDE-Type").utf8();
@ -1799,7 +1799,7 @@ void LockProcess::displayLockDialogIfNeeded()
if (checkPass()) {
mClosingWindows = true;
stopSaver();
kapp->quit();
tdeApp->quit();
}
}
mBusy = false;
@ -2207,7 +2207,7 @@ bool LockProcess::x11Event(XEvent *event)
}
if ((!mLocked) && (!mInSecureDialog)) {
stopSaver();
kapp->quit();
tdeApp->quit();
}
if (mAutoLogout) {
// we need to restart the auto logout countdown
@ -2219,7 +2219,7 @@ bool LockProcess::x11Event(XEvent *event)
if (!mLocked || checkPass()) {
mClosingWindows = true;
stopSaver();
kapp->quit();
tdeApp->quit();
}
else if (mAutoLogout) {
// we need to restart the auto logout countdown

8
kdesktop/lockeng.cpp
Unescape Escape View File

@ -333,7 +333,7 @@ void SaverEngine::lockScreen(bool DCOP)
if( ok && mState != Saving )
{
if (DCOP) {
DCOPClientTransaction* trans = kapp->dcopClient()->beginTransaction();
DCOPClientTransaction* trans = tdeApp->dcopClient()->beginTransaction();
if (trans) {
mLockTransactions.append( trans );
}
@ -354,7 +354,7 @@ void SaverEngine::processLockTransactions()
{
TQCString replyType = "void";
TQByteArray arr;
kapp->dcopClient()->endTransaction( *it, replyType, arr );
tdeApp->dcopClient()->endTransaction( *it, replyType, arr );
}
mLockTransactions.clear();
}
@ -447,7 +447,7 @@ void SaverEngine::enableExports()
{
#ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n";
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached()) {
client->attach();
}
@ -675,7 +675,7 @@ void SaverEngine::recoverFromHackingAttempt()
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << (int)0 << (int)0 << (int)2;
if (!kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
if (!tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
// Someone got to DCOP before we did
// Try an emergency system logout
system("logout");

6
kdesktop/main.cpp
Unescape Escape View File

@ -94,8 +94,8 @@ static void signalHandler(int sigId)
// try to cleanup all windows
signal(SIGTERM, SIG_DFL); // next one kills
signal(SIGHUP, SIG_DFL); // next one kills
if (kapp)
kapp->quit(); // turn catchable signals into clean shutdown
if (tdeApp)
tdeApp->quit(); // turn catchable signals into clean shutdown
}
void KDesktop::slotUpAndRunning()
@ -273,7 +273,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
// Mark kdeskop as immutable if all of its config modules have been disabled
if (!myApp->config()->isImmutable() &&
kapp->authorizeControlModules(KRootWm::configModules()).isEmpty())
tdeApp->authorizeControlModules(KRootWm::configModules()).isEmpty())
{
myApp->config()->setReadOnly(true);
myApp->config()->reparseConfiguration();

14
kdesktop/minicli.cpp
Unescape Escape View File

@ -101,7 +101,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
// Cancel button...
m_dlg->pbCancel->setGuiItem ( KStdGuiItem::cancel() );
if (!kapp->authorize("shell_access"))
if (!tdeApp->authorize("shell_access"))
m_dlg->pbOptions->hide();
m_dlg->pbRun->setEnabled(!m_dlg->cbCommand->currentText().isEmpty());
@ -317,8 +317,8 @@ void Minicli::accept()
if ( logout )
{
kapp->propagateSessionManager();
kapp->requestShutDown();
tdeApp->propagateSessionManager();
tdeApp->requestShutDown();
}
if ( lock )
{
@ -326,7 +326,7 @@ void Minicli::accept()
int kicker_screen_number = tqt_xscreen();
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
}
@ -437,7 +437,7 @@ int Minicli::runCommand()
kdDebug (1207) << "Use terminal ? " << useTerminal << endl;
if (!kapp->authorize("shell_access"))
if (!tdeApp->authorize("shell_access"))
useTerminal = false;
if( needsTDEsu() )
@ -585,7 +585,7 @@ int Minicli::runCommand()
// fall-through to shell case
case KURIFilterData::SHELL:
{
if (kapp->authorize("shell_access"))
if (tdeApp->authorize("shell_access"))
{
exec = cmd;
@ -651,7 +651,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
}

2
kdesktop/pixmapserver.cpp
Unescape Escape View File

@ -39,7 +39,7 @@
KPixmapServer::KPixmapServer()
: TQWidget(0L, "shpixmap comm window")
{
kapp->installX11EventFilter(this);
tdeApp->installX11EventFilter(this);
pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false);
}

4
kdesktop/startupid.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ StartupId::StartupId( TQWidget* parent, const char* name )
XWindowAttributes attrs;
XGetWindowAttributes( tqt_xdisplay(), tqt_xrootwin(), &attrs);
XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
kapp->installX11EventFilter( this );
tdeApp->installX11EventFilter( this );
}
connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid()));
connect( &startup_info,
@ -140,7 +140,7 @@ bool StartupId::x11Event( XEvent* e )
void StartupId::finishKDEStartup()
{
kde_startup_status = StartupDone;
kapp->removeX11EventFilter( this );
tdeApp->removeX11EventFilter( this );
if( startups.count() == 0 )
stop_startupid();
}

2
kdesktop/xautolock.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ XAutoLock::XAutoLock()
#endif
if( !xautolock_useXidle && !xautolock_useMit )
{
kapp->installX11EventFilter( this );
tdeApp->installX11EventFilter( this );
int (*oldHandler)(Display *, XErrorEvent *);
oldHandler = XSetErrorHandler(catchFalseAlarms);
XSync(tqt_xdisplay(), False );

20
kdialog/kdialog.cpp
Unescape Escape View File

@ -313,15 +313,15 @@ static int directCommand(TDECmdLineArgs *args)
0, // name
duration );
TQTimer *timer = new TQTimer();
TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) );
TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
TQObject::connect( timer, TQ_SIGNAL( timeout() ), tdeApp, TQ_SLOT( quit() ) );
TQObject::connect( popup, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
timer->start( duration, TRUE );
#ifdef TQ_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) {
if ( ! tdeApp->geometryArgument().isEmpty()) {
int x, y;
int w, h;
int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
if ( (m & XNegative) )
x = TDEApplication::desktop()->width() + x - w;
if ( (m & YNegative) )
@ -329,7 +329,7 @@ static int directCommand(TDECmdLineArgs *args)
popup->setAnchor( TQPoint(x, y) );
}
#endif
kapp->exec();
tdeApp->exec();
return 0;
}
@ -469,7 +469,7 @@ static int directCommand(TDECmdLineArgs *args)
dlg.setMode(KFile::File | KFile::LocalOnly);
}
Widgets::handleXGeometry(&dlg);
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setCaption(title.isNull() ? i18n("Open") : title);
dlg.exec();
@ -510,7 +510,7 @@ static int directCommand(TDECmdLineArgs *args)
dlg.setSelection( startDir );
dlg.setOperationMode( KFileDialog::Saving );
Widgets::handleXGeometry(&dlg);
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setCaption(title.isNull() ? i18n("Save As") : title);
dlg.exec();
@ -545,7 +545,7 @@ static int directCommand(TDECmdLineArgs *args)
KDirSelectDialog myDialog( startDir, true, 0,
"kdirselect dialog", true );
kapp->setTopWidget( &myDialog );
tdeApp->setTopWidget( &myDialog );
Widgets::handleXGeometry(&myDialog);
if ( !title.isNull() )
@ -581,7 +581,7 @@ static int directCommand(TDECmdLineArgs *args)
dlg.setMode(KFile::File);
}
Widgets::handleXGeometry(&dlg);
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setCaption(title.isNull() ? i18n("Open") : title);
dlg.exec();
@ -649,7 +649,7 @@ static int directCommand(TDECmdLineArgs *args)
context = TDEIcon::StatusIcon;
TDEIconDialog dlg(0, "icon dialog");
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setup( group, context);
if (!title.isNull())
dlg.setCaption(title);

20
kdialog/widgets.cpp
Unescape Escape View File

@ -42,10 +42,10 @@
void Widgets::handleXGeometry(TQWidget * dlg)
{
#ifdef TQ_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) {
if ( ! tdeApp->geometryArgument().isEmpty()) {
int x, y;
int w, h;
int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
if ( (m & XNegative) )
x = TDEApplication::desktop()->width() + x - w;
if ( (m & YNegative) )
@ -69,7 +69,7 @@ bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQStrin
{
KPasswordDialog dlg( KPasswordDialog::Password, false, 0, parent );
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setCaption(title);
dlg.setPrompt(text);
@ -86,7 +86,7 @@ int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& ti
// KTextBox dlg(parent, 0, TRUE, width, height, file);
KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
KTextEdit *edit = new KTextEdit( dlg.makeVBoxMainWidget() );
edit->setReadOnly(TRUE);
@ -119,7 +119,7 @@ int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQStrin
// KTextBox dlg(parent, 0, TRUE, width, height, file);
KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
TQVBox* vbox = dlg.makeVBoxMainWidget();
if( args.count() > 0 )
@ -152,7 +152,7 @@ bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString&
KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok|KDialogBase::Cancel,
KDialogBase::Ok );
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setCaption(title);
TQVBox* vbox = dlg.makeVBoxMainWidget();
@ -177,7 +177,7 @@ bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& t
{
TDEListBoxDialog box(text,parent);
kapp->setTopWidget( &box );
tdeApp->setTopWidget( &box );
box.setCaption(title);
for (unsigned int i = 0; i+1<args.count(); i += 2) {
@ -205,7 +205,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
TQListBox &table = box.getTable();
kapp->setTopWidget( &box );
tdeApp->setTopWidget( &box );
box.setCaption(title);
for (unsigned int i=0; i+2<args.count(); i += 3) {
@ -249,7 +249,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
TQListBox &table = box.getTable();
kapp->setTopWidget( &box );
tdeApp->setTopWidget( &box );
box.setCaption(title);
for (unsigned int i=0; i+2<args.count(); i += 3) {
@ -274,7 +274,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
bool Widgets::progressBar(TQWidget *parent, const TQString& title, const TQString& text, int totalSteps)
{
ProgressDialog dlg( parent, title, text, totalSteps );
kapp->setTopWidget( &dlg );
tdeApp->setTopWidget( &dlg );
dlg.setCaption( title );
handleXGeometry(&dlg);
dlg.exec();

2
kfind/kfwin.cpp
Unescape Escape View File

@ -178,7 +178,7 @@ void KfindWindow::copySelection()
if (drag_obj)
{
TQClipboard *cb = kapp->clipboard();
TQClipboard *cb = tdeApp->clipboard();
cb->setData(drag_obj);
}
}

2
kfind/kquery.cpp
Unescape Escape View File

@ -384,7 +384,7 @@ void KQuery::processQuery( KFileItem* file)
return;
}
}
kapp->processEvents();
tdeApp->processEvents();
}
delete stream;

4
khelpcenter/fontdialog.cpp
Unescape Escape View File

@ -148,7 +148,7 @@ void FontDialog::setupFontEncodingBox()
void FontDialog::load()
{
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
{
TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" );
@ -178,7 +178,7 @@ void FontDialog::load()
void FontDialog::save()
{
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
{
TDEConfigGroupSaver groupSaver( cfg, "General" );
cfg->writeEntry( "UseKonqSettings", false );

6
khelpcenter/glossary.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
m_config = kapp->config();
m_config = tdeApp->config();
m_config->setGroup( "Glossary" );
}
@ -142,7 +142,7 @@ int Glossary::glossaryCTime() const
void Glossary::rebuildGlossaryCache()
{
TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc )
m_status = CacheOk;
TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 );

4
khelpcenter/history.cpp
Unescape Escape View File

@ -256,7 +256,7 @@ void History::fillForwardMenu()
void History::fillGoMenu()
{
TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
if ( !goMenu || m_goMenuIndex == -1 )
return;
@ -289,7 +289,7 @@ void History::fillGoMenu()
void History::goMenuActivated( int id )
{
TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
if ( !goMenu )
return;

30
khelpcenter/htmlsearch/htmlsearch.cpp
Unescape Escape View File

@ -22,7 +22,7 @@ HTMLSearch::HTMLSearch()
TQString HTMLSearch::dataPath(const TQString& _lang)
{
return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
return tdeApp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
}
@ -56,7 +56,7 @@ void HTMLSearch::scanDir(const TQString& dir)
if (*it != "." && *it != "..")
{
scanDir(dir + *it + "/");
kapp->processEvents();
tdeApp->processEvents();
}
}
@ -74,7 +74,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
// add KDE help dirs
if (config->readBoolEntry("KDE", true))
dirs = kapp->dirs()->findDirs("html", _lang + "/");
dirs = tdeApp->dirs()->findDirs("html", _lang + "/");
kdDebug() << "got " << dirs.count() << " dirs\n";
// TODO: Man and Info!!
@ -232,7 +232,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// create progress dialog
progress = new ProgressDialog(parent);
progress->show();
kapp->processEvents();
tdeApp->processEvents();
// create files list ----------------------------------------------
if (!saveFilesList(_lang))
@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// run htdig ------------------------------------------------------
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
TDEConfigGroupSaver saver(config, "htdig");
TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
TQString exe = config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig"));
if (exe.isEmpty())
{
@ -310,7 +310,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// execute htdig
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
kapp->enter_loop();
tdeApp->enter_loop();
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{
@ -322,13 +322,13 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// _filesDigged += CHUNK_SIZE;
progress->setFilesDigged(_filesDigged);
kapp->processEvents();
tdeApp->processEvents();
}
progress->setState(2);
// run htmerge -----------------------------------------------------
exe = config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge"));
exe = config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge"));
if (exe.isEmpty())
{
delete config;
@ -347,7 +347,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
tdeApp->enter_loop();
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{
@ -360,7 +360,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
delete _proc;
progress->setState(3);
kapp->processEvents();
tdeApp->processEvents();
delete progress;
delete config;
@ -393,7 +393,7 @@ void HTMLSearch::htdigExited(TDEProcess *p)
{
kdDebug() << "htdig terminated " << p->exitStatus() << endl;
_htdigRunning = false;
kapp->exit_loop();
tdeApp->exit_loop();
}
@ -401,7 +401,7 @@ void HTMLSearch::htmergeExited(TDEProcess *)
{
kdDebug() << "htmerge terminated" << endl;
_htmergeRunning = false;
kapp->exit_loop();
tdeApp->exit_loop();
}
@ -415,7 +415,7 @@ void HTMLSearch::htsearchExited(TDEProcess *)
{
kdDebug() << "htsearch terminated" << endl;
_htsearchRunning = false;
kapp->exit_loop();
tdeApp->exit_loop();
}
@ -432,7 +432,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
// run htsearch ----------------------------------------------------
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
TDEConfigGroupSaver saver(config, "htdig");
TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
TQString exe = config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch"));
if (exe.isEmpty())
{
delete config;
@ -454,7 +454,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
tdeApp->enter_loop();
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{

16
khelpcenter/htmlsearch/kcmhtmlsearch.cpp
Unescape Escape View File

@ -256,9 +256,9 @@ void TDEHTMLSearchConfig::load()
TDEConfig *config = new TDEConfig("khelpcenterrc", true);
config->setGroup("htdig");
htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge")));
htdigBin->lineEdit()->setText(config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig")));
htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge")));
config->setGroup("Scope");
indexKDE->setChecked(config->readBoolEntry("KDE", true));
@ -310,9 +310,9 @@ void TDEHTMLSearchConfig::save()
void TDEHTMLSearchConfig::defaults()
{
htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
htmergeBin->lineEdit()->setText(kapp->dirs()->findExe("htmerge"));
htdigBin->lineEdit()->setText(tdeApp->dirs()->findExe("htdig"));
htsearchBin->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
htmergeBin->lineEdit()->setText(tdeApp->dirs()->findExe("htmerge"));
indexKDE->setChecked(true);
indexMan->setChecked(false);
@ -328,7 +328,7 @@ void TDEHTMLSearchConfig::defaults()
void TDEHTMLSearchConfig::urlClicked(const TQString &url)
{
kapp->invokeBrowser(url);
tdeApp->invokeBrowser(url);
}
@ -336,7 +336,7 @@ void TDEHTMLSearchConfig::generateIndex()
{
save();
TQString exe = kapp->dirs()->findExe("tdehtmlindex");
TQString exe = tdeApp->dirs()->findExe("tdehtmlindex");
if (exe.isEmpty())
return;

6
khelpcenter/htmlsearchconfig.cpp
Unescape Escape View File

@ -121,7 +121,7 @@ void HtmlSearchConfig::load( TDEConfig *config )
{
config->setGroup("htdig");
mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
mIndexerBin->lineEdit()->setText(config->readPathEntry("indexer"));
mDbDir->lineEdit()->setText(config->readPathEntry("dbdir", "/opt/www/htdig/db/" ) );
}
@ -137,14 +137,14 @@ void HtmlSearchConfig::save( TDEConfig *config )
void HtmlSearchConfig::defaults()
{
mHtsearchUrl->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
mHtsearchUrl->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
mIndexerBin->lineEdit()->setText("");
mDbDir->lineEdit()->setText("/opt/www/htdig/db/" );
}
void HtmlSearchConfig::urlClicked(const TQString &url)
{
kapp->invokeBrowser(url);
tdeApp->invokeBrowser(url);
}
} // End namespace KHC

2
khelpcenter/infotree.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ void InfoTree::build( NavigatorItem *parent )
m_categoryItem = new NavigatorItem( entry, parent );
m_categoryItem->setAutoDeleteDocEntry( true );
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
cfg->setGroup( "Info pages" );
TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
// Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf

4
khelpcenter/kcmhelpcenter.cpp
Unescape Escape View File

@ -240,12 +240,12 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
load();
bool success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
bool success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
0, "buildIndexProgress()", "kcmhelpcenter",
"slotIndexProgress()", false );
if ( !success ) kdError() << "connect DCOP signal failed" << endl;
success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
0, "buildIndexError(TQString)", "kcmhelpcenter",
"slotIndexError(TQString)", false );
if ( !success ) kdError() << "connect DCOP signal failed" << endl;

6
khelpcenter/khc_indexbuilder.cpp
Unescape Escape View File

@ -143,21 +143,21 @@ void IndexBuilder::sendErrorSignal( const TQString &error )
TQByteArray params;
TQDataStream stream( params, IO_WriteOnly );
stream << error;
kapp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );
tdeApp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );
}
void IndexBuilder::sendProgressSignal()
{
kdDebug(1402) << "IndexBuilder::sendProgressSignal()" << endl;
kapp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );
tdeApp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );
}
void IndexBuilder::quit()
{
kdDebug(1402) << "IndexBuilder::quit()" << endl;
kapp->quit();
tdeApp->quit();
}

4
khelpcenter/mainwindow.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ MainWindow::MainWindow()
mSplitter->setSizes(sizes);
setGeometry(366, 0, 800, 600);
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
{
TDEConfigGroupSaver groupSaver( cfg, "General" );
if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
@ -447,7 +447,7 @@ void MainWindow::updateZoomActions()
actionCollection()->action( "incFontSizes" )->setEnabled( mDoc->zoomFactor() + mDoc->zoomStepping() <= 300 );
actionCollection()->action( "decFontSizes" )->setEnabled( mDoc->zoomFactor() - mDoc->zoomStepping() >= 20 );
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
{
TDEConfigGroupSaver groupSaver( cfg, "General" );
cfg->writeEntry( "Font zoom factor", mDoc->zoomFactor() );

2
khelpcenter/navigator.cpp
Unescape Escape View File

@ -80,7 +80,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
: TQWidget( parent, name ), mIndexDialog( 0 ),
mView( view ), mSelected( false )
{
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup("General");
mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);

2
khelpcenter/plugintraverser.cpp
Unescape Escape View File

@ -73,7 +73,7 @@ void PluginTraverser::process( DocEntry *entry )
appItem = new NavigatorAppItem( entry, mListView, mCurrentItem );
else
appItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem );
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
cfg->setGroup( "General" );
appItem->setRelpath( cfg->readPathEntry( "AppsRoot" ) );
mCurrentItem = appItem;

2
khelpcenter/scrollkeepertreebuilder.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char *
void ScrollKeeperTreeBuilder::loadConfig()
{
TDEConfig *cfg = kapp->config();
TDEConfig *cfg = tdeApp->config();
{
TDEConfigGroupSaver groupSaver( cfg, "ScrollKeeper" );
mShowEmptyDirs = cfg->readBoolEntry( "ShowEmptyDirs", false );

2
khelpcenter/searchengine.cpp
Unescape Escape View File

@ -366,7 +366,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
while (mSearchRunning && mProc->isRunning())
kapp->processEvents();
tdeApp->processEvents();
if ( !mProc->normalExit() || mProc->exitStatus() != 0 ) {
kdError() << "Unable to run search program '" << commonSearchProgram

4
khelpcenter/view.cpp
Unescape Escape View File

@ -62,7 +62,7 @@ View::~View()
void View::copySelectedText()
{
kapp->clipboard()->setText( selectedText() );
tdeApp->clipboard()->setText( selectedText() );
}
bool View::openURL( const KURL &url )
@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
void View::slotReload( const KURL &url )
{
const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
const_cast<TDEHTMLSettings *>( settings() )->init( tdeApp->config() );
KParts::URLArgs args = browserExtension()->urlArgs();
args.reload = true;
browserExtension()->setURLArgs( args );

2
khotkeys/TODO
Unescape Escape View File

@ -11,7 +11,7 @@ SOON :
pri modify gestures vymazat stav
nektere simple akce by mely mit i conditions (nebo alespon jedno okno)
QPtrList -> QValueList
pouzit Q/KApp( nogui ? ) v daemonu ?
pouzit Q/TDEApp( nogui ? ) v daemonu ?
class Condition + tab 'Windows' -> 'Conditions'
- asi rozdelit Command/URL na Command/URL a SwitchToWindow
- nebo udelat, ze Command_url_action_data ( atd. ) maji jen jednu shortcut a tak, tj. dalsi zjednoduseni UI ?

2
khotkeys/app/app.cpp
Unescape Escape View File

@ -78,7 +78,7 @@ void KHotKeysApp::reread_configuration()
void KHotKeysApp::quit()
{
kapp->quit();
tdeApp->quit();
}
} // namespace KHotKeys

2
khotkeys/app/kded.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ TDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
{
// Check if khotkeys is already running as a stand alone application.
// In such case just exit.
if (kapp->dcopClient()->isApplicationRegistered("khotkeys"))
if (tdeApp->dcopClient()->isApplicationRegistered("khotkeys"))
{
kdWarning(1217) << "khotkeys [kded module] is already running as a standalone application. Exiting." << endl;
return nullptr;

8
khotkeys/kcontrol/kcmkhotkeys.cpp
Unescape Escape View File

@ -122,18 +122,18 @@ void Module::save()
tab_widget->save_current_action_changes();
settings.actions = _actions_root;
settings.write_settings();
if(kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
// khotkeys running as a standalone application
TQByteArray data;
kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
kapp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
}
else
{
TQCString replyType;
TQByteArray replyData;
if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
TQByteArray(), replyType, replyData))
{
if (replyType == "QCStringList")
@ -146,7 +146,7 @@ void Module::save()
// khotkeys running as a kded service
TQByteArray data;
kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
kapp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
}
}
}

12
khotkeys/kcontrol/menuedit.cpp
Unescape Escape View File

@ -189,20 +189,20 @@ KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P )
void khotkeys_send_reread_config()
{
TQByteArray data;
if( !kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
if(kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
if( !tdeApp->dcopClient()->isAttached())
tdeApp->dcopClient()->attach();
if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
// khotkeys running as a standalone application
TQByteArray data;
kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
kapp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
}
else
{
TQCString replyType;
TQByteArray replyData;
if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
TQByteArray(), replyType, replyData))
{
if (replyType == "QCStringList")
@ -215,7 +215,7 @@ void khotkeys_send_reread_config()
// khotkeys running as a kded service
TQByteArray data;
kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
kapp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
}
}
}

6
khotkeys/kcontrol/windowselector.cpp
Unescape Escape View File

@ -34,15 +34,15 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
void WindowSelector::select()
{
kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
kapp->installX11EventFilter( this );
tdeApp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
tdeApp->installX11EventFilter( this );
}
bool WindowSelector::x11Event( XEvent* e )
{
if( e->type != ButtonPress )
return false;
kapp->desktop()->releaseMouse();
tdeApp->desktop()->releaseMouse();
if( e->xbutton.button == Button1 )
{
WId window = findRealWindow( e->xbutton.subwindow );

6
khotkeys/shared/actions.cpp
Unescape Escape View File

@ -124,7 +124,7 @@ void Command_url_action::execute()
static bool sm_ready = false;
if( !sm_ready )
{
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
sm_ready = true;
}
// int space_pos = command_url().find( ' ' );
@ -149,7 +149,7 @@ void Command_url_action::execute()
}
case KURIFilterData::EXECUTABLE:
{
if (!kapp->authorize("shell_access"))
if (!tdeApp->authorize("shell_access"))
return;
if( !uri.hasArgsAndOptions())
{
@ -167,7 +167,7 @@ void Command_url_action::execute()
}
case KURIFilterData::SHELL:
{
if (!kapp->authorize("shell_access"))
if (!tdeApp->authorize("shell_access"))
return;
if( !KRun::runCommand(
cmd + ( uri.hasArgsAndOptions() ? uri.argsAndOptions() : "" ),

6
khotkeys/shared/gestures.cpp
Unescape Escape View File

@ -86,15 +86,15 @@ void Gesture::update_grab()
if( _enabled && handlers.count() > 0
&& ( exclude == NULL || !exclude->match( Window_data( windows_handler->active_window()))))
{
kapp->removeX11EventFilter( this ); // avoid being installed twice
kapp->installX11EventFilter( this );
tdeApp->removeX11EventFilter( this ); // avoid being installed twice
tdeApp->installX11EventFilter( this );
// CHECKME at se grabuje jen kdyz je alespon jedno gesto?
grab_mouse( true );
}
else
{
grab_mouse( false );
kapp->removeX11EventFilter( this );
tdeApp->removeX11EventFilter( this );
}
}

2
khotkeys/update/update.cpp
Unescape Escape View File

@ -57,6 +57,6 @@ int main( int argc, char* argv[] )
}
settings.write_settings();
TQByteArray data;
kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
tdeApp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
return 0;
}

8
kicker/applets/clock/clock.cpp
Unescape Escape View File

@ -919,12 +919,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout()));
connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()));
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
reconfigure(); // initialize clock widget
slotUpdate();
if (kapp->authorizeTDEAction("kicker_rmb"))
if (tdeApp->authorizeTDEAction("kicker_rmb"))
{
menu = new TDEPopupMenu();
connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar()
void ClockApplet::openContextMenu()
{
if (!menu || !kapp->authorizeTDEAction("kicker_rmb"))
if (!menu || !tdeApp->authorizeTDEAction("kicker_rmb"))
return;
menu->exec( TQCursor::pos() );
@ -1585,7 +1585,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertItem(i18n("&Type"), type_menu, 101, 1);
menu->insertItem(i18n("Show Time&zone"), zoneMenu, 110, 2);
if (kapp->authorize("user/root"))
if (tdeApp->authorize("user/root"))
{
menu->insertItem(SmallIcon("date"), i18n("&Adjust Date && Time..."), 103, 4);
}

2
kicker/applets/launcher/quickbutton.cpp
Unescape Escape View File

@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u)
}
void QuickURL::run() const
{ kapp->propagateSessionManager(); // is this needed?
{ tdeApp->propagateSessionManager(); // is this needed?
if (_service)
KRun::run(*(_service), KURL::List());
else

16
kicker/applets/lockout/lockout.cpp
Unescape Escape View File

@ -88,19 +88,19 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
lockButton->installEventFilter( this );
logoutButton->installEventFilter( this );
if (!kapp->authorize("lock_screen"))
if (!tdeApp->authorize("lock_screen"))
lockButton->hide();
if (!kapp->authorize("logout"))
if (!tdeApp->authorize("logout"))
logoutButton->hide();
lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
if ( !tdeApp->dcopClient()->isAttached() )
tdeApp->dcopClient()->attach();
connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
}
Lockout::~Lockout()
@ -146,12 +146,12 @@ void Lockout::lock()
int kicker_screen_number = tqt_xscreen();
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
void Lockout::logout()
{
kapp->requestShutDown();
tdeApp->requestShutDown();
}
void Lockout::mousePressEvent(TQMouseEvent* e)
@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e)
bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{
if (!kapp->authorizeTDEAction("kicker_rmb"))
if (!tdeApp->authorizeTDEAction("kicker_rmb"))
return false; // Process event normally:
if( e->type() == TQEvent::MouseButtonPress )

2
kicker/applets/menu/menuapplet.cpp
Unescape Escape View File

@ -89,7 +89,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )
setBackgroundOrigin(AncestorOrigin);
dcopclient.registerAs( "menuapplet", false );
// toolbarAppearanceChanged(int) is sent when changing macstyle
connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
this, TQ_SLOT( readSettings()));
claimSelection();
readSettings();

12
kicker/applets/minipager/pagerapplet.cpp
Unescape Escape View File

@ -141,9 +141,9 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
{
m_contextMenu = new TQPopupMenu();
connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
@ -799,7 +799,7 @@ void KMiniPager::contextMenuActivated(int result)
return;
case ConfigureDesktops:
kapp->startServiceByDesktopName("desktop");
tdeApp->startServiceByDesktopName("desktop");
return;
case RenameDesktop:
@ -883,7 +883,7 @@ void KMiniPager::slotDesktopNamesChanged()
void KMiniPager::showPager()
{
DCOPClient *dcop=kapp->dcopClient();
DCOPClient *dcop=tdeApp->dcopClient();
if (dcop->isApplicationRegistered("kpager"))
{
@ -922,7 +922,7 @@ void KMiniPager::showKPager(bool toggleShow)
pt=mapToGlobal( TQPoint(x(), y()) );
}
DCOPClient *dcop=kapp->dcopClient();
DCOPClient *dcop=tdeApp->dcopClient();
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
@ -941,7 +941,7 @@ void KMiniPager::applicationRegistered( const TQCString & appName )
{
if (appName == "kpager")
{
disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
this, TQ_SLOT(applicationRegistered(const TQCString &)) );
showKPager(false);
}

2
kicker/applets/minipager/pagerbutton.cpp
Unescape Escape View File

@ -213,7 +213,7 @@ void KMiniPagerButton::loadBgPixmap()
if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive)
return; // not needed
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
{
client->attach();

4
kicker/applets/run/runapplet.cpp
Unescape Escape View File

@ -209,7 +209,7 @@ void RunApplet::run_command(const TQString& command)
TQString exec;
bool focusNeeded = false;
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
_filterData->setData( _input->currentText().stripWhiteSpace() );
TQStringList filters;
@ -230,7 +230,7 @@ void RunApplet::run_command(const TQString& command)
}
else if (cmd == "logout")
{
bool shutdown = kapp->requestShutDown();
bool shutdown = tdeApp->requestShutDown();
if( !shutdown )
{
// This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ?

4
kicker/applets/swallow/swallow.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ void SwallowApplet::createApps( SwallowCommandList* list )
TQ_SLOT( embedded(SwallowApp *)));
appList->append( app );
++it;
kapp->processEvents();
tdeApp->processEvents();
}
m_layout->activate();
@ -287,7 +287,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
// move window out of sight
// *process << "-geometry";
// *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
// *process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height());
connect(process, TQ_SIGNAL(processExited(TDEProcess*)),
this, TQ_SLOT(processExited(TDEProcess*)));

6
kicker/applets/systemtray/systemtrayapplet.cpp
Unescape Escape View File

@ -106,9 +106,9 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
twin_module = new KWinModule(this);
// kApplication notifies us of settings changes. added to support
// tdeApp notifies us of settings changes. added to support
// disabling of frame effect on mouse hover
kapp->dcopClient()->setNotifications(true);
tdeApp->dcopClient()->setNotifications(true);
connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false);
TQTimer::singleShot(0, this, TQ_SLOT(initialize()));
@ -682,7 +682,7 @@ void SystemTrayApplet::refreshExpandButton()
if (orientation() == TQt::Vertical)
a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
else
a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
a = (m_showHidden ^ tdeApp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
m_expandButton->setArrowType(a);
}

2
kicker/applets/taskbar/taskbarapplet.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ extern "C"
// FIXME: what about two taskbars? perhaps this should be inserted just once
TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
int options = 0;
if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
options = KPanelApplet::Preferences;
TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch,
options, parent, "ktaskbarapplet" );

2
kicker/extensions/kasbar/ChangeLog
Unescape Escape View File

@ -634,7 +634,7 @@
2002-05-14 Tuesday 10:31 gioele
* kapp.h -> tdeapplication.h
* tdeApp.h -> tdeapplication.h
2002-04-23 Tuesday 14:02 binner

2
kicker/extensions/kasbar/kasbarapp.cpp
Unescape Escape View File

@ -116,7 +116,7 @@ int main( int argc, char **argv )
KWin::setOnAllDesktops( kasbar->winId(), true );
kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;
TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
tdeApp->dcopClient()->registerAs( "kasbar" );
app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );

2
kicker/extensions/kasbar/kasbarextension.cpp
Unescape Escape View File

@ -92,7 +92,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
detached_( false )
{
kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl;
// TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
// tdeApp->dcopClient()->registerAs( "kasbar" );
// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );

4
kicker/extensions/taskbar/taskbarextension.cpp
Unescape Escape View File

@ -66,11 +66,11 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
connect(m_container, TQ_SIGNAL(containerCountChanged()),
TQ_SIGNAL(updateLayout()));
kapp->dcopClient()->setNotifications(true);
tdeApp->dcopClient()->setNotifications(true);
connectDCOPSignal("kicker", "kicker", "configurationChanged()",
"configure()", false);
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
TQ_SLOT(setBackgroundTheme()));
TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme()));

2
kicker/kicker/buttons/nontdeappbutton.cpp
Unescape Escape View File

@ -216,7 +216,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
// since kicker doesn't listen to or use the session manager, we have
// to make sure that our environment is set up correctly. this is
// accomlplished by doing:
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
if (term)
{

4
kicker/kicker/buttons/servicebutton.cpp
Unescape Escape View File

@ -169,7 +169,7 @@ void ServiceButton::dropEvent( TQDropEvent* ev )
{
KURL::List uriList;
if( KURLDrag::decode( ev, uriList ) && _service ) {
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KRun::run( *_service, uriList );
}
PanelButton::dropEvent(ev);
@ -200,7 +200,7 @@ void ServiceButton::performExec()
if (!_service) return;
KURL::List uriList;
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KRun::run( *_service, uriList );
}

4
kicker/kicker/buttons/urlbutton.cpp
Unescape Escape View File

@ -140,7 +140,7 @@ void URLButton::dragEnterEvent(TQDragEnterEvent *ev)
void URLButton::dropEvent(TQDropEvent *ev)
{
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KURL::List execList;
if(KURLDrag::decode(ev, execList)){
KURL url( fileItem->url() );
@ -165,7 +165,7 @@ void URLButton::startDrag()
void URLButton::slotExec()
{
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
fileItem->run();
}

4
kicker/kicker/core/applethandle.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ AppletHandle::AppletHandle(AppletContainer* parent)
m_dragBar->installEventFilter(this);
m_layout->addWidget(m_dragBar);
if (kapp->authorizeTDEAction("kicker_rmb"))
if (tdeApp->authorizeTDEAction("kicker_rmb"))
{
m_menuButton = new AppletHandleButton( this );
m_menuButton->installEventFilter(this);
@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
void AppletHandle::menuButtonPressed()
{
if (!kapp->authorizeTDEAction("kicker_rmb"))
if (!tdeApp->authorizeTDEAction("kicker_rmb"))
{
return;
}

6
kicker/kicker/core/container_applet.cpp
Unescape Escape View File

@ -139,7 +139,7 @@ void AppletContainer::configure()
if (isImmutable() ||
KickerSettings::hideAppletHandles() ||
!kapp->authorizeTDEAction("kicker_rmb"))
!tdeApp->authorizeTDEAction("kicker_rmb"))
{
if (_handle->isVisibleTo(this))
{
@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved()
void AppletContainer::showAppletMenu()
{
if (!kapp->authorizeTDEAction("kicker_rmb"))
if (!tdeApp->authorizeTDEAction("kicker_rmb"))
{
return;
}
@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable)
BaseContainer::setImmutable(immutable);
if (isImmutable() ||
KickerSettings::hideAppletHandles() ||
!kapp->authorizeTDEAction("kicker_rmb"))
!tdeApp->authorizeTDEAction("kicker_rmb"))
{
if (_handle->isVisibleTo(this))
{

2
kicker/kicker/core/container_button.cpp
Unescape Escape View File

@ -254,7 +254,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
case TQt::RightButton:
{
if (!kapp->authorizeTDEAction("kicker_rmb") ||
if (!tdeApp->authorizeTDEAction("kicker_rmb") ||
isImmutable())
{
break;

8
kicker/kicker/core/container_extension.cpp
Unescape Escape View File

@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig()
void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
{
if (!kapp->authorizeTDEAction("kicker_rmb"))
if (!tdeApp->authorizeTDEAction("kicker_rmb"))
{
return;
}
@ -484,7 +484,7 @@ void ExtensionContainer::moveMe()
if (screen < 0)
{
screen = kapp->desktop()->screenNumber(this);
screen = tdeApp->desktop()->screenNumber(this);
}
if (screen < 0)
@ -1260,7 +1260,7 @@ int ExtensionContainer::arrangeHideButtons()
_ltHB->setMaximumHeight(maxHeight);
_ltHB->setMaximumWidth(14);
_layout->remove(_ltHB);
if (kapp->reverseLayout())
if (tdeApp->reverseLayout())
{
_layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
}
@ -1275,7 +1275,7 @@ int ExtensionContainer::arrangeHideButtons()
_rbHB->setMaximumHeight(maxHeight);
_rbHB->setMaximumWidth(14);
_layout->remove(_rbHB);
if (kapp->reverseLayout())
if (tdeApp->reverseLayout())
{
_layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
}

10
kicker/kicker/core/containerarea.cpp
Unescape Escape View File

@ -104,7 +104,7 @@ ContainerArea::ContainerArea(TDEConfig* _c,
setBackground();
connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll()));
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground()));
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground()));
connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)),
TQ_SLOT(immutabilityChanged(bool)));
connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
a = new DesktopButtonContainer(group, m_opMenu, m_contents);
else if (appletType == "WindowListButton")
a = new WindowListButtonContainer(group, m_opMenu, m_contents);
else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks"))
else if ((appletType == "BookmarksButton") && tdeApp->authorizeTDEAction("bookmarks"))
a = new BookmarksButtonContainer(group, m_opMenu, m_contents);
else if (appletType == "ServiceButton")
a = new ServiceButtonContainer(group, m_opMenu, m_contents);
@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info)
if (buttonType == "BookmarksButton")
{
if (kapp->authorizeTDEAction("bookmarks"))
if (tdeApp->authorizeTDEAction("bookmarks"))
{
return addBookmarksButton();
}
@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
saveContainerConfig(true);
PanelDrag *dd = new PanelDrag(_moveAC, this);
dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
dd->setPixmap(tdeApp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
grabKeyboard();
dd->drag();
releaseKeyboard();
@ -1640,7 +1640,7 @@ void ContainerArea::moveDragIndicator(int pos)
void ContainerArea::updateBackground( const TQPixmap& pm )
{
TQBrush bgBrush(colorGroup().background(), pm);
TQPalette pal = kapp->palette();
TQPalette pal = tdeApp->palette();
pal.setBrush(TQColorGroup::Background, bgBrush);
setPalette(pal);

10
kicker/kicker/core/extensionmanager.cpp
Unescape Escape View File

@ -111,7 +111,7 @@ void ExtensionManager::initialize()
m_mainPanel = pm->createExtensionContainer(
"childpanelextension.desktop",
true,
TQString(kapp->aboutData()->appName()) + "rc",
TQString(tdeApp->aboutData()->appName()) + "rc",
"Main Panel");
}
@ -129,7 +129,7 @@ void ExtensionManager::initialize()
m_mainPanel->readConfig();
m_mainPanel->show();
kapp->processEvents();
tdeApp->processEvents();
// read extension list
config->setGroup("General");
@ -173,7 +173,7 @@ void ExtensionManager::initialize()
addContainer(e);
e->readConfig();
e->show();
kapp->processEvents();
tdeApp->processEvents();
}
}
m_loadingContainers = false;
@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
updateMenubar();
m_menubarPanel->show();
connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar()));
connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar()));
}
else if (m_menubarPanel)
{
@ -692,7 +692,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
}
TQRect workArea;
if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2))
if ((XineramaScreen == XineramaAllScreens) || (tdeApp->desktop()->numScreens() < 2))
{
/* special value for all screens */
workArea = Kicker::the()->twinModule()->workArea(list);

6
kicker/kicker/core/kicker.cpp
Unescape Escape View File

@ -59,7 +59,7 @@
#include "kicker.moc"
Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); }
Kicker* Kicker::the() { return static_cast<Kicker*>(tdeApp); }
Kicker::Kicker()
: TDEUniqueApplication(),
@ -88,7 +88,7 @@ Kicker::Kicker()
}
// Make kicker immutable if configuration modules have been marked immutable
if (isKioskImmutable() && kapp->authorizeControlModules(Kicker::configModules(true)).isEmpty())
if (isKioskImmutable() && tdeApp->authorizeControlModules(Kicker::configModules(true)).isEmpty())
{
config()->setReadOnly(true);
config()->reparseConfiguration();
@ -413,7 +413,7 @@ void Kicker::configDialogFinished()
if (m_reloadingConfigDialog) {
TQByteArray data;
m_reloadingConfigDialog = false;
kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
}
}

6
kicker/kicker/core/menumanager.cpp
Unescape Escape View File

@ -70,8 +70,8 @@ MenuManager::MenuManager(TQObject *parent)
else
m_kmenu = new KMenuStub(new KMenu);
kapp->dcopClient()->setNotifications(true);
connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
tdeApp->dcopClient()->setNotifications(true);
connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
this, TQ_SLOT(applicationRemoved(const TQCString&)));
}
@ -210,7 +210,7 @@ TQCString MenuManager::createMenu(TQPixmap icon, TQString text)
p->text = text;
p->icon = icon;
p->idInParentMenu = m_kmenu->insertClientMenu( p );
p->createdBy = kapp->dcopClient()->senderId();
p->createdBy = tdeApp->dcopClient()->senderId();
m_kmenu->adjustSize();
return name;
}

4
kicker/kicker/core/panelextension.cpp
Unescape Escape View File

@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
if ( e->type() == TQEvent::MouseButtonPress )
{
TQMouseEvent* me = (TQMouseEvent*) e;
if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb"))
if ( me->button() == TQt::RightButton && tdeApp->authorize("action/kicker_rmb"))
{
Kicker::the()->setInsertionPoint(me->globalPos());
opMenu()->exec(me->globalPos());
@ -386,7 +386,7 @@ void PanelExtension::slotBuildOpMenu()
this, TQ_SLOT(showProcessManager()));
_opMnu->insertSeparator();
if (kapp->authorize("action/help"))
if (tdeApp->authorize("action/help"))
{
KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false);
_opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());

2
kicker/kicker/core/pluginmanager.cpp
Unescape Escape View File

@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent )
void LibUnloader::unload( const TQString &libName )
{
(void)new LibUnloader( libName, kapp );
(void)new LibUnloader( libName, tdeApp );
}
void LibUnloader::unload()

2
kicker/kicker/core/usersizesel.cpp
Unescape Escape View File

@ -99,7 +99,7 @@ void UserSizeSel::mouseMoveEvent(TQMouseEvent * e)
// int screen = xineramaScreen();
// if (screen < 0)
// {
// screen = kapp->desktop()->screenNumber(this);
// screen = tdeApp->desktop()->screenNumber(this);
// }
// TQRect desktopGeom = TQApplication::desktop()->screenGeometry(screen);
if (newSize < PANEL_MINIMUM_HEIGHT)

6
kicker/kicker/ui/appletop_mnu.cpp
Unescape Escape View File

@ -99,7 +99,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
insertSeparator();
}
TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
TQPixmap iconPix(tdeApp->iconLoader()->loadIcon(icon,
TDEIcon::Small, 0,
TDEIcon::DefaultState,
0, true));
@ -175,7 +175,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy()));
}
if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit"))
if ((actions & PanelAppletOpMenu::KMenuEditor) && tdeApp->authorizeTDEAction("menuedit"))
{
if (needSeparator)
{
@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
}
if ((actions & PanelAppletOpMenu::BookmarkEditor) &&
kapp->authorizeTDEAction("edit_bookmarks"))
tdeApp->authorizeTDEAction("edit_bookmarks"))
{
if (needSeparator)
{

8
kicker/kicker/ui/browser_mnu.cpp
Unescape Escape View File

@ -139,7 +139,7 @@ void PanelBrowserMenu::initialize()
KURL url;
url.setPath(path());
if (!kapp->authorizeURLAction("list", KURL(), url))
if (!tdeApp->authorizeURLAction("list", KURL(), url))
{
insertItem(i18n("Not Authorized to Read Folder"));
return;
@ -152,7 +152,7 @@ void PanelBrowserMenu::initialize()
TDEConfig *c = TDEGlobal::config();
c->setGroup("menus");
insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager()));
if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
if (tdeApp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal()));
insertSeparator();
}
@ -437,7 +437,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev )
void PanelBrowserMenu::slotExec(int id)
{
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
if(!_filemap.contains(id)) return;
@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id)
void PanelBrowserMenu::slotOpenTerminal()
{
TDEConfig * config = kapp->config();
TDEConfig * config = tdeApp->config();
config->setGroup("General");
TQString term = config->readPathEntry("TerminalApplication", "konsole");

2
kicker/kicker/ui/client_mnu.cpp
Unescape Escape View File

@ -134,6 +134,6 @@ void KickerClientMenu::slotActivated(int id)
TQByteArray data;
TQDataStream dataStream( data, IO_WriteOnly );
dataStream << id;
kapp->dcopClient()->send( app, obj, "activated(int)", data );
tdeApp->dcopClient()->send( app, obj, "activated(int)", data );
}
}

8
kicker/kicker/ui/hidebutton.cpp
Unescape Escape View File

@ -38,11 +38,11 @@ HideButton::HideButton(TQWidget *parent, const char *name)
{
setBackgroundOrigin(AncestorOrigin);
connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)));
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(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);
}

36
kicker/kicker/ui/k_mnu.cpp
Unescape Escape View File

@ -125,13 +125,13 @@ void PanelKMenu::hideMenu()
// Try to redraw the area under the menu
// Qt makes this surprisingly difficult to do in a timely fashion!
while (isShown() == true)
kapp->eventLoop()->processEvents(1000);
tdeApp->eventLoop()->processEvents(1000);
TQTimer *windowtimer = new TQTimer( this );
connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) );
windowTimerTimedOut = false;
windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed
while (windowTimerTimedOut == false)
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
// HACK
// The TDE Menu takes an unknown amount of time to disappear, and redrawing
@ -144,7 +144,7 @@ void PanelKMenu::hideMenu()
windowTimerTimedOut = false;
delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds
while (windowTimerTimedOut == false)
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
}
void PanelKMenu::windowClearTimeout()
@ -247,9 +247,9 @@ void PanelKMenu::initialize()
if (loadSidePixmap())
{
// in case we've been through here before, let's disconnect
disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
this, TQ_SLOT(paletteChanged()));
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
this, TQ_SLOT(paletteChanged()));
}
else
@ -317,7 +317,7 @@ void PanelKMenu::initialize()
bool need_separator = false;
// insert bookmarks
if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks"))
if (KickerSettings::useBookmarks() && tdeApp->authorizeTDEAction("bookmarks"))
{
// Need to create a new popup each time, it's deleted by subMenus.clear()
TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" );
@ -385,7 +385,7 @@ void PanelKMenu::initialize()
}
// run command
if (kapp->authorize("run_command"))
if (tdeApp->authorize("run_command"))
{
insertItem(KickerLib::menuIconSet("system-run"),
i18n("Run Command..."),
@ -394,7 +394,7 @@ void PanelKMenu::initialize()
insertSeparator();
}
if (DM().isSwitchable() && kapp->authorize("switch_user"))
if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
{
sessionsMenu = new TQPopupMenu( this );
insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu);
@ -412,12 +412,12 @@ void PanelKMenu::initialize()
insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession()));
}
if (kapp->authorize("lock_screen"))
if (tdeApp->authorize("lock_screen"))
{
insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock()));
}
if (kapp->authorize("logout"))
if (tdeApp->authorize("logout"))
{
insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout()));
}
@ -477,13 +477,13 @@ void PanelKMenu::slotLock()
TQByteArray replyData;
// Block here until lock is complete
// If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages!
kapp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
tdeApp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
}
void PanelKMenu::slotLogout()
{
hide();
kapp->requestShutDown();
tdeApp->requestShutDown();
}
void PanelKMenu::slotPopulateSessions()
@ -492,9 +492,9 @@ void PanelKMenu::slotPopulateSessions()
DM dm;
sessionsMenu->clear();
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
{
if (kapp->authorize("lock_screen")) {
if (tdeApp->authorize("lock_screen")) {
sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 );
}
sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 );
@ -528,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent )
void PanelKMenu::doNewSession( bool lock )
{
int result = KMessageBox::warningContinueCancel(
kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
i18n("<p>You have chosen to open another desktop session.<br>"
"The current session will be hidden "
"and a new login screen will be displayed.<br>"
@ -558,7 +558,7 @@ void PanelKMenu::doNewSession( bool lock )
void PanelKMenu::slotSaveSession()
{
TQByteArray data;
kapp->dcopClient()->send( "ksmserver", "default",
tdeApp->dcopClient()->send( "ksmserver", "default",
"saveCurrentSession()", data );
}
@ -569,8 +569,8 @@ void PanelKMenu::slotRunCommand()
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->updateRemoteUserTimestamp( appname );
kapp->dcopClient()->send( appname, "KDesktopIface",
tdeApp->updateRemoteUserTimestamp( appname );
tdeApp->dcopClient()->send( appname, "KDesktopIface",
"popupExecuteCommand()", data );
}

76
kicker/kicker/ui/k_new_mnu.cpp
Unescape Escape View File

@ -1225,9 +1225,9 @@ void KMenu::initialize()
kdDebug(1210) << "KMenu::initialize()" << endl;
// in case we've been through here before, let's disconnect
disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
this, TQ_SLOT(paletteChanged()));
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
this, TQ_SLOT(paletteChanged()));
/*
@ -1236,7 +1236,7 @@ void KMenu::initialize()
TDEConfig ksmserver("ksmserverrc", false, false);
ksmserver.setGroup("General");
connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage()));
m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout"));
// load search field history
TQStringList histList = KickerSettings::history();
@ -1309,10 +1309,10 @@ void KMenu::insertStaticExitItems()
int index = 1;
m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ );
if (kapp->authorize("logout"))
if (tdeApp->authorize("logout"))
m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ),
i18n( "End current session" ), "kicker:/logout", nId++, index++ );
if (kapp->authorize("lock_screen"))
if (tdeApp->authorize("lock_screen"))
m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ),
i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ );
@ -1324,7 +1324,7 @@ void KMenu::insertStaticExitItems()
i18n("Save current Session for next login"),
"kicker:/savesession", nId++, index++ );
}
if (DM().isSwitchable() && kapp->authorize("switch_user"))
if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
{
KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ),
i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ );
@ -1386,7 +1386,7 @@ void KMenu::insertStaticItems()
m_systemView->insertMenuItem(p, nId++, index++);
// run command
if (kapp->authorize("run_command"))
if (tdeApp->authorize("run_command"))
{
m_systemView->insertItem( "system-run", i18n("Run Command..."),
"", "kicker:/runusercommand", nId++, index++ );
@ -1479,18 +1479,18 @@ void KMenu::slotLock()
TQCString appname( "kdesktop" );
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
void KMenu::slotOpenHomepage()
{
accept();
kapp->invokeBrowser("http://www.trinitydesktop.org");
tdeApp->invokeBrowser("http://www.trinitydesktop.org");
}
void KMenu::slotLogout()
{
kapp->requestShutDown();
tdeApp->requestShutDown();
}
void KMenu::slotPopulateSessions()
@ -1499,9 +1499,9 @@ void KMenu::slotPopulateSessions()
DM dm;
sessionsMenu->clear();
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
{
if (kapp->authorize("lock_screen"))
if (tdeApp->authorize("lock_screen"))
sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
if (!p) {
@ -1534,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent )
void KMenu::doNewSession( bool lock )
{
int result = KMessageBox::warningContinueCancel(
kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
i18n("<p>You have chosen to open another desktop session.<br>"
"The current session will be hidden "
"and a new login screen will be displayed.<br>"
@ -1583,8 +1583,8 @@ void KMenu::searchAccept()
if ( logout )
{
kapp->propagateSessionManager();
kapp->requestShutDown();
tdeApp->propagateSessionManager();
tdeApp->requestShutDown();
}
if ( lock )
{
@ -1592,7 +1592,7 @@ void KMenu::searchAccept()
int kicker_screen_number = tqt_xscreen();
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
}
@ -1656,7 +1656,7 @@ bool KMenu::runCommand()
// fall-through to shell case
case KURIFilterData::SHELL:
{
if (kapp->authorize("shell_access"))
if (tdeApp->authorize("shell_access"))
{
exec = cmd;
@ -2419,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed)
#endif
)
exe = TQString();
else if (kapp->authorize("shell_access"))
else if (tdeApp->authorize("shell_access"))
{
if( filterData.hasArgsAndOptions() )
exe += filterData.argsAndOptions();
@ -2660,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream stream(params, IO_WriteOnly);
stream << 0 << -1 << "";
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
else if ( u == "kicker:/runcommand" )
{
@ -2675,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream stream(params, IO_WriteOnly);
stream << 2 << -1 << "";
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
else if ( u == "kicker:/restart" ) {
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << 1 << -1 << TQString();
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
else if ( u == "kicker:/suspend_freeze" ) {
slotSuspend( SuspendType::Freeze );
@ -2701,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u)
}
else if ( u == "kicker:/savesession" ) {
TQByteArray data;
kapp->dcopClient()->send( "ksmserver", "default",
tdeApp->dcopClient()->send( "ksmserver", "default",
"saveCurrentSession()", data );
}
else if ( u == "kicker:/switchuser" ) {
@ -2722,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream stream(params, IO_WriteOnly);
stream << 1 << -1 << rebootOptions[u.mid(16).toInt()];
kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
#warning restart entry not supported
#if 0
@ -2753,12 +2753,12 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream arg(data, IO_WriteOnly);
arg << u.mid(9,22);
kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
}
return;
}
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
(void) new KRun( u, parentWidget());
}
}
@ -2837,7 +2837,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
if (hasEntries)
m_popupMenu->insertSeparator();
if (kapp->authorize("editable_desktop_icons") )
if (tdeApp->authorize("editable_desktop_icons") )
{
hasEntries = true;
if (m_popupPath.menuPath.endsWith("/"))
@ -2847,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupMenu->insertItem(SmallIconSet("desktop"),
i18n("Add Item to Desktop"), AddItemToDesktop);
}
if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
{
hasEntries = true;
if (m_popupPath.menuPath.endsWith("/"))
@ -2857,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupMenu->insertItem(SmallIconSet("kicker"),
i18n("Add Item to Main Panel"), AddItemToPanel);
}
if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
{
hasEntries = true;
if (kitem->menuPath().endsWith("/"))
@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
else
m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem);
}
if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
{
hasEntries = true;
m_popupMenu->insertItem(SmallIconSet("system-run"),
@ -2969,10 +2969,10 @@ void KMenu::slotContextMenu(int selected)
case AddItemToPanel:
accept();
if (m_popupService)
kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
else
#warning FIXME special RecentDocuments/foo.desktop handling
kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
accept();
break;
@ -2988,10 +2988,10 @@ void KMenu::slotContextMenu(int selected)
case PutIntoRunDialog:
accept();
if (m_popupService)
kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
else
#warning FIXME special RecentDocuments/foo.desktop handling
kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
accept();
break;
@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected)
case AddMenuToPanel:
accept();
ds << "foo" << m_popupPath.menuPath;
kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
break;
case AddToFavorites:
@ -3243,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
}
@ -3569,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service)
TQDataStream arg(data, IO_WriteOnly);
arg << service << URLs;
if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
data, replyType, replyData) ) {
tqWarning( "call to tdelauncher failed.");
return false;
@ -3849,7 +3849,7 @@ void KMenu::runUserCommand()
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->updateRemoteUserTimestamp( appname );
kapp->dcopClient()->send( appname, "KDesktopIface",
tdeApp->updateRemoteUserTimestamp( appname );
tdeApp->dcopClient()->send( appname, "KDesktopIface",
"popupExecuteCommand()", data );
}

2
kicker/kicker/ui/media_watcher.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ MediaWatcher::MediaWatcher( TQObject *parent ) :
void MediaWatcher::updateDevices()
{
DCOPRef nsd( "kded", "mediamanager" );
nsd.setDCOPClient( kapp->dcopClient() );
nsd.setDCOPClient( tdeApp->dcopClient() );
m_devices = nsd.call( "fullList" );
}

4
kicker/kicker/ui/popupmenutitle.h
Unescape Escape View File

@ -46,7 +46,7 @@ public:
{
p->save();
TQRect r(x, y, w, h);
kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
p, r, cg);
if (!m_desktopName.isEmpty())
@ -73,7 +73,7 @@ public:
{
TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
size.setHeight(size.height() +
(kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
(tdeApp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
return size;
}

6
kicker/kicker/ui/quickbrowser_mnu.cpp
Unescape Escape View File

@ -44,17 +44,17 @@ void PanelQuickBrowser::initialize()
KURL url;
url.setPath(TQDir::homeDirPath());
if (kapp->authorizeURLAction("list", KURL(), url))
if (tdeApp->authorizeURLAction("list", KURL(), url))
insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"),
new PanelBrowserMenu(url.path(), this));
url.setPath(TQDir::rootDirPath());
if (kapp->authorizeURLAction("list", KURL(), url))
if (tdeApp->authorizeURLAction("list", KURL(), url))
insertItem(SmallIcon("folder_red"), i18n("&Root Folder"),
new PanelBrowserMenu(url.path(), this));
url.setPath(TQDir::rootDirPath() + "etc");
if (kapp->authorizeURLAction("list", KURL(), url))
if (tdeApp->authorizeURLAction("list", KURL(), url))
insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"),
new PanelBrowserMenu(url.path(), this));
}

2
kicker/kicker/ui/recentapps.cpp
Unescape Escape View File

@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << launchDCOPSignalSource() << strApp;
TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();

24
kicker/kicker/ui/service_mnu.cpp
Unescape Escape View File

@ -553,7 +553,7 @@ void PanelServiceMenu::slotExec(int id)
KSycocaEntry * e = entryMap_[id];
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KService::Ptr service = static_cast<KService *>(e);
TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
@ -596,25 +596,25 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
switch (contextKSycocaEntry_->sycocaType())
{
case KST_KService:
if (kapp->authorize("editable_desktop_icons"))
if (tdeApp->authorize("editable_desktop_icons"))
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("desktop"),
i18n("Add Item to Desktop"), AddItemToDesktop);
}
if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("kicker"),
i18n("Add Item to Main Panel"), AddItemToPanel);
}
if (kapp->authorizeTDEAction("menuedit"))
if (tdeApp->authorizeTDEAction("menuedit"))
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("kmenuedit"),
i18n("Edit Item"), EditItem);
}
if (kapp->authorize("run_command"))
if (tdeApp->authorize("run_command"))
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("system-run"),
@ -623,19 +623,19 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
break;
case KST_KServiceGroup:
if (kapp->authorize("editable_desktop_icons"))
if (tdeApp->authorize("editable_desktop_icons"))
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("desktop"),
i18n("Add Menu to Desktop"), AddMenuToDesktop);
}
if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("kicker"),
i18n("Add Menu to Main Panel"), AddMenuToPanel);
}
if (kapp->authorizeTDEAction("menuedit"))
if (tdeApp->authorizeTDEAction("menuedit"))
{
hasEntries = true;
popupMenu_->insertItem(SmallIconSet("kmenuedit"),
@ -691,7 +691,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
if ( kicker_screen_number )
appname.sprintf("kicker-screen-%d", kicker_screen_number);
service = static_cast<KService *>(contextKSycocaEntry_);
kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
tdeApp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
break;
}
@ -708,8 +708,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
service = static_cast<KService *>(contextKSycocaEntry_);
kapp->updateRemoteUserTimestamp( appname );
kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
tdeApp->updateRemoteUserTimestamp( appname );
tdeApp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
break;
}
@ -735,7 +735,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
ds << "foo" << g->relPath();
kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
break;
}

2
kicker/libkicker/appletinfo.cpp
Unescape Escape View File

@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co
else
{
m_configFile.append("_")
.append(kapp->randomString(20).lower())
.append(tdeApp->randomString(20).lower())
.append("_rc");
}
}

2
kicker/libkicker/kickertip.cpp
Unescape Escape View File

@ -82,7 +82,7 @@ KickerTip::KickerTip(TQWidget * parent)
hide();
connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate()));
// // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from?
// connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
// connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
}
KickerTip::~KickerTip()

4
kicker/libkicker/menuinfo.cpp
Unescape Escape View File

@ -39,13 +39,13 @@ MenuInfo::MenuInfo(const TQString& desktopFile)
df.setGroup("Desktop Entry");
TQStringList list = df.readListEntry("X-TDE-AuthorizeAction");
if (kapp && !list.isEmpty())
if (tdeApp && !list.isEmpty())
{
for(TQStringList::ConstIterator it = list.begin();
it != list.end();
++it)
{
if (!kapp->authorize((*it).stripWhiteSpace()))
if (!tdeApp->authorize((*it).stripWhiteSpace()))
return;
}
}

10
kicker/libkicker/panelbutton.cpp
Unescape Escape View File

@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
updateSettings(TDEApplication::SETTINGS_MOUSE);
kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
installEventFilter(KickerTip::the());
connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
}
void PanelButton::configure()
@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu()
m_pressedDuringPopup = false;
KickerTip::enableTipping(false);
kapp->syncX();
kapp->processEvents();
tdeApp->syncX();
tdeApp->processEvents();
if (!m_initialized)
{

8
kicker/libkicker/simplebutton.cpp
Unescape Escape View File

@ -47,13 +47,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
{
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 );
}

6
kicker/menuext/find/findmenu.cpp
Unescape Escape View File

@ -67,13 +67,13 @@ void FindMenu::slotExec( int pos )
{
TQString app = mConfigList[ pos ];
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KSimpleConfig config(app, true);
config.setDesktopGroup();
if (kapp && config.readEntry("Type") == "Link")
if (tdeApp && config.readEntry("Type") == "Link")
{
kapp->invokeBrowser(config.readEntry("URL"));
tdeApp->invokeBrowser(config.readEntry("URL"));
}
else
{

2
kicker/menuext/kate/katesessionmenu.cpp
Unescape Escape View File

@ -167,7 +167,7 @@ void KateSessionMenu::slotExec( int id )
else if ( id > 2 )
args << m_sessions[ id-3 ];
kapp->tdeinitExec("kate", args);
tdeApp->tdeinitExec("kate", args);
}
void KateSessionMenu::reloadSessionsList()

2
kicker/menuext/konq-profiles/konqy_menu.cpp
Unescape Escape View File

@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id)
{
TQStringList args;
args<<"--profile"<<m_profiles[id-1];
kapp->tdeinitExec("konqueror", args);
tdeApp->tdeinitExec("konqueror", args);
}
void KonquerorProfilesMenu::reload()

6
kicker/menuext/konsole/konsole_mnu.cpp
Unescape Escape View File

@ -91,7 +91,7 @@ void KonsoleMenu::initialize()
}
else
{
kapp->iconLoader()->addAppDir("konsole");
tdeApp->iconLoader()->addAppDir("konsole");
}
setInitialized(true);
@ -244,7 +244,7 @@ void KonsoleMenu::slotExec(int id)
}
--id;
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
TQStringList args;
if (static_cast<unsigned int>(id) < sessionList.count())
{
@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id)
// this is a session, not a bookmark, so execute that instead
TQStringList args;
args << "--profile" << m_profiles[id];
kapp->tdeinitExec("konsole", args);
tdeApp->tdeinitExec("konsole", args);
}
KURL KonsoleMenu::baseURL() const

2
kicker/menuext/prefmenu/prefmenu.cpp
Unescape Escape View File

@ -328,7 +328,7 @@ void PrefMenu::slotExec(int id)
return;
}
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KSycocaEntry *e = m_entryMap[id];
KService::Ptr service = static_cast<KService *>(e);
TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),

2
kicker/menuext/recentdocs/recentdocsmenu.cpp
Unescape Escape View File

@ -96,7 +96,7 @@ void RecentDocsMenu::slotClearHistory() {
void RecentDocsMenu::slotExec(int id) {
if (id >= 0) {
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KURL u;
u.setPath(_fileList[id]);
KDEDesktopMimeType::run(u, true);

10
kicker/menuext/tdeprint/print_mnu.cpp
Unescape Escape View File

@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID)
switch (ID)
{
case ADD_PRINTER_ID:
kapp->tdeinitExec("kaddprinterwizard");
tdeApp->tdeinitExec("kaddprinterwizard");
break;
case TDEPRINT_SETTINGS_ID:
kapp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
break;
case CONFIG_SERVER_ID:
kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
break;
case PRINT_MANAGER_ID:
KRun::runCommand("tdecmshell tde-printers.desktop");
@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID)
KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
break;
case KPRINTER_ID:
kapp->tdeinitExec("kprinter");
tdeApp->tdeinitExec("kprinter");
break;
default:
{
// start kjobviewer
TQStringList args;
args << "--show" << "-d" << text(ID).remove('&');
kapp->tdeinitExec("kjobviewer", args);
tdeApp->tdeinitExec("kjobviewer", args);
}
break;
}

18
kicker/menuext/tom/tom.cpp
Unescape Escape View File

@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQPainter p(this);
TQRect r(rect());
// ew, nasty hack. may result in coredumps due to horrid C-style cast???
kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
p.drawPixmap(KDialog::spacingHint(), 1, icon);
p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
@ -432,7 +432,7 @@ void TOM::initialize()
}
else
{
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
}*/
// TASKS
@ -484,7 +484,7 @@ void TOM::initialize()
{
removeItem(destMenuTitleID);
}
else if (kapp->authorize("run_command"))
else if (tdeApp->authorize("run_command"))
{
insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
}
@ -510,7 +510,7 @@ void TOM::initialize()
insertTitle(i18n("Special Items"), contextMenuTitleID);
// if we have no destinations, put the run command here
if (numDests == 0 && kapp->authorize("run_command"))
if (numDests == 0 && tdeApp->authorize("run_command"))
{
insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
}
@ -817,8 +817,8 @@ void TOM::runCommand()
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->updateRemoteUserTimestamp( appname );
kapp->dcopClient()->send( appname, "KDesktopIface",
tdeApp->updateRemoteUserTimestamp( appname );
tdeApp->dcopClient()->send( appname, "KDesktopIface",
"popupExecuteCommand()", data );
}
@ -826,7 +826,7 @@ void TOM::runTask(int id)
{
if (!m_tasks.contains(id)) return;
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
}
@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id)
{
if (id >= 0)
{
kapp->propagateSessionManager();
tdeApp->propagateSessionManager();
KURL u;
u.setPath(m_recentDocURLs[id]);
KDEDesktopMimeType::run(u, true);
@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id)
void TOM::logout()
{
kapp->requestShutDown();
tdeApp->requestShutDown();
}
#include "tom.moc"

16
kicker/proxy/appletproxy.cpp
Unescape Escape View File

@ -126,7 +126,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
, _applet(0)
{
// try to attach to DCOP server
if (!kapp->dcopClient()->attach()) {
if (!tdeApp->dcopClient()->attach()) {
kdError() << "Failed to attach to DCOP server." << endl;
KMessageBox::error(0,
i18n("The applet proxy could not be started due to DCOP communication problems."),
@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
exit(0);
}
if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) {
if (tdeApp->dcopClient()->registerAs("applet_proxy", true) == 0) {
kdError() << "Failed to register at DCOP server." << endl;
KMessageBox::error(0,
i18n("The applet proxy could not be started due to DCOP registration problems."),
@ -147,7 +147,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
AppletProxy::~AppletProxy()
{
kapp->dcopClient()->detach();
tdeApp->dcopClient()->detach();
delete _info;
delete _applet;
}
@ -255,7 +255,7 @@ void AppletProxy::dock(const TQCString& callbackID)
_callbackID = callbackID;
// try to attach to DCOP server
DCOPClient* dcop = kapp->dcopClient();
DCOPClient* dcop = tdeApp->dcopClient();
dcop->setNotifications(true);
connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
@ -463,7 +463,7 @@ void AppletProxy::slotUpdateLayout()
else
appname.sprintf("kicker-screen-%d", screen_number);
kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
}
void AppletProxy::slotRequestFocus()
@ -480,7 +480,7 @@ void AppletProxy::slotRequestFocus()
else
appname.sprintf("kicker-screen-%d", screen_number);
kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
tdeApp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
}
void AppletProxy::slotApplicationRemoved(const TQCString& appId)
@ -496,7 +496,7 @@ void AppletProxy::slotApplicationRemoved(const TQCString& appId)
if(appId == appname) {
kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
kapp->quit();
tdeApp->quit();
}
}
@ -510,7 +510,7 @@ void AppletProxy::showStandalone()
_applet->resize( _applet->widthForHeight( 48 ), 48 );
_applet->setMinimumSize( _applet->size() );
_applet->setCaption( _info->name() );
kapp->setMainWidget( _applet );
tdeApp->setMainWidget( _applet );
_applet->show();
}

12
kicker/proxy/extensionproxy.cpp
Unescape Escape View File

@ -108,12 +108,12 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
, _extension(0)
{
// try to attach to DCOP server
if (!kapp->dcopClient()->attach()) {
if (!tdeApp->dcopClient()->attach()) {
kdError() << "Failed to attach to DCOP server." << endl;
exit(0);
}
if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) {
if (tdeApp->dcopClient()->registerAs("extension_proxy", true) == 0) {
kdError() << "Failed to register at DCOP server." << endl;
exit(0);
}
@ -121,7 +121,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
ExtensionProxy::~ExtensionProxy()
{
kapp->dcopClient()->detach();
tdeApp->dcopClient()->detach();
}
void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile)
@ -195,7 +195,7 @@ void ExtensionProxy::dock(const TQCString& callbackID)
_callbackID = callbackID;
// try to attach to DCOP server
DCOPClient* dcop = kapp->dcopClient();
DCOPClient* dcop = tdeApp->dcopClient();
dcop->setNotifications(true);
connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
@ -380,7 +380,7 @@ void ExtensionProxy::slotUpdateLayout()
else
appname.sprintf("kicker-screen-%d", screen_number);
kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
}
void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
@ -396,6 +396,6 @@ void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
if(appId == appname) {
kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
kapp->quit();
tdeApp->quit();
}
}

2
kicker/taskbar/taskbar.cpp
Unescape Escape View File

@ -131,7 +131,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
blocklayout = false;
connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
keys = new TDEGlobalAccel( this );
#include "taskbarbindings.cpp"
keys->readSettings();

12
kicker/taskbar/taskbarcontainer.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ void TaskBarContainer::configure()
break;
}
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
TDEIcon::Panel,
16));
windowListButton->setMinimumSize(windowListButton->sizeHint());
@ -188,20 +188,20 @@ void TaskBarContainer::preferences()
{
TQByteArray data;
if (!kapp->dcopClient()->isAttached())
if (!tdeApp->dcopClient()->isAttached())
{
kapp->dcopClient()->attach();
tdeApp->dcopClient()->attach();
}
if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME)
{
kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
}
else
{
TQDataStream args( data, IO_WriteOnly );
args << configFile;
kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
}
}
@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
if (windowListButton)
{
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
TDEIcon::Panel,
16));
windowListButton->setMinimumSize(windowListButton->sizeHint());

4
kicker/taskbar/taskcontainer.cpp
Unescape Escape View File

@ -724,7 +724,7 @@ void TaskContainer::drawButton(TQPainter *p)
if (taskBar->showIcons())
{
if (pixmap.isNull() && m_startup)
pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
if ( !pixmap.isNull() )
{
@ -1254,7 +1254,7 @@ void TaskContainer::popupMenu(int action)
}
else if (action == m_settingsObject->ShowOperationsMenu)
{
if (!kapp->authorizeTDEAction("twin_rmb"))
if (!tdeApp->authorizeTDEAction("twin_rmb"))
{
return;
}

2
kicker/taskmanager/taskmanager.cpp
Unescape Escape View File

@ -1459,7 +1459,7 @@ void Task::tileTo(int position)
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << _win << position;
TDEApplication::kApplication()->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params);
tdeApp->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params);
}
Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data,

4
klipper/applet.cpp
Unescape Escape View File

@ -90,7 +90,7 @@ void KlipperApplet::preferences()
void KlipperApplet::help()
{
kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
tdeApp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
}
void KlipperApplet::about()
@ -114,7 +114,7 @@ void KlipperAppletWidget::init()
TQByteArray arg1, arg2;
TQCString str;
// call() - wait for finishing
kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
tdeApp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
// register ourselves, so if klipper process is started,
// it will quit immediately (TDEUniqueApplication)
s_dcop = new DCOPClient;

14
klipper/clipboardpoll.cpp
Unescape Escape View File

@ -78,7 +78,7 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
selection.timestamp_atom = atoms[ 4 ];
clipboard.timestamp_atom = atoms[ 5 ];
bool use_polling = true;
kapp->installX11EventFilter( this );
tdeApp->installX11EventFilter( this );
#ifdef HAVE_XFIXES
int dummy;
if( XFixesQueryExtension( tqt_xdisplay(), &xfixes_event_base, &dummy ))
@ -108,8 +108,8 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
void ClipboardPoll::initPolling()
{
connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
connect( tdeApp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout()));
timer.start( 1000, false );
selection.atom = XA_PRIMARY;
@ -146,7 +146,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify )
{
XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e );
if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection())
if( ev->selection == XA_PRIMARY && !tdeApp->clipboard()->ownsSelection())
{
#ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
@ -154,7 +154,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
set_tqt_x_time(ev->timestamp);
emit clipboardChanged( true );
}
else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
else if( ev->selection == xa_clipboard && !tdeApp->clipboard()->ownsClipboard())
{
#ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
@ -217,13 +217,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data )
void ClipboardPoll::timeout()
{
KlipperWidget::updateTimestamp();
if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
if( !tdeApp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
#ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED" << endl;
#endif
emit clipboardChanged( true );
}
if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
if( !tdeApp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
#ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED" << endl;
#endif

20
klipper/toplevel.cpp
Unescape Escape View File

@ -121,7 +121,7 @@ extern bool tqt_qclipboard_bailout_hack;
static void ensureGlobalSyncOff(TDEConfig* config);
// config == kapp->config for process, otherwise applet
// config == tdeApp->config for process, otherwise applet
KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
: TQWidget( parent )
, DCOPObject( "klipper" )
@ -138,7 +138,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
updateTimestamp(); // read initial X user time
setBackgroundMode( X11ParentRelative );
clip = kapp->clipboard();
clip = tdeApp->clipboard();
connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 );
@ -187,7 +187,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
showTimer = new TQTime();
readProperties(m_config);
connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
poll = new ClipboardPoll( this );
connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ),
@ -235,7 +235,7 @@ KlipperWidget::~KlipperWidget()
delete showTimer;
delete hideTimer;
delete myURLGrabber;
if( m_config != kapp->config())
if( m_config != tdeApp->config())
delete m_config;
tqt_qclipboard_bailout_hack = false;
}
@ -616,7 +616,7 @@ void KlipperWidget::slotQuit()
return;
config->sync();
kapp->quit();
tdeApp->quit();
}
@ -785,7 +785,7 @@ bool KlipperWidget::blockFetchingNewData()
// while the user is doing a selection using the mouse, OOo stops updating the clipboard
// contents, so in practice it's like the user has selected only the part which was
// selected when Klipper asked first.
ButtonState buttonstate = kapp->keyboardMouseState();
ButtonState buttonstate = tdeApp->keyboardMouseState();
if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
|| ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
m_pendingContentsCheck = true;
@ -1180,7 +1180,7 @@ TDEAboutData* KlipperWidget::aboutData()
}
Klipper::Klipper( TQWidget* parent )
: KlipperWidget( parent, kapp->config())
: KlipperWidget( parent, tdeApp->config())
{
}
@ -1192,7 +1192,7 @@ Klipper::Klipper( TQWidget* parent )
// find newInstance() (which doesn't do anything in Klipper anyway)
int Klipper::newInstance()
{
kapp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
tdeApp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
return 0;
}
@ -1200,8 +1200,8 @@ int Klipper::newInstance()
// (AKA ugly hack)
void Klipper::quitProcess()
{
kapp->dcopClient()->detach();
kapp->quit();
tdeApp->dcopClient()->detach();
tdeApp->quit();
}
static void ensureGlobalSyncOff(TDEConfig* config) {

2
klipper/toplevel.h
Unescape Escape View File

@ -127,7 +127,7 @@ protected:
bool ignoreClipboardChanges() const;
TDEConfig* config() const { return m_config; }
bool isApplet() const { return m_config != kapp->config(); }
bool isApplet() const { return m_config != tdeApp->config(); }
protected slots:
void slotPopupMenu();

2
klipper/urlgrabber.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ URLGrabber::URLGrabber( TDEConfig* config )
: m_config( config )
{
if( m_config == NULL )
m_config = kapp->config();
m_config = tdeApp->config();
myMenu = 0L;
myPopupKillTimeout = 8;
m_stripWhiteSpace = true;

2
knetattach/knetattach.ui.h
Unescape Escape View File

@ -171,7 +171,7 @@ void KNetAttach::finished()
return;
}
kapp->invokeBrowser(url.url());
tdeApp->invokeBrowser(url.url());
TQString name = _connectionName->text().stripWhiteSpace();