summaryrefslogtreecommitdiffstats
path: root/kicker/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker')
-rw-r--r--kicker/kicker/buttons/desktopbutton.cpp2
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.cpp6
-rw-r--r--kicker/kicker/buttons/servicebutton.cpp4
-rw-r--r--kicker/kicker/core/container_base.cpp2
-rw-r--r--kicker/kicker/core/container_extension.cpp10
-rw-r--r--kicker/kicker/core/extensionmanager.cpp8
-rw-r--r--kicker/kicker/core/kicker.cpp30
-rw-r--r--kicker/kicker/core/kicker.h4
-rw-r--r--kicker/kicker/core/main.cpp2
-rw-r--r--kicker/kicker/core/panelextension.cpp2
-rw-r--r--kicker/kicker/core/pluginmanager.cpp22
-rw-r--r--kicker/kicker/kicker-3.4-reverseLayout.cpp4
-rw-r--r--kicker/kicker/plugins/kickoff-beagle-plugin.cpp2
-rw-r--r--kicker/kicker/ui/addapplet.cpp22
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp12
-rw-r--r--kicker/kicker/ui/hidebutton.cpp2
-rw-r--r--kicker/kicker/ui/itemview.cpp8
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp32
-rw-r--r--kicker/kicker/ui/service_mnu.cpp16
20 files changed, 96 insertions, 96 deletions
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index 9f23741e5..c35a8bf47 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -76,7 +76,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev )
void DesktopButton::dropEvent( TQDropEvent *ev )
{
- KURL dPath ( KGlobalSettings::desktopPath() );
+ KURL dPath ( TDEGlobalSettings::desktopPath() );
KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, dPath, ev, this );
PanelButton::dropEvent(ev);
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index c953d075d..808d02633 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -182,12 +182,12 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev)
deskFile.setDesktopGroup();
// ... and add it to the exec string
- execStr += KProcess::quote(deskFile.readURL()) + " ";
+ execStr += TDEProcess::quote(deskFile.readURL()) + " ";
}
else
{
// it's just a URL of some sort, add it directly to the exec
- execStr += KProcess::quote(url.path()) + " ";
+ execStr += TDEProcess::quote(url.path()) + " ";
}
}
@@ -223,7 +223,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
// run in a terminal? ok! we find this in the config file in the
// [misc] group (this will usually be in kdeglobal, actually, which
// get merged into the application config automagically for us
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("misc");
TQString termStr = config->readPathEntry("Terminal", "konsole");
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index f7322a976..57a619954 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -54,7 +54,7 @@ ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent)
{
if (_id.startsWith("/"))
{
- TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
+ TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
@@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
if (_id.startsWith("/"))
{
- TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
+ TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index c42387173..e224efe7a 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -105,7 +105,7 @@ void BaseContainer::slotRemoved(KConfig* config)
{
if (!config)
{
- config = KGlobal::config();
+ config = TDEGlobal::config();
}
config->deleteGroup(appletId().latin1());
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 9af99e3ab..37cd1516a 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -172,7 +172,7 @@ void ExtensionContainer::init()
updateHighlightColor();
// if we were hidden when kicker quit, let's start out hidden as well!
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
int tmp = config->readNumEntry("UserHidden", Unhidden);
if (tmp > Unhidden && tmp <= RightBottom)
@@ -359,7 +359,7 @@ void ExtensionContainer::readConfig()
void ExtensionContainer::writeConfig()
{
// kdDebug(1210) << "ExtensionContainer::writeConfig()" << endl;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
config->writePathEntry("ConfigFile", _info.configFile());
@@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
if (!_opMnu)
{
- KDesktopFile f(KGlobal::dirs()->findResource("extensions", _info.desktopFile()));
+ KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile()));
_opMnu = new PanelExtensionOpMenu(f.readName(),
m_extension ? m_extension->actions() : 0,
this);
@@ -984,7 +984,7 @@ void ExtensionContainer::animatedHide(bool left)
// save our hidden status so that when kicker starts up again
// we'll come back in the same state
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
config->writeEntry("UserHidden", userHidden());
@@ -1385,7 +1385,7 @@ void ExtensionContainer::positionChange(KPanelExtension::Position p)
void ExtensionContainer::updateHighlightColor()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::palette().active().highlight();
m_highlightColor = config->readColorEntry("activeBackground", &color);
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 4d6f29920..fce133a0f 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager()
void ExtensionManager::initialize()
{
// kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl;
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
PluginManager* pm = PluginManager::the();
// set up the "main" panel
@@ -179,7 +179,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false)
|| KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false ))
{
- if (KGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
+ if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
m_menubarPanel)
{
return;
@@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar()
// panel, meaning kickerrc itself would have to be vastly modified
// with lots of complications. not work it IMHO.
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("General");
if (config->readBoolEntry("CheckedForMenubar", false))
@@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig()
{
// kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
// build the extension list
TQStringList elist;
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index e965d3761..864bcec6f 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -96,26 +96,26 @@ Kicker::Kicker()
dcopClient()->setDefaultObject("Panel");
disableSessionManagement();
TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/");
- KGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
- KGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
- KGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
- KGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext");
- KGlobal::dirs()->addResourceType("applets", dataPathBase + "applets");
- KGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles");
- KGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions");
+ TDEGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
+ TDEGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
+ TDEGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
+ TDEGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext");
+ TDEGlobal::dirs()->addResourceType("applets", dataPathBase + "applets");
+ TDEGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles");
+ TDEGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions");
KImageIO::registerFormats();
- KGlobal::iconLoader()->addExtraDesktopThemes();
+ TDEGlobal::iconLoader()->addExtraDesktopThemes();
- KGlobal::locale()->insertCatalogue("tdmgreet");
- KGlobal::locale()->insertCatalogue("libkonq");
- KGlobal::locale()->insertCatalogue("libdmctl");
- KGlobal::locale()->insertCatalogue("libtaskbar");
+ TDEGlobal::locale()->insertCatalogue("tdmgreet");
+ TDEGlobal::locale()->insertCatalogue("libkonq");
+ TDEGlobal::locale()->insertCatalogue("libdmctl");
+ TDEGlobal::locale()->insertCatalogue("libtaskbar");
// initialize our keys
// note that this creates the KMenu by calling MenuManager::the()
- keys = new KGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
#define KICKER_ALL_BINDINGS
#include "kickerbindings.cpp"
keys->readSettings();
@@ -197,7 +197,7 @@ void Kicker::slotSettingsChanged(int category)
void Kicker::paletteChanged()
{
- KConfigGroup c(KGlobal::config(), "General");
+ KConfigGroup c(TDEGlobal::config(), "General");
KickerSettings::setTintColor(c.readColorEntry("TintColor",
&palette().active().mid()));
KickerSettings::self()->writeConfig();
@@ -227,7 +227,7 @@ void Kicker::configure()
{
static bool notFirstConfig = false;
- KConfig* c = KGlobal::config();
+ KConfig* c = TDEGlobal::config();
c->reparseConfiguration();
c->setGroup("General");
m_canAddContainers = !c->entryIsImmutable("Applets2");
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 0416bc5ce..81fa8123f 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KCMultiDialog;
class KDirWatch;
-class KGlobalAccel;
+class TDEGlobalAccel;
class KWinModule;
class PanelKMenu;
class PanelPopupButton;
@@ -122,7 +122,7 @@ private slots:
private:
static void crashHandler(int signal);
- KGlobalAccel* keys;
+ TDEGlobalAccel* keys;
KWinModule* m_twinModule;
KCMultiDialog* m_configDialog;
bool m_canAddContainers;
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 1085bd430..893efdd41 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -99,7 +99,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
}
}
- KGlobal::locale()->setMainCatalogue("kicker");
+ TDEGlobal::locale()->setMainCatalogue("kicker");
TQCString appname;
if (kicker_screen_number == 0)
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 73fa0c2b0..6b41f1c50 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -388,7 +388,7 @@ void PanelExtension::slotBuildOpMenu()
if (kapp->authorize("action/help"))
{
- KHelpMenu* help = new KHelpMenu( this, KGlobal::instance()->aboutData(), false);
+ KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false);
_opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
}
_opMnu->adjustSize();
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index d1706ada9..0ac38610f 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -55,28 +55,28 @@ PluginManager* PluginManager::the()
AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Applet, sort, list);
}
AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Extension, sort, list);
}
AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::BuiltinButton, sort, list);
}
AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::SpecialButton, sort, list);
}
@@ -113,7 +113,7 @@ AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles,
PluginManager::PluginManager()
{
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
m_untrustedApplets = generalGroup.readListEntry("UntrustedApplets");
m_untrustedExtensions = generalGroup.readListEntry("UntrustedExtensions");
}
@@ -250,13 +250,13 @@ AppletContainer* PluginManager::createAppletContainer(
TQWidget* parent,
bool isImmutable)
{
- TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile );
+ TQString desktopPath = TDEGlobal::dirs()->findResource( "applets", desktopFile );
// KDE4: remove
// support the old (KDE 2.2) nameing scheme
if (desktopPath.isEmpty())
{
- desktopPath = KGlobal::dirs()->findResource( "applets",
+ desktopPath = TDEGlobal::dirs()->findResource( "applets",
desktopFile.right(
desktopFile.length() - 1 ) );
}
@@ -282,7 +282,7 @@ AppletContainer* PluginManager::createAppletContainer(
{
// we haven't loaded this puppy before and we're not in the untrusted list
m_untrustedApplets.append(desktopFile);
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
generalGroup.sync();
}
@@ -308,7 +308,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
return 0;
}
- TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile);
+ TQString desktopPath = TDEGlobal::dirs()->findResource("extensions", desktopFile);
if (desktopPath.isEmpty())
{
return 0;
@@ -335,7 +335,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
{
// we don't have an instance around and we're not in the untrusted list!
m_untrustedExtensions.append(desktopFile);
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
generalGroup.sync();
}
@@ -349,7 +349,7 @@ void PluginManager::clearUntrustedLists()
m_untrustedExtensions.clear();
m_untrustedApplets.clear();
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
generalGroup.sync();
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index d3fd5f755..a588c6258 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -143,9 +143,9 @@ int main(int argc, char** argv)
tempFile.close();
// Run kconf_update on the childpanel config files.
- KProcess kconf_update;
+ TDEProcess kconf_update;
kconf_update << "kconf_update" << tempFile.name();
- kconf_update.start(KProcess::Block);
+ kconf_update.start(TDEProcess::Block);
tempFile.unlink();
}
diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
index 223074a8d..a3b3f8126 100644
--- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
+++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
@@ -407,7 +407,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit)
title = i18n("Conversation With %1").arg(title.isEmpty() ? i18n("Unknown Person") : title);
TQDateTime datetime;
datetime = datetimeFromString((*hit) [fixme_starttime]);
- info=i18n("Date: %1").arg(KGlobal::locale()->formatDateTime(datetime,false));
+ info=i18n("Date: %1").arg(TDEGlobal::locale()->formatDateTime(datetime,false));
if (hit->getMimeType()=="beagle/x-kopete-log")
icon="kopete";
else
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index d6b144803..75e4df12f 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -74,7 +74,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
itemDescription->installEventFilter(this);
- KIconLoader * ldr = KGlobal::iconLoader();
+ KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
itemPixmap->setPixmap(icon);
itemPixmap->installEventFilter(this);
@@ -99,7 +99,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
if ((me->pos() - m_dragStart).manhattanLength() >
- KGlobalSettings::dndEventDelay())
+ TDEGlobalSettings::dndEventDelay())
{
AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this);
@@ -165,7 +165,7 @@ void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
if (e->button() == Qt::LeftButton &&
!m_dragStart.isNull() &&
(e->pos() - m_dragStart).manhattanLength() >
- KGlobalSettings::dndEventDelay())
+ TDEGlobalSettings::dndEventDelay())
{
AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this);
@@ -202,18 +202,18 @@ void AppletWidget::setSelected(bool selected)
// for now just used to switch colours around =)
if (m_selected)
{
- setPaletteBackgroundColor(KGlobalSettings::highlightColor());
- setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+ setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
+ setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
}
else if (m_odd)
{
- setPaletteBackgroundColor(KGlobalSettings::baseColor());
- setPaletteForegroundColor(KGlobalSettings::textColor());
+ setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
+ setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
else
{
- setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor());
- setPaletteForegroundColor(KGlobalSettings::textColor());
+ setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor());
+ setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
}
@@ -241,7 +241,7 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget");
m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual);
m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff);
- m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor());
+ m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
setMainWidget(m_mainWidget);
@@ -311,7 +311,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
void AddAppletDialog::populateApplets()
{
m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport());
- m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor());
+ m_appletBox->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0);
m_appletBox->show();
TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox);
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 4998fc5cf..696065266 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -149,7 +149,7 @@ void PanelBrowserMenu::initialize()
// only the first part menu got them
if(_startid == 0 && !_filesOnly) {
insertTitle(path());
- KConfig *c = KGlobal::config();
+ KConfig *c = TDEGlobal::config();
c->setGroup("menus");
insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false))
@@ -196,7 +196,7 @@ void PanelBrowserMenu::initialize()
if ( iconPath.startsWith("./") )
iconPath = path + '/' + iconPath.mid(2);
- icon = KGlobal::iconLoader()->loadIcon(iconPath,
+ icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull())
@@ -245,7 +245,7 @@ void PanelBrowserMenu::initialize()
TQString s = c.readEntry("Icon");
if(!_icons->contains(s)) {
- icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
+ icon = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull()) {
@@ -309,7 +309,7 @@ void PanelBrowserMenu::initialize()
// WABA: tear off handles don't work together with dynamically updated
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
- if(KGlobalSettings::insertTearOffHandle() && item_count > 0)
+ if(TDEGlobalSettings::insertTearOffHandle() && item_count > 0)
insertTearOffHandle();
#endif
@@ -453,13 +453,13 @@ void PanelBrowserMenu::slotOpenTerminal()
config->setGroup("General");
TQString term = config->readPathEntry("TerminalApplication", "konsole");
- KProcess proc;
+ TDEProcess proc;
proc << term;
if (term == "konsole")
proc << "--workdir" << path();
else
proc.setWorkingDirectory(path());
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void PanelBrowserMenu::slotOpenFileManager()
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index cd023eb8a..0054fbb60 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -153,7 +153,7 @@ void HideButton::slotSettingsChanged(int category)
return;
}
- bool changeCursor = KGlobalSettings::changeCursorOverIcon();
+ bool changeCursor = TDEGlobalSettings::changeCursorOverIcon();
if (changeCursor)
{
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 913091bbf..431b62e6c 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
void KMenuItem::setIcon(const TQString& icon, int size)
{
m_icon = icon;
- TQListViewItem::setPixmap(0, KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
+ TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
}
void KMenuItem::setHasChildren( bool flag )
@@ -152,7 +152,7 @@ void KMenuItem::setup()
{
// if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt
// the 7pt could be read out of konquerorrc I guess
- float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.);
+ float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.);
const int expected_height = 38;
description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
@@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
return 0;
o = new KMultipleDrag(viewport());
- TQPixmap pix = KGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
- TQPixmap add = KGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
+ TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
TQPainter p( &pix );
p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 48ef522fd..8dca46038 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -404,7 +404,7 @@ void PanelKMenu::initialize()
// WABA: tear off handles don't work together with dynamically updated
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
- if (KGlobalSettings::insertTearOffHandle())
+ if (TDEGlobalSettings::insertTearOffHandle())
insertTearOffHandle();
#endif
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index eb7fc8114..7dc8424d1 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -124,7 +124,7 @@ static TQString calculate(const TQString &exp)
TQString result, cmd;
const TQString bc = KStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
- cmd = TQString("echo %1 | %2").arg(KProcess::quote(exp), KProcess::quote(bc));
+ cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(exp), TDEProcess::quote(bc));
else
cmd = TQString("echo $((%1))").arg(exp);
FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");
@@ -160,7 +160,7 @@ int base_category_id[] = {ACTIONS_ID_BASE, APP_ID_BASE, BOOKMARKS_ID_BASE, NOTES
static int used_size( TQLabel *label, int oldsize )
{
- TQSimpleRichText st( label->text(), KGlobalSettings::toolBarFont() );
+ TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() );
st.setWidth( oldsize );
return QMAX( st.widthUsed(), oldsize );
}
@@ -344,7 +344,7 @@ KMenu::KMenu()
m_kcommand->setDuplicatesEnabled( false );
m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit"));
- m_kcommand->setCompletionMode( KGlobalSettings::CompletionAuto );
+ m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto );
connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory()));
connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept()));
connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));
@@ -1353,9 +1353,9 @@ void KMenu::insertStaticItems()
m_systemView->insertItem( "folder_home", i18n( "Home Folder" ),
TQDir::homeDirPath(), "file://"+TQDir::homeDirPath(), nId++, index++ );
- if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
+ if ( KStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
{
- TQString documentPath = KGlobalSettings::documentPath();
+ TQString documentPath = TDEGlobalSettings::documentPath();
if ( documentPath.endsWith( "/" ) )
documentPath = documentPath.left( documentPath.length() - 1 );
if (documentPath!=TQDir::homeDirPath())
@@ -2083,7 +2083,7 @@ void KMenu::searchProgramList(TQString relPath)
int pos = exe.find(' ');
if (pos>0)
exe=exe.left(pos);
- m_programsInMenu+=KGlobal::dirs()->findExe(exe);
+ m_programsInMenu+=TDEGlobal::dirs()->findExe(exe);
}
}
}
@@ -2282,7 +2282,7 @@ void KMenu::doQuery (bool return_pressed)
"kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc");
int index = getHitMenuItemPosition (hit_item);
m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name,
- hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
+ hit_item->display_info, TDEGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
}
}
@@ -2321,7 +2321,7 @@ void KMenu::doQuery (bool return_pressed)
case KURIFilterData::SHELL:
case KURIFilterData::EXECUTABLE:
{
- exe = KGlobal::dirs()->findExe(filterData.uri().url());
+ exe = TDEGlobal::dirs()->findExe(filterData.uri().url());
#ifdef KDELIBS_SUSE
bool gimp_hack = false;
if (exe.endsWith("/bin/gimp")) {
@@ -2688,13 +2688,13 @@ void KMenu::slotStartURL(const TQString& u)
else {
addToHistory();
if (u.startsWith("kaddressbook:/")) {
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "kaddressbook" << "--uid" << u.mid(14);
proc->start();
accept();
return;
} else if (u.startsWith("note:/")) {
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tomboy";
*proc << "--open-note" << u;
if (!proc->start())
@@ -2892,7 +2892,7 @@ void KMenu::slotContextMenu(int selected)
KURL src,dest;
KIO::CopyJob *job;
- KProcess *proc;
+ TDEProcess *proc;
TQStringList favs = KickerSettings::favorites();
@@ -2900,15 +2900,15 @@ void KMenu::slotContextMenu(int selected)
case AddItemToDesktop:
accept();
if (m_popupService) {
- src.setPath( KGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) );
- dest.setPath( KGlobalSettings::desktopPath() );
+ src.setPath( TDEGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) );
+ dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( src.fileName() );
job = KIO::copyAs( src, dest );
job->setDefaultPermissions( true );
}
else {
- KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), KGlobalSettings::desktopPath() ) );
+ KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
df->writeEntry("GenericName", m_popupPath.description);
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", m_popupPath.path );
@@ -2933,7 +2933,7 @@ void KMenu::slotContextMenu(int selected)
case EditItem:
case EditMenu:
accept();
- proc = new KProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start();
@@ -2951,7 +2951,7 @@ void KMenu::slotContextMenu(int selected)
case AddMenuToDesktop: {
accept();
- KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),KGlobalSettings::desktopPath()));
+ KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath );
df->writeEntry( "Name", m_popupPath.title );
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 8a483f086..64f779807 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -330,7 +330,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
if ( count() > 0 && !relPath_.isEmpty() )
- if (KGlobalSettings::insertTearOffHandle())
+ if (TDEGlobalSettings::insertTearOffHandle())
insertTearOffHandle();
#endif
}
@@ -662,7 +662,7 @@ extern int kicker_screen_number;
void PanelServiceMenu::slotContextMenu(int selected)
{
- KProcess *proc;
+ TDEProcess *proc;
KService::Ptr service;
KServiceGroup::Ptr g;
TQByteArray ba;
@@ -676,8 +676,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
case AddItemToDesktop:
service = static_cast<KService *>(contextKSycocaEntry_);
- src.setPath( KGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) );
- dest.setPath( KGlobalSettings::desktopPath() );
+ src.setPath( TDEGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) );
+ dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( src.fileName() );
job = KIO::copyAs( src, dest );
@@ -694,7 +694,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditItem:
- proc = new KProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start();
@@ -713,7 +713,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
case AddMenuToDesktop:
g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
- dest.setPath( KGlobalSettings::desktopPath() );
+ dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( g->caption() );
df = new KDesktopFile( dest.path() );
@@ -738,7 +738,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditMenu:
- proc = new KProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start();
@@ -795,7 +795,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
- icon = KGlobal::iconLoader()
+ icon = TDEGlobal::iconLoader()
->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
break;
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-07 19:52:53 +0000