From 88b7febc2393324ee14940c1c41a8ddc342c35f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 25 Mar 2016 20:06:45 +0100 Subject: [PATCH] Initial TDE conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- README | 20 +++--- bab/Makefile.am | 2 +- bab/bab.desktop | 2 +- bab/bab.h | 4 +- bab/main.cpp | 56 +++++++-------- bab/styleconfdialog.cpp | 2 +- bab/styleconfdialog.h | 4 +- colorscheme/Makefile.am | 2 +- config/Makefile.am | 2 +- config/colordialog.cpp | 8 +-- config/kstyle_baghira_config.cpp | 64 ++++++++--------- config/kstyle_baghira_config.h | 12 ++-- deco/Doxyfile | 2 +- deco/Makefile.am | 20 +++--- deco/baghira.desktop | 2 +- deco/baghiraclient.cc | 14 ++-- deco/baghiraclient.h | 2 +- deco/config/Makefile.am | 14 ++-- deco/config/baghiraconfig.cc | 18 ++--- deco/config/baghiraconfig.cc.new | 18 ++--- deco/config/baghiraconfig.h | 8 +-- deco/config/baghiraconfig.h.new | 8 +-- deco/config/configdialog.ui | 2 +- deco/config/configdialog.ui.new | 2 +- kickermenu-3.3/Makefile.am | 2 +- kickermenu-3.3/b_menuapplet.desktop | 4 +- kickermenu-3.3/menuapplet.cpp | 20 +++--- kickermenu-3.3/menuapplet.h | 8 +-- kickermenu/Makefile.am | 2 +- kickermenu/configure.in.in | 2 +- kickermenu/menuapplet.cpp | 32 ++++----- kickermenu/menuapplet.h | 10 +-- sessionapplet/Makefile.am | 2 +- sessionapplet/dmctl.cpp | 22 +++--- sessionapplet/dmctl.h | 10 +-- sessionapplet/usermanager.cpp | 28 ++++---- sessionapplet/usermanager.desktop | 4 +- sessionapplet/usermanager.h | 4 +- sidebar/Makefile.am | 2 +- sidebar/baghirasidebar.cpp | 8 +-- sidebar/baghirasidebar.desktop | 2 +- sidebar/baghirasidebar.h | 6 +- sidebar/baghirasidebar_add.desktop | 2 +- sidebar/configure.in.in | 2 +- sidebar/dndlistbox.cpp | 50 ++++++------- sidebar/dndlistbox.h | 12 ++-- sidebar/linkconfig.ui | 2 +- sidebar/linkview.cpp | 8 +-- sidebar/listboxlink.cpp | 2 +- sidebar/listboxlink.h | 2 +- starter/Makefile.am | 2 +- starter/config.ui | 2 +- starter/linkconfig.ui | 2 +- starter/menu.cpp | 108 ++++++++++++++-------------- starter/menu.h | 14 ++-- starter/starter.cpp | 42 +++++------ starter/starter.desktop | 4 +- starter/starter.h | 10 +-- style/Makefile.am | 4 +- style/baghira.cpp | 74 +++++++++---------- style/baghira.h | 6 +- style/eventfilter.cpp | 12 ++-- style/optionHandler.cpp | 2 +- style/polish.cpp | 36 +++++----- style/utils.cpp | 2 +- 65 files changed, 428 insertions(+), 428 deletions(-) diff --git a/README b/README index fda5c8c..5e7c6ec 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ Installation tar -xjf baghira.tar.bz2 cd baghira/baghira either try ./install.sh or -./configure --prefix=`kde-config --prefix` --disable-debug [--enable-final] +./configure --prefix=`tde-config --prefix` --disable-debug [--enable-final] (!!!BEGINNERS: the direction of the accents is _important_ (top-left to bottom-right), the rectangular brackets mean "this is optional" - don't type them!!!) make and finally as root: @@ -123,12 +123,12 @@ as i don't have such nice access on the startmenu as the button has, its not pos * (bab) update: rewrote the way design switching stuff according to kde 3.4, removed all imperfect workaround stuff -> works much better, but needs kde 3.4 to work properly * (kickermenu) update: using XClassHint to display the appname (better than relying on the netwm info) * (kickermenu) update: using app menu instead of desktop menu for modal dialogs -* (kickermenu) note: kicker from kde 3.4 has a special menupanel that autoloads the kicker menuapplet to display the menu. you can remove this menu and readd the baghiramenu, but you'll have to do that after every kde start. -> open [kdeprefix - e.g. usr]/share/apps/kicker/applets/menuapplet.desktop, change "X-KDE-Library=menu_panelapplet" to "X-KDE-Library=b_menu_panelapplet" or (as root) run the following script (simply using sed to update the file): +* (kickermenu) note: kicker from kde 3.4 has a special menupanel that autoloads the kicker menuapplet to display the menu. you can remove this menu and readd the baghiramenu, but you'll have to do that after every kde start. -> open [kdeprefix - e.g. usr]/share/apps/kicker/applets/menuapplet.desktop, change "X-TDE-Library=menu_panelapplet" to "X-TDE-Library=b_menu_panelapplet" or (as root) run the following script (simply using sed to update the file): --------------------start--------------- #!/bin/sh -sed s/"X-KDE-Library=menu_panelapplet"/"X-KDE-Library=b_menu_panelapplet"/g $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop > _baghirabuffer_ -rm -f $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop -mv _baghirabuffer_ $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop +sed s/"X-TDE-Library=menu_panelapplet"/"X-TDE-Library=b_menu_panelapplet"/g $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop > _baghirabuffer_ +rm -f $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop +mv _baghirabuffer_ $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop ---------------------end---------------- 0.6a @@ -165,7 +165,7 @@ so the only solution i found was to disable the palette update for the toolbutto 0.5e ---- style: -- fixed the "kde toolbar widget" thing (location bar/juk slider etc.) +- fixed the "tde toolbar widget" thing (location bar/juk slider etc.) - worked around brushed metal kicker translucency support - changed the appereance of the kicker executor (like konqueror combobox) - worked around konqueror statusbar offset @@ -201,7 +201,7 @@ bab: - added some colored throbbers and an xcf so you can create your own colors - sorting headers appear colored - put the menuapplet into its own library, so it won't conflict with the kde one and is installed by default -- corrected kwin (stippled) frame to align the style +- corrected twin (stippled) frame to align the style - corercted brushed toolbars (disalignment) 0.5c @@ -217,7 +217,7 @@ anyway, i don't know since which version this holds, therefore maybe you want to Mainly kde3.3 alignments - fixed juk toolbar stuff (and any other) -- fixed new kwin buttons +- fixed new twin buttons - toplevelmenubars are not set to stipples anymore, honoring the fact, that the kicker menuapplet recolors them itself to kicker background - arrows will are dark grey rather than black - makes them appear more smooth @@ -249,7 +249,7 @@ Bab: Goodies: The stuff in this folder is not autoinstalled. Look into it and use whatever you want, however you want (except claiming cr and suing me for nonliterally copying ;) -- added new stuff: bootsplash, konqui tile, kdm picture, lilo-bootscreen +- added new stuff: bootsplash, konqui tile, tdm picture, lilo-bootscreen *** read the readme! *** 0.5a @@ -411,7 +411,7 @@ haha...! i even had some letters left ;) - bugfixed the setting stuff (misdisplayd groupboxes, ability to unset shadows under popups...) - Tab vs. Chooser is now optional o the default setting is somewhat clever, i.e. if the toplevel widget is a dialog, tabs appear as choosers, as oldstyle tabs elsewise - -> result: apps like konqueror, kdevelop, quanta, konsole... will show tabs, dialogs will show choosers + -> result: apps like konqueror, tdevelop, quanta, konsole... will show tabs, dialogs will show choosers o you can define the tab behaviour for aqua and brushed metal individually in the bab menu - fixed menu animation stuff - fixed bookmark menu behaviour (so could have told me...) diff --git a/bab/Makefile.am b/bab/Makefile.am index 7f65671..90f203a 100644 --- a/bab/Makefile.am +++ b/bab/Makefile.am @@ -19,4 +19,4 @@ bin_PROGRAMS = bab # the application source, library search path, and link libraries bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel bab_LDFLAGS = $(KDE_RPATH) $(all_libraries) -bab_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) +bab_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) diff --git a/bab/bab.desktop b/bab/bab.desktop index 534daa4..65206f5 100644 --- a/bab/bab.desktop +++ b/bab/bab.desktop @@ -5,6 +5,6 @@ Name[xx]=xxbabxx Exec=bab %i %m -caption "%c" Icon=baghira Type=Application -DocPath= +X-DocPath= Comment=Access to the big black cat Terminal=0 diff --git a/bab/bab.h b/bab/bab.h index 2727bce..6efeebd 100644 --- a/bab/bab.h +++ b/bab/bab.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include class bab; @@ -75,7 +75,7 @@ class TQCheckBox; * @author Thomas Lübking * @version 0.1 */ -class bab : public KMainWindow +class bab : public TDEMainWindow { Q_OBJECT public: diff --git a/bab/main.cpp b/bab/main.cpp index b530769..4adf380 100644 --- a/bab/main.cpp +++ b/bab/main.cpp @@ -31,17 +31,17 @@ #include #include #include -#include -// #include +#include +// #include #include -#include -#include +#include +#include #include #include -#include +#include #include #if KDE_IS_VERSION(3,4,0) -#include +#include #endif #include #include @@ -54,20 +54,20 @@ static const char description[] = static const char version[] = "cvs"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open." ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { - KAboutData about("bab", I18N_NOOP("BAB - Baghira Aqua/Brushed Switcher"), version, description, - KAboutData::License_GPL, "(C) 2004/2005 Thomas Lübking", 0, 0, "baghira-style@gmx.net"); + TDEAboutData about("bab", I18N_NOOP("BAB - Baghira Aqua/Brushed Switcher"), version, description, + TDEAboutData::License_GPL, "(C) 2004/2005 Thomas Lübking", 0, 0, "baghira-style@gmx.net"); about.addAuthor( "Thomas Lübking", 0, "baghira-style@gmx.net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); + TDEApplication app; DCOPClient* client = app.dcopClient(); client->registerAs( "bab", false); client->setDefaultObject( "babInterface" ); @@ -94,7 +94,7 @@ int main(int argc, char **argv) } -bab::bab() : KMainWindow(0,"bab",TQt::WStyle_StaysOnTop | TQt::WX11BypassWM ){ +bab::bab() : TDEMainWindow(0,"bab",TQt::WStyle_StaysOnTop | TQt::WX11BypassWM ){ bSwitcher = new BabSwitcher(this,"switcher"); TQToolTip::add(bSwitcher, i18n("leftclick toggles state
rightclick toggles setupmenu")); bSwitcher->show(); @@ -195,7 +195,7 @@ bab::~ bab() if (bSwitcher) delete bSwitcher; } -/*Taken from kcontrol, kcmshell style*/ +/*Taken from kcontrol, tdecmshell style*/ void bab::configureBaghira() { @@ -235,7 +235,7 @@ void bab::configureBaghira() TQObject *decoObject = 0; if (tw) { - KLibrary* library2 = loader->library( TQFile::encodeName("kwin_baghira_config") ); + KLibrary* library2 = loader->library( TQFile::encodeName("twin_baghira_config") ); if (!library2) { tqWarning("There was an error loading the configuration dialog for the deco."); @@ -247,7 +247,7 @@ void bab::configureBaghira() tqWarning("There was an error loading the configuration dialog for this style."); return; } - typedef TQObject*(* factoryRoutine2)( KConfig* conf, TQWidget* parent ); + typedef TQObject*(* factoryRoutine2)( TDEConfig* conf, TQWidget* parent ); factoryRoutine2 factory2 = (factoryRoutine2)(allocPtr2); decoObject = factory2( 0, tw ); decoConfig = (TQWidget*)tw->child("ConfigDialog"); @@ -266,7 +266,7 @@ void bab::configureBaghira() connect(dial, SIGNAL(defaults()), styleConfig, SLOT(defaults())); connect(dial, SIGNAL(save()), styleConfig, SLOT(save())); connect(dial, SIGNAL(defaults()), decoObject, SLOT(defaults())); - connect(dial, SIGNAL(save(KConfig*)), decoObject, SLOT(save(KConfig*))); + connect(dial, SIGNAL(save(TDEConfig*)), decoObject, SLOT(save(TDEConfig*))); if (dial->exec() == TQDialog::Accepted) { @@ -277,7 +277,7 @@ void bab::configureBaghira() KIPC::sendMessageAll(KIPC::ToolbarStyleChanged); } if (dial->isDecoDirty()) - kapp->dcopClient()->send("kwin", "KWinInterface", "reconfigure()", TQByteArray()); + kapp->dcopClient()->send("twin", "KWinInterface", "reconfigure()", TQByteArray()); } tw->removeChild( decoObject ); dial->insertChild( decoObject ); @@ -322,7 +322,7 @@ void bab::showEvent(TQShowEvent *e){ void bab::saveSettings(){ TQSettings *config = new TQSettings(); -// KConfig *config = new KConfig("baghirarc"); +// TDEConfig *config = new TDEConfig("baghirarc"); config->beginGroup("/baghira/BAB"); config->writeEntry("defaultState", DefStyle->currentItem()); config->writeEntry("roundCorners", cornerCheck->isChecked()); @@ -334,12 +334,12 @@ TQPoint *BabSwitcher::globalPos = new TQPoint(0,0); BabSwitcher::BabSwitcher(bab *parent, const char *name) : KSystemTray(parent,name), DCOPObject("babInterface") { - KIconLoader* iLoader = KGlobal::iconLoader(); - JaguarIcon = iLoader->loadIcon("bab_jaguar", KIcon::Small, 22); - PantherIcon = iLoader->loadIcon("bab_panther", KIcon::Small, 22); - iTunesIcon = iLoader->loadIcon("bab_itunes", KIcon::Small, 22); - TigerIcon = iLoader->loadIcon("bab_tiger", KIcon::Small, 22); - MilkIcon = iLoader->loadIcon("bab_milk", KIcon::Small, 22); + TDEIconLoader* iLoader = TDEGlobal::iconLoader(); + JaguarIcon = iLoader->loadIcon("bab_jaguar", TDEIcon::Small, 22); + PantherIcon = iLoader->loadIcon("bab_panther", TDEIcon::Small, 22); + iTunesIcon = iLoader->loadIcon("bab_itunes", TDEIcon::Small, 22); + TigerIcon = iLoader->loadIcon("bab_tiger", TDEIcon::Small, 22); + MilkIcon = iLoader->loadIcon("bab_milk", TDEIcon::Small, 22); installEventFilter(this); } @@ -462,7 +462,7 @@ TQString BabSwitcher::deco() void BabSwitcher::start(TQString name, TQString settings) { - KProcess proc; + TDEProcess proc; TQString section; int i = 0; bool done = false; if (name.contains(' ')) { @@ -491,7 +491,7 @@ void BabSwitcher::start(TQString name, TQString settings) symlink (tmpString.latin1(), tmpString2.latin1()); proc << name; } - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); proc.detach(); } diff --git a/bab/styleconfdialog.cpp b/bab/styleconfdialog.cpp index e78cc46..5ab768d 100644 --- a/bab/styleconfdialog.cpp +++ b/bab/styleconfdialog.cpp @@ -19,7 +19,7 @@ */ #include "styleconfdialog.h" -#include +#include StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName): KDialogBase(parent, "StyleConfigDialog", diff --git a/bab/styleconfdialog.h b/bab/styleconfdialog.h index c4d8fc8..4eed340 100644 --- a/bab/styleconfdialog.h +++ b/bab/styleconfdialog.h @@ -23,7 +23,7 @@ #include -class KConfig; +class TDEConfig; class StyleConfigDialog: public KDialogBase { Q_OBJECT @@ -43,7 +43,7 @@ private slots: signals: void defaults(); void save(); - void save(KConfig*); + void save(TDEConfig*); private: bool m_styleDirty; diff --git a/colorscheme/Makefile.am b/colorscheme/Makefile.am index 1949d7d..be6e6d1 100644 --- a/colorscheme/Makefile.am +++ b/colorscheme/Makefile.am @@ -1,3 +1,3 @@ -lnkdir = $(kde_datadir)/kdisplay/color-schemes +lnkdir = $(kde_datadir)/tdedisplay/color-schemes lnk_DATA = AquaBlue.kcsrc AquaGraphite.kcsrc EXTRA_DIST = $(lnk_DATA) diff --git a/config/Makefile.am b/config/Makefile.am index 4c8bc59..fb84c20 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kstyle_baghira_config.la kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui # kstyle_baghira_config_la_METASOURCES = AUTO -kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) +kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN) diff --git a/config/colordialog.cpp b/config/colordialog.cpp index 38279c8..3ad5504 100644 --- a/config/colordialog.cpp +++ b/config/colordialog.cpp @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include "colorpicker.h" @@ -45,7 +45,7 @@ ColorDialog::ColorDialog(TQWidget* parent, const char* name) : TQDialog( parent, TQVBoxLayout *topRight = new TQVBoxLayout(top); TQLabel *info = new TQLabel("Select custom colors or grab directly from screen.
Click image left to switch between items.",this); topRight->addWidget(info); - TQIconSet icon = KGlobal::iconLoader()->loadIconSet("colorpicker", KIcon::Small); + TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("colorpicker", TDEIcon::Small); buttonCP = new TQPushButton(icon, TQString::null, this); topRight->addWidget(buttonCP); TQLabel *lb = new TQLabel("From other app:",this); @@ -74,7 +74,7 @@ ColorDialog::ColorDialog(TQWidget* parent, const char* name) : TQDialog( parent, picker[High]->setColor(colorGroup().highlight()); picker[HighText]->setColor(colorGroup().highlightedText()); picker[ButText]->setColor(colorGroup().buttonText ()); - picker[Alternate]->setColor(KGlobalSettings::alternateBackgroundColor()); + picker[Alternate]->setColor(TDEGlobalSettings::alternateBackgroundColor()); for (int i = 0; i < NUMCOLORS; i++) picker[i]->blockSignals(false); // demo->repaint(false); diff --git a/config/kstyle_baghira_config.cpp b/config/kstyle_baghira_config.cpp index 337e810..ad43805 100644 --- a/config/kstyle_baghira_config.cpp +++ b/config/kstyle_baghira_config.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include //#include // #include @@ -37,20 +37,20 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include @@ -66,8 +66,8 @@ //#define VERSION "0.7" -#ifndef KDE_VERSION_STRING -#define KDE_VERSION_STRING "error" +#ifndef TDE_VERSION_STRING +#define TDE_VERSION_STRING "error" #endif #ifndef TQT_BUILD_KEY #define TQT_BUILD_KEY "error error error error" @@ -105,24 +105,24 @@ void kstyle_baghira_config::openHtml1() { TQStringList args; args << "exec" << "http://baghira.sf.net/"; - kapp->kdeinitExec("kfmclient", args); + kapp->tdeinitExec("kfmclient", args); } void kstyle_baghira_config::openHtml2() { TQStringList args; args << "exec" << "http://www.sf.net/projects/baghira/files/"; - kapp->kdeinitExec("kfmclient", args); + kapp->tdeinitExec("kfmclient", args); } void kstyle_baghira_config::startBab() { - kapp->kdeinitExec("bab"); + kapp->tdeinitExec("bab"); } void kstyle_baghira_config::startKRuler() { - kapp->kdeinitExec("kruler"); + kapp->tdeinitExec("kruler"); } TQImage* kstyle_baghira_config::tintButton(TQImage &src, TQColor c) @@ -296,7 +296,7 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name, TQWidget *rulesWidget = new TQWidget(dialog_->tabWidget); TQHBoxLayout *rwlh = new TQHBoxLayout(rulesWidget); - applist = new KListView(rulesWidget); + applist = new TDEListView(rulesWidget); applist->setFullWidth(true); #if KDE_IS_VERSION(3,3,91) applist->setShadeSortColumn(false); @@ -314,9 +314,9 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name, { TQFileInfo FI = TQFileInfo(d, d[i]); if (FI.isSymLink()) - applist->insertItem(new KListViewItem(applist, d[i], FI.readLink().section('/',-1,-1))); + applist->insertItem(new TDEListViewItem(applist, d[i], FI.readLink().section('/',-1,-1))); else - applist->insertItem(new KListViewItem(applist, d[i])); + applist->insertItem(new TDEListViewItem(applist, d[i])); } } rwlh->addWidget(applist); @@ -351,7 +351,7 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name, help_ = new Help(dialog_); about_ = new About(dialog_); about_->versionLabel->setText(VERSION); - about_->kdeLabel->setText(KDE_VERSION_STRING); + about_->kdeLabel->setText(TDE_VERSION_STRING); crCurrent = 0; crNotes[0] = "© 2003-2005 by Thomas Lübking
http://baghira.SourceForge.net"; crNotes[1] = "© \"Design\" 2001-2005 by Apple inc.
http://www.apple.com"; @@ -481,7 +481,7 @@ void kstyle_baghira_config::load() void kstyle_baghira_config::load(TQString &fileName) { - KConfig *config = new KConfig(fileName); + TDEConfig *config = new TDEConfig(fileName); // TQSettings config; config->setGroup("BAB"); // general Design @@ -576,7 +576,7 @@ void kstyle_baghira_config::load(TQString &fileName) config->setGroup("Sidebar"); delete config; - config = new KConfig("kdeglobals"); + config = new TDEConfig("kdeglobals"); config->setGroup( "Toolbar style" ); dialog_->toolbuttonHighColor->setColor(config->readColorEntry("HighlightColor", new TQColor(103,141,178)) ); delete config; @@ -666,7 +666,7 @@ void kstyle_baghira_config::save() void kstyle_baghira_config::changeTooluttonHighlightColor(const TQColor & color) { - KConfig *config = new KConfig("kdeglobals"); + TDEConfig *config = new TDEConfig("kdeglobals"); config->setGroup( "Toolbar style" ); config->writeEntry("HighlightColor", color); delete config; @@ -684,7 +684,7 @@ void kstyle_baghira_config::handleButtonStyles(int i) void kstyle_baghira_config::save(TQString &fileName) { // TQSettings *config = new TQSettings; - KConfig *config = new KConfig(fileName); + TDEConfig *config = new TDEConfig(fileName); config->setGroup("BAB"); //General Design config->writeEntry("defaultState", dialog_->defaultStyle->currentItem()); @@ -739,15 +739,15 @@ Hidden=true\n\ Type=Plugin\n\ Encoding=UTF-8\n\ Name=BaghiraMenu\n\ -X-KDE-Library=b_menu_panelapplet\n\ -X-KDE-UniqueApplet=true\n"; +X-TDE-Library=b_menu_panelapplet\n\ +X-TDE-UniqueApplet=true\n"; file.writeBlock( msg, tqstrlen(msg) ); file.close(); } else file.remove(); if (dialog_->replaceMenubar->isOn() != menuReplaced) - KApplication::dcopClient()->send("kicker", "default", "restart()", ""); + TDEApplication::dcopClient()->send("kicker", "default", "restart()", ""); //Srollbars config->writeEntry("Special_AnimateSlider", dialog_->animateSlider->isOn()); config->writeEntry("Special_ShadowSlider", dialog_->shadowSlider->isOn()); @@ -868,7 +868,7 @@ void kstyle_baghira_config::removeApp(TQString name) void kstyle_baghira_config::addApp(TQString string, TQString linkString) { - applist->insertItem(new KListViewItem(applist, string, linkString)); + applist->insertItem(new TDEListViewItem(applist, string, linkString)); applist->sort(); } @@ -950,13 +950,13 @@ void kstyle_baghira_config::menuToggled(bool active) { if (!active || !loadDone) return; - KConfigGroup menuConfig(KGlobal::config(), "KDE"); + TDEConfigGroup menuConfig(TDEGlobal::config(), "KDE"); if (!menuConfig.readBoolEntry("macStyle", false)) if (KMessageBox::questionYesNo(0, i18n("You just selected to replace kickers menu applet for the Mac like Menubar on top of the screen, but the Mac like style isn't selected anyway
Do you want to activate it now?"), 0L, KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { - KProcess proc; - proc << "kcmshell" << "desktopbehavior"; - proc.start(KProcess::DontCare); + TDEProcess proc; + proc << "tdecmshell" << "desktopbehavior"; + proc.start(TDEProcess::DontCare); proc.detach(); } configChanged(); @@ -1179,7 +1179,7 @@ void AppSetter::resetColorPicker() colorDialog->picker[High]->setColor(colorGroup().highlight()); colorDialog->picker[HighText]->setColor(colorGroup().highlightedText()); colorDialog->picker[ButText]->setColor(colorGroup().buttonText ()); - colorDialog->picker[Alternate]->setColor(KGlobalSettings::alternateBackgroundColor()); + colorDialog->picker[Alternate]->setColor(TDEGlobalSettings::alternateBackgroundColor()); for (int i = 0; i < 8; i++) colorDialog->picker[i]->blockSignals(false); ((TQWidget*)colorDialog->demo)->repaint(false); diff --git a/config/kstyle_baghira_config.h b/config/kstyle_baghira_config.h index df97cc3..8b5afe1 100644 --- a/config/kstyle_baghira_config.h +++ b/config/kstyle_baghira_config.h @@ -21,15 +21,15 @@ #ifndef _KSTYLE_BAGHIRA_CONFIG_H_ #define _KSTYLE_BAGHIRA_CONFIG_H_ -//#include +//#include #include #include -#include +#include #include "configdialog.h" #include "help.h" #include "about.h" -class KListView; +class TDEListView; class TQPushButton; class AppSetter; class TQTimer; @@ -50,7 +50,7 @@ public: void save(TQString &fileName); // virtual int buttons(); virtual TQString quickHelp() const; - virtual const KAboutData *aboutData()const + virtual const TDEAboutData *aboutData()const { return myAboutData; }; public slots: @@ -78,11 +78,11 @@ protected: private: TQString crNotes[3]; AppSetter *appsetter; - KListView *applist; + TDEListView *applist; TQImage* tintButton(TQImage &src, TQColor c); TQImage* tintBrush( TQImage &img, TQColor c/*, int saturation*/ ); WId findWindow(); - KAboutData *myAboutData; + TDEAboutData *myAboutData; Config *dialog_; Help* help_; About* about_; diff --git a/deco/Doxyfile b/deco/Doxyfile index f90d99c..52f7355 100644 --- a/deco/Doxyfile +++ b/deco/Doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = baghira_deco.kdevelop +PROJECT_NAME = baghira_deco.tdevelop PROJECT_NUMBER = $VERSION$ OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English diff --git a/deco/Makefile.am b/deco/Makefile.am index 7b55ace..a30efed 100644 --- a/deco/Makefile.am +++ b/deco/Makefile.am @@ -4,22 +4,22 @@ SUBDIRS = config KDE_CXXFLAGS = -DQT_PLUGIN -INCLUDES = $(all_includes) -I$(kde_includes)/kwin +INCLUDES = $(all_includes) -I$(kde_includes)/twin -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = baghira.desktop +twindir = $(kde_datadir)/twin/ +twin_DATA = baghira.desktop -EXTRA_DIST = $(kwin_DATA) images +EXTRA_DIST = $(twin_DATA) images noinst_HEADERS = baghiraclient.h pixmaps.h masks.h -kde_module_LTLIBRARIES = kwin3_baghira.la -kwin3_baghira_la_SOURCES = baghiraclient.cc -kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la -kwin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module -kwin3_baghira_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = twin3_baghira.la +twin3_baghira_la_SOURCES = baghiraclient.cc +twin3_baghira_la_LIBADD = $(kde_libraries)/libtdecorations.la +twin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -module +twin3_baghira_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES) +DISTCLEANFILES = $(twin3_baghira_la_METASOURCES) pixmaps.h: $(srcdir)/generatePixmaps.sh $(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir) diff --git a/deco/baghira.desktop b/deco/baghira.desktop index 1514386..13d90b4 100644 --- a/deco/baghira.desktop +++ b/deco/baghira.desktop @@ -2,4 +2,4 @@ [Desktop Entry] Encoding=UTF-8 Name=Baghira -X-KDE-Library=kwin3_baghira +X-TDE-Library=twin3_baghira diff --git a/deco/baghiraclient.cc b/deco/baghiraclient.cc index ca5eb37..68e1d58 100644 --- a/deco/baghiraclient.cc +++ b/deco/baghiraclient.cc @@ -7,14 +7,14 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -// #include -#include -#include +// #include +#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -370,7 +370,7 @@ unsigned long BaghiraFactory::readConfig() { TQSettings config; config.beginGroup("/baghira/Style"); -// KConfig config( "baghirarc" ); +// TDEConfig config( "baghirarc" ); // config.setGroup( "Style" ); bgStipple_ = config.readBoolEntry( "Design_StippleBackground", false); contrast_ = config.readNumEntry( "Design_StippleContrast", 30 ); diff --git a/deco/baghiraclient.h b/deco/baghiraclient.h index 28c4963..1105e09 100644 --- a/deco/baghiraclient.h +++ b/deco/baghiraclient.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include /* #define BUTTONSIZE 15; #define MENUBUTTONWIDTH 20; diff --git a/deco/config/Makefile.am b/deco/config/Makefile.am index 9352822..08e3ea3 100644 --- a/deco/config/Makefile.am +++ b/deco/config/Makefile.am @@ -6,16 +6,16 @@ INCLUDES = $(all_includes) -I$(srcdir)/../../config noinst_HEADERS = baghiraconfig.h aquariusbutton.h colorpicker.h pixmaps.h -kde_module_LTLIBRARIES = kwin_baghira_config.la -kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui -kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -kwin_baghira_config_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = twin_baghira_config.la +twin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui +twin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +twin_baghira_config_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES) +DISTCLEANFILES = $(twin_baghira_config_la_METASOURCES) messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_baghira_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_baghira_config.pot pixmaps.h: $(srcdir)/generatePixmaps.sh $(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir) diff --git a/deco/config/baghiraconfig.cc b/deco/config/baghiraconfig.cc index 711105c..23faf15 100644 --- a/deco/config/baghiraconfig.cc +++ b/deco/config/baghiraconfig.cc @@ -7,9 +7,9 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include #include #include @@ -38,13 +38,13 @@ // ------------- // Constructor -BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent) +BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent) : TQObject(parent), /*config_(0),*/ dialog_(0) { -// config_ = new KConfig("baghirarc"); +// config_ = new TDEConfig("baghirarc"); // config_ = new TQSettings; // config_->beginGroup("/baghira/Deco"); - KGlobal::locale()->insertCatalogue("kwin_baghira_config"); + TDEGlobal::locale()->insertCatalogue("twin_baghira_config"); dialog_ = new ConfigDialog(parent); buttonDialog_ = new ButtonColors(parent, "Button Colors"); @@ -162,7 +162,7 @@ BaghiraConfig::~BaghiraConfig() // ------ // Load configuration data -void BaghiraConfig::load(KConfig*) +void BaghiraConfig::load(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -279,7 +279,7 @@ void BaghiraConfig::load(KConfig*) // ------ // Save configuration data -void BaghiraConfig::save(KConfig*) +void BaghiraConfig::save(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -721,7 +721,7 @@ void ButtonColors::init(){ extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return(new BaghiraConfig(config, parent)); } } diff --git a/deco/config/baghiraconfig.cc.new b/deco/config/baghiraconfig.cc.new index 2f35515..5c64932 100644 --- a/deco/config/baghiraconfig.cc.new +++ b/deco/config/baghiraconfig.cc.new @@ -7,9 +7,9 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include #include #include @@ -39,13 +39,13 @@ // ------------- // Constructor -BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent) +BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent) : TQObject(parent), /*config_(0),*/ dialog_(0) { -// config_ = new KConfig("baghirarc"); +// config_ = new TDEConfig("baghirarc"); // config_ = new TQSettings; // config_->beginGroup("/baghira/Deco"); - KGlobal::locale()->insertCatalogue("kwin_baghira_config"); + TDEGlobal::locale()->insertCatalogue("twin_baghira_config"); dialog_ = new ConfigDialog(parent); buttonDialog_ = new ButtonColors(parent, "Button Colors"); @@ -163,7 +163,7 @@ BaghiraConfig::~BaghiraConfig() // ------ // Load configuration data -void BaghiraConfig::load(KConfig*) +void BaghiraConfig::load(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -280,7 +280,7 @@ void BaghiraConfig::load(KConfig*) // ------ // Save configuration data -void BaghiraConfig::save(KConfig*) +void BaghiraConfig::save(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -722,7 +722,7 @@ void ButtonColors::init(){ extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return(new BaghiraConfig(config, parent)); } } diff --git a/deco/config/baghiraconfig.h b/deco/config/baghiraconfig.h index af16605..649c086 100644 --- a/deco/config/baghiraconfig.h +++ b/deco/config/baghiraconfig.h @@ -32,7 +32,7 @@ #include "colorpicker.h" #include "aquariusbutton.h" -class KConfig; +class TDEConfig; class TQSettings; class ConfigDialog; class TQLabel; @@ -124,15 +124,15 @@ class BaghiraConfig : public TQObject { Q_OBJECT public: - BaghiraConfig(KConfig* config, TQWidget* parent); + BaghiraConfig(TDEConfig* config, TQWidget* parent); ~BaghiraConfig(); signals: void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); private: diff --git a/deco/config/baghiraconfig.h.new b/deco/config/baghiraconfig.h.new index edffcc9..6bab1a8 100644 --- a/deco/config/baghiraconfig.h.new +++ b/deco/config/baghiraconfig.h.new @@ -33,7 +33,7 @@ #include "colorpicker.h" #include "aquariusbutton.h" -class KConfig; +class TDEConfig; class TQSettings; class ConfigDialog; class TQLabel; @@ -126,15 +126,15 @@ class BaghiraConfig : public TQObject { Q_OBJECT public: - BaghiraConfig(KConfig* config, TQWidget* parent); + BaghiraConfig(TDEConfig* config, TQWidget* parent); ~BaghiraConfig(); signals: void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); private: diff --git a/deco/config/configdialog.ui b/deco/config/configdialog.ui index 9ecbf2e..f4e148a 100644 --- a/deco/config/configdialog.ui +++ b/deco/config/configdialog.ui @@ -123,7 +123,7 @@ Draw Comic Frame - Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the kwin dropshadow patch. + Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the twin dropshadow patch. diff --git a/deco/config/configdialog.ui.new b/deco/config/configdialog.ui.new index bd812d8..ffb33bd 100644 --- a/deco/config/configdialog.ui.new +++ b/deco/config/configdialog.ui.new @@ -211,7 +211,7 @@ from multipart titles Draw Comic Frame - Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the kwin dropshadow patch. + Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the twin dropshadow patch. diff --git a/kickermenu-3.3/Makefile.am b/kickermenu-3.3/Makefile.am index ad5542d..02eebb0 100644 --- a/kickermenu-3.3/Makefile.am +++ b/kickermenu-3.3/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = b_menuapplet.desktop EXTRA_DIST = $(lnk_DATA) b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) +b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot diff --git a/kickermenu-3.3/b_menuapplet.desktop b/kickermenu-3.3/b_menuapplet.desktop index 6328532..036a004 100644 --- a/kickermenu-3.3/b_menuapplet.desktop +++ b/kickermenu-3.3/b_menuapplet.desktop @@ -5,5 +5,5 @@ Comment=Applet embedding standalone menubars (Patched baghira version) Icon=menu -X-KDE-Library=b_menu_panelapplet -X-KDE-UniqueApplet=true +X-TDE-Library=b_menu_panelapplet +X-TDE-UniqueApplet=true diff --git a/kickermenu-3.3/menuapplet.cpp b/kickermenu-3.3/menuapplet.cpp index e508c48..4b43223 100644 --- a/kickermenu-3.3/menuapplet.cpp +++ b/kickermenu-3.3/menuapplet.cpp @@ -30,15 +30,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include @@ -63,7 +63,7 @@ extern "C" { KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) { - KGlobal::locale()->insertCatalogue("kmenuapplet"); + TDEGlobal::locale()->insertCatalogue("kmenuapplet"); return new KickerMenuApplet::Applet( configFile_P, parent_P ); } } @@ -120,7 +120,7 @@ Applet::~Applet() delete selection; delete selection_watcher; delete module; - KGlobal::locale()->removeCatalogue("kmenuapplet"); + TDEGlobal::locale()->removeCatalogue("kmenuapplet"); } void Applet::initPopup() @@ -428,7 +428,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */) void Applet::claimSelection() { assert( selection == NULL ); - selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); + selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); // force taking the selection, but don't kill previous owner if( selection->claim( true, false )) { @@ -464,7 +464,7 @@ void Applet::lostSelection() active_menu = NULL; if( selection_watcher == NULL ) { - selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); + selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection())); } delete module; @@ -476,7 +476,7 @@ void Applet::lostSelection() void Applet::readSettings() { - KConfig cfg( "kdesktoprc", true ); + TDEConfig cfg( "kdesktoprc", true ); cfg.setGroup( "Menubar" ); desktop_menu = cfg.readBoolEntry( "ShowMenubar", false ); cfg.setGroup( "KDE" ); diff --git a/kickermenu-3.3/menuapplet.h b/kickermenu-3.3/menuapplet.h index 915a033..782d922 100644 --- a/kickermenu-3.3/menuapplet.h +++ b/kickermenu-3.3/menuapplet.h @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include -#include +#include +#include #include #include #include @@ -80,8 +80,8 @@ class Applet : public KPanelApplet, public DCOPObject TQValueList< MenuEmbed* > menus; MenuEmbed* active_menu; KArrowButton grow_indicator_left, grow_indicator_right; - KSelectionOwner* selection; - KSelectionWatcher* selection_watcher; + TDESelectionOwner* selection; + TDESelectionWatcher* selection_watcher; bool desktop_menu; DCOPClient dcopclient; // to show current active window (not necessary equal to the menubar) diff --git a/kickermenu/Makefile.am b/kickermenu/Makefile.am index db40fed..9906626 100644 --- a/kickermenu/Makefile.am +++ b/kickermenu/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = menuapplet.h b_menu_panelapplet_la_METASOURCES = AUTO b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) +b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot diff --git a/kickermenu/configure.in.in b/kickermenu/configure.in.in index 72f8843..29a7674 100644 --- a/kickermenu/configure.in.in +++ b/kickermenu/configure.in.in @@ -1,2 +1,2 @@ -AM_CONDITIONAL( HAVE_3_4, test $(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 ) +AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 ) diff --git a/kickermenu/menuapplet.cpp b/kickermenu/menuapplet.cpp index 6ff5d75..f82e2c3 100644 --- a/kickermenu/menuapplet.cpp +++ b/kickermenu/menuapplet.cpp @@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include // avoid X11 #define's -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -67,7 +67,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) { - KGlobal::locale()->insertCatalogue("kmenuapplet"); + TDEGlobal::locale()->insertCatalogue("kmenuapplet"); return new KickerMenuApplet::Applet( configFile_P, parent_P ); } } @@ -87,7 +87,7 @@ const long SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::Do Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApplet( configFile_P, Normal, 0, parent_P, "menuapplet" ), DCOPObject( "menuapplet" ), module( NULL ), active_menu( NULL ), selection( NULL ), selection_watcher( NULL ), desktop_menu( false ), topEdgeOffset( 0 ) { - KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); config.setGroup("Menubar"); _maxWidth = config.readNumEntry("Width", TQDesktopWidget().availableGeometry().width()); _menuMover = new TQLabel("<<|>>", this ); @@ -103,7 +103,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple windowList = new KWindowListMenu(windowIndicator); connect(windowList, SIGNAL(aboutToShow()), this, SLOT(initPopup())); windowIndicator->insertItem( "KDE", windowList, 0); - TQFont tmpFont = KGlobalSettings::menuFont(); + TQFont tmpFont = TDEGlobalSettings::menuFont(); windowIndicator->setFont(tmpFont); // windowIndicator->adjustSize(); // int tmpHeight = windowIndicator->height(); @@ -117,7 +117,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple //============== // toolbarAppearanceChanged(int) is sent when changing macstyle connect( kapp, SIGNAL( toolbarAppearanceChanged( int )), this, SLOT( readSettings())); - connect( kapp, SIGNAL( kdisplayFontChanged()), this, SLOT( fontChanged())); + connect( kapp, SIGNAL( tdedisplayFontChanged()), this, SLOT( fontChanged())); claimSelection(); readSettings(); updateTopEdgeOffset(); @@ -129,14 +129,14 @@ Applet::~Applet() delete selection; delete selection_watcher; delete module; - KGlobal::locale()->removeCatalogue("kmenuapplet"); + TDEGlobal::locale()->removeCatalogue("kmenuapplet"); } void Applet::fontChanged() { if (!windowIndicator) return; - TQFont tmpFont = KGlobalSettings::menuFont(); + TQFont tmpFont = TDEGlobalSettings::menuFont(); // windowIndicator->setFont(tmpFont); // windowIndicator->adjustSize(); // int tmpHeight = windowIndicator->height(); @@ -504,7 +504,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */) void Applet::claimSelection() { assert( selection == NULL ); - selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); + selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); // force taking the selection, but don't kill previous owner if( selection->claim( true, false )) { @@ -536,7 +536,7 @@ void Applet::lostSelection() active_menu = NULL; if( selection_watcher == NULL ) { - selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); + selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection())); } delete module; @@ -548,7 +548,7 @@ void Applet::lostSelection() void Applet::readSettings() { - KConfig cfg( "kdesktoprc", true ); + TDEConfig cfg( "kdesktoprc", true ); cfg.setGroup( "Menubar" ); desktop_menu = cfg.readBoolEntry( "ShowMenubar", false ); cfg.setGroup( "KDE" ); diff --git a/kickermenu/menuapplet.h b/kickermenu/menuapplet.h index facd256..dea5481 100644 --- a/kickermenu/menuapplet.h +++ b/kickermenu/menuapplet.h @@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -85,8 +85,8 @@ private: KWinModule* module; TQValueList< MenuEmbed* > menus; MenuEmbed* active_menu; - KSelectionOwner* selection; - KSelectionWatcher* selection_watcher; + TDESelectionOwner* selection; + TDESelectionWatcher* selection_watcher; bool desktop_menu; DCOPClient dcopclient; int topEdgeOffset; diff --git a/sessionapplet/Makefile.am b/sessionapplet/Makefile.am index 4472c36..322517d 100644 --- a/sessionapplet/Makefile.am +++ b/sessionapplet/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = usermanager_panelapplet.la usermanager_panelapplet_la_SOURCES = usermanager.cpp dmctl.cpp usermanager_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) -usermanager_panelapplet_la_LIBADD = $(LIB_KDEUI) +usermanager_panelapplet_la_LIBADD = $(LIB_TDEUI) usermanager_DATA = usermanager.desktop usermanagerdir = $(kde_datadir)/kicker/applets diff --git a/sessionapplet/dmctl.cpp b/sessionapplet/dmctl.cpp index eb7fc7c..788f537 100644 --- a/sessionapplet/dmctl.cpp +++ b/sessionapplet/dmctl.cpp @@ -21,7 +21,7 @@ #ifdef Q_WS_X11 -#include +#include #include #include @@ -91,16 +91,16 @@ DM::exec( const char *cmd ) } /** - * Execute a KDM remote control command. + * Execute a TDM remote control command. * @param cmd the command to execute. FIXME: undocumented yet. * @param ret the result buffer. * @return result: * @li If true, the command was successfully executed. * @p ret might contain addional results. * @li If false and @p ret is empty, a communication error occurred - * (most probably KDM is not running). + * (most probably TDM is not running). * @li If false and @p ret is non-empty, it contains the error message - * from KDM. + * from TDM. */ bool DM::exec( const char *cmd, TQCString &buf ) @@ -157,24 +157,24 @@ DM::canShutdown() } void -DM::shutdown( KApplication::ShutdownType shutdownType, - KApplication::ShutdownMode shutdownMode, +DM::shutdown( TDEApplication::ShutdownType shutdownType, + TDEApplication::ShutdownMode shutdownMode, const TQString &bootOption ) { if (!bootOption.isEmpty() && DMType != NewKDM) return; - if (shutdownType != KApplication::ShutdownTypeNone) { + if (shutdownType != TDEApplication::ShutdownTypeNone) { TQCString cmd( "shutdown\t" ); - cmd.append( shutdownType == KApplication::ShutdownTypeReboot ? + cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ? "reboot\t" : "halt\t" ); if (!bootOption.isNull()) cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" ); - cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ? + cmd.append( shutdownMode == TDEApplication::ShutdownModeInteractive ? "ask\n" : - shutdownMode == KApplication::ShutdownModeForceNow ? + shutdownMode == TDEApplication::ShutdownModeForceNow ? "forcenow\n" : - shutdownMode == KApplication::ShutdownModeTryNow ? + shutdownMode == TDEApplication::ShutdownModeTryNow ? "trynow\n" : "schedule\n" ); exec( cmd.data() ); } diff --git a/sessionapplet/dmctl.h b/sessionapplet/dmctl.h index a8328d2..f8ce2c2 100644 --- a/sessionapplet/dmctl.h +++ b/sessionapplet/dmctl.h @@ -21,7 +21,7 @@ #ifndef DMCTL_H #define DMCTL_H -#include +#include struct SessEnt { TQString display, from, user, session; @@ -40,8 +40,8 @@ public: ~DM(); bool canShutdown(); - void shutdown( KApplication::ShutdownType shutdownType, - KApplication::ShutdownMode shutdownMode, + void shutdown( TDEApplication::ShutdownType shutdownType, + TDEApplication::ShutdownMode shutdownMode, const TQString &bootOption = TQString::null ); void setLock( bool on ); @@ -70,8 +70,8 @@ public: DM() {} bool canShutdown() { return false; } - void shutdown( KApplication::ShutdownType shutdownType, - KApplication::ShutdownMode shutdownMode, + void shutdown( TDEApplication::ShutdownType shutdownType, + TDEApplication::ShutdownMode shutdownMode, const TQString &bootOption = TQString::null ) {} void setLock( bool ) {} diff --git a/sessionapplet/usermanager.cpp b/sessionapplet/usermanager.cpp index 107d9b8..01c05d8 100644 --- a/sessionapplet/usermanager.cpp +++ b/sessionapplet/usermanager.cpp @@ -19,25 +19,25 @@ ***************************************************************************/ #include -#include +#include // #include #include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include "dmctl.h" #include "usermanager.h" -#define _ICONSET_(i) KGlobal::iconLoader()->loadIconSet(i, KIcon::Small, 0, false) +#define _ICONSET_(i) TDEGlobal::iconLoader()->loadIconSet(i, TDEIcon::Small, 0, false) UserManager::UserManager(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) @@ -66,7 +66,7 @@ UserManager::UserManager(const TQString& configFile, Type type, int actions, TQW // languages langPopup = new TQPopupMenu(this); - KConfigBase *config = KGlobal::config(); + TDEConfigBase *config = TDEGlobal::config(); config->setGroup("Locale"); langList = config->readListEntry ("Language", ':'); // TQString flag( locate( "locale", TQString::fromLatin1( "l10n/%1/flag.png" ).arg(langList[0]) ) ); @@ -123,14 +123,14 @@ void UserManager::logout() void UserManager::slotPopulateLanguages() { langPopup->clear(); - KConfig *config = new KConfig("kdeglobals"); + TDEConfig *config = new TDEConfig("kdeglobals"); config->setGroup("Locale"); langList = config->readListEntry ("Language", ':'); int i = 0; for ( TQStringList::ConstIterator it = langList.begin(); it != langList.end(); ++it ) { - KConfig entry(locate( "locale", TQString::fromLatin1( "%1/entry.desktop" ).arg(*it) )); + TDEConfig entry(locate( "locale", TQString::fromLatin1( "%1/entry.desktop" ).arg(*it) )); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", i18n("without name")); @@ -147,7 +147,7 @@ void UserManager::slotLanguageActivated( int i ) return; // no change, no action menu->changeItem ( 1, '[' + langList[i].section('_',0,0) + ']'/**langPopup->pixmap(i)*/ ); // langLabel->setPixmap(*langPopup->pixmap(i)); - KConfig *config = new KConfig("kdeglobals"); + TDEConfig *config = new TDEConfig("kdeglobals"); config->setGroup("Locale"); TQString tmp = langList[i]; langList.remove(langList.at(i)); @@ -193,7 +193,7 @@ void UserManager::slotPopulateSessions() } // save sessionPopup->insertSeparator(); - KConfig ksmserver("ksmserverrc", false, false); + TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { @@ -275,7 +275,7 @@ extern "C" { KPanelApplet* init( TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("usermanager"); + TDEGlobal::locale()->insertCatalogue("usermanager"); return new UserManager(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "usermanager"); } } diff --git a/sessionapplet/usermanager.desktop b/sessionapplet/usermanager.desktop index 31c61cf..51dc8a2 100644 --- a/sessionapplet/usermanager.desktop +++ b/sessionapplet/usermanager.desktop @@ -4,5 +4,5 @@ Comment=Session Control, Lock, Logout, Change Name=SessionManager Name[xx]=xxSessionManagerxx Icon=fork -X-KDE-Library=usermanager_panelapplet -X-KDE-UniqueApplet = true +X-TDE-Library=usermanager_panelapplet +X-TDE-UniqueApplet = true diff --git a/sessionapplet/usermanager.h b/sessionapplet/usermanager.h index 80357ec..4767d4f 100644 --- a/sessionapplet/usermanager.h +++ b/sessionapplet/usermanager.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include class KMenuBar; class TQPopunMenu; @@ -63,7 +63,7 @@ protected: void doNewSession(bool lock_); private: - KConfig *ksConfig; + TDEConfig *ksConfig; TQWidget *mainView; KMenuBar *menu; TQPopupMenu *sessionPopup; diff --git a/sidebar/Makefile.am b/sidebar/Makefile.am index aef9a69..d0e6040 100644 --- a/sidebar/Makefile.am +++ b/sidebar/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = baghiralinkdrag.h baghirasidebar.h linkview.h listboxlink.h dnd konqsidebar_baghirasidebar_la_SOURCES = baghiralinkdrag.cpp baghirasidebar.cpp linkview.cpp listboxlink.cpp dndlistbox.cpp linkconfig.ui baghirasidebariface.skel konqsidebar_baghirasidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin -konqsidebar_baghirasidebar_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KFILE) +konqsidebar_baghirasidebar_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_KFILE) baghirasidebar_entry_DATA = baghirasidebar.desktop baghirasidebar_entrydir = $(kde_datadir)/konqsidebartng/entries diff --git a/sidebar/baghirasidebar.cpp b/sidebar/baghirasidebar.cpp index e24ebdf..e5f6f69 100644 --- a/sidebar/baghirasidebar.cpp +++ b/sidebar/baghirasidebar.cpp @@ -9,7 +9,7 @@ #include "baghirasidebar.h" #include "baghirasidebar.moc" -baghiraSidebar::baghiraSidebar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +baghiraSidebar::baghiraSidebar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { scrollView = new LinkView(widgetParent); @@ -36,7 +36,7 @@ void baghiraSidebar::handleURL(const KURL &url) scrollView->Hardware()->setSelected(item, FALSE); return; } - item = scrollView->Locations()->KListBox::currentItem(); + item = scrollView->Locations()->TDEListBox::currentItem(); if (scrollView->Locations()->isSelected(item) && KURL(((ListBoxLink*)(scrollView->Locations()->item(item)))->URL()).url() != url.url() ) { @@ -53,7 +53,7 @@ extern "C" { map->insert("Icon", "bab_brushed"); map->insert("Name", "Baghira Sidebar"); map->insert("Open", "true"); - map->insert("X-KDE-KonqSidebarModule","konqsidebar_baghirasidebar"); + map->insert("X-TDE-KonqSidebarModule","konqsidebar_baghirasidebar"); fn->setLatin1("baghirasidebar%1.desktop"); return true; } @@ -61,7 +61,7 @@ extern "C" { extern "C" { - void* create_konqsidebar_baghirasidebar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + void* create_konqsidebar_baghirasidebar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new baghiraSidebar(instance,par,widp,desktopname,name); } diff --git a/sidebar/baghirasidebar.desktop b/sidebar/baghirasidebar.desktop index ba6b560..fb413a9 100644 --- a/sidebar/baghirasidebar.desktop +++ b/sidebar/baghirasidebar.desktop @@ -8,5 +8,5 @@ Name=baghirasidebar Name[xx]=xxbaghirasidebarxx Open=false -X-KDE-KonqSidebarModule=konqsidebar_baghirasidebar +X-TDE-KonqSidebarModule=konqsidebar_baghirasidebar diff --git a/sidebar/baghirasidebar.h b/sidebar/baghirasidebar.h index d0b9929..7591cf7 100644 --- a/sidebar/baghirasidebar.h +++ b/sidebar/baghirasidebar.h @@ -7,10 +7,10 @@ #endif #include -#include +#include class LinkView; -class KListBox; +class TDEListBox; class TQListBoxItem; class baghiraSidebar : public KonqSidebarPlugin @@ -27,7 +27,7 @@ public: * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - baghiraSidebar(KInstance *inst,TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name=0); + baghiraSidebar(TDEInstance *inst,TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~baghiraSidebar(); diff --git a/sidebar/baghirasidebar_add.desktop b/sidebar/baghirasidebar_add.desktop index 634b658..e7083ca 100644 --- a/sidebar/baghirasidebar_add.desktop +++ b/sidebar/baghirasidebar_add.desktop @@ -7,4 +7,4 @@ Name[de]=Baghira Sideabr hinzuf Open=false Type=Link URL= -X-KDE-KonqSidebarAddModule=konqsidebar_baghirasidebar +X-TDE-KonqSidebarAddModule=konqsidebar_baghirasidebar diff --git a/sidebar/configure.in.in b/sidebar/configure.in.in index 72f8843..29a7674 100644 --- a/sidebar/configure.in.in +++ b/sidebar/configure.in.in @@ -1,2 +1,2 @@ -AM_CONDITIONAL( HAVE_3_4, test $(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 ) +AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 ) diff --git a/sidebar/dndlistbox.cpp b/sidebar/dndlistbox.cpp index 4f8928d..aac7484 100644 --- a/sidebar/dndlistbox.cpp +++ b/sidebar/dndlistbox.cpp @@ -4,17 +4,17 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include "listboxlink.h" #include "linkconfig.h" @@ -37,12 +37,12 @@ #define MEDIA_PROPS 12 #define MEDIALIST_PROPS 13 -ResizingLinkBox::ResizingLinkBox( TQWidget * parent, const char * name, WFlags f ) : KListBox( parent, name, f) +ResizingLinkBox::ResizingLinkBox( TQWidget * parent, const char * name, WFlags f ) : TDEListBox( parent, name, f) { - KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); config.setGroup("Sidebar"); size_ = config.readNumEntry (TQString(name) + "_IconSize", 48); - popupMenu = new KPopupMenu; + popupMenu = new TDEPopupMenu; popupMenu->insertTitle (i18n("Icon Size"),122,122); popupMenu->insertItem("16x16", this, SLOT(setIconSize(int)),0,16,123); popupMenu->insertItem("22x22", this, SLOT(setIconSize(int)),0,22,124); @@ -54,14 +54,14 @@ ResizingLinkBox::ResizingLinkBox( TQWidget * parent, const char * name, WFlags f void ResizingLinkBox::insertItem( const TQListBoxItem *lbi, int index ) { - KListBox::insertItem( lbi, index ); + TDEListBox::insertItem( lbi, index ); if (height() <= numRows()*itemHeight()) emit itemNumberChanged(TRUE); } void ResizingLinkBox::insertItem( const TQListBoxItem *lbi, const TQListBoxItem *after ) { - KListBox::insertItem( lbi, after ); + TDEListBox::insertItem( lbi, after ); if (height() <= numRows()*itemHeight()) emit itemNumberChanged(TRUE); } @@ -75,7 +75,7 @@ void ResizingLinkBox::insertItem( const TQString & icon, const TQString & title, void ResizingLinkBox::removeItem( int index ) { blockSignals ( true ); - KListBox::removeItem(index); + TDEListBox::removeItem(index); blockSignals ( false ); emit itemNumberChanged(FALSE); } @@ -83,7 +83,7 @@ void ResizingLinkBox::removeItem( int index ) void ResizingLinkBox::setIconSize(int size) { size_ = size; - KConfig *config = new KConfig(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig *config = new TDEConfig(TQDir::homeDirPath() + "/.qt/baghirarc"); config->setGroup("Sidebar"); config->writeEntry (TQString(name()) + "_IconSize", size); config->sync(); @@ -102,14 +102,14 @@ void ResizingLinkBox::setIconSize(int size) { insertItem( new ListBoxLink(runner->icon(), size, runner->text(), runner->URL()), i ); } - KListBox::removeItem(i+1); + TDEListBox::removeItem(i+1); } blockSignals ( false ); } void ResizingLinkBox::mousePressEvent ( TQMouseEvent *mpe ) { - KListBox::mousePressEvent( mpe ); + TDEListBox::mousePressEvent( mpe ); } void ResizingLinkBox::mouseReleaseEvent ( TQMouseEvent *mpe ) @@ -118,27 +118,27 @@ void ResizingLinkBox::mouseReleaseEvent ( TQMouseEvent *mpe ) { ListBoxLink *link = (ListBoxLink*)itemAt(mpe->pos()); if (isSelected(link)) emit clicked(link); - KListBox::mousePressEvent( mpe ); + TDEListBox::mousePressEvent( mpe ); return; } - KListBox::mouseReleaseEvent( mpe ); + TDEListBox::mouseReleaseEvent( mpe ); } void ResizingLinkBox::contentsWheelEvent ( TQWheelEvent * we ) { if (we->state() == TQt::ControlButton) - KListBox::contentsWheelEvent ( we ); + TDEListBox::contentsWheelEvent ( we ); else emit scrolled(0, -we->delta()); } MediaListBox::MediaListBox( TQWidget * parent, const char * name, WFlags f ) : ResizingLinkBox(parent, name, f), DCOPObject("BaghiraSidebarIface") { - KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); config.setGroup("Sidebar"); hiddenDevices = config.readListEntry("HiddenDevices"); currentFloppy = 0L; - devicePopup = new KPopupMenu(this); + devicePopup = new TDEPopupMenu(this); devicePopup->setCheckable ( true ); popupMenu->insertItem(i18n("Device List"), devicePopup, 1, 0); popupMenu->insertSeparator( 0 ); @@ -151,7 +151,7 @@ MediaListBox::MediaListBox( TQWidget * parent, const char * name, WFlags f ) : R insertItem(new ListBoxDevice("network", size_, i18n("Network"), "lan:/localhost", "", "", TRUE, FALSE, FALSE)); #endif insertItem(new ListBoxDevice("hdd_mount", size_, i18n("Startvolume"), TQDir::rootDirPath(), "", "", TRUE, FALSE, FALSE)); - client = KApplication::dcopClient(); + client = TDEApplication::dcopClient(); client->connectDCOPSignal("kded", "mediamanager", "mediumAdded(TQString)", "BaghiraSidebarIface", "mediumAdded(TQString)", FALSE); client->connectDCOPSignal("kded", "mediamanager", "mediumRemoved(TQString)", "BaghiraSidebarIface", "mediumRemoved(const TQString)", FALSE); client->connectDCOPSignal("kded", "mediamanager", "mediumChanged(TQString)", "BaghiraSidebarIface", "mediumChanged(TQString)", FALSE); @@ -206,7 +206,7 @@ MediaListBox::~MediaListBox() ListBoxDevice *runner; for ( runner = deviceList.first(); runner; runner = deviceList.next() ) hiddenDevices.append(runner->name()); - KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); config.setGroup("Sidebar"); config.writeEntry("HiddenDevices", hiddenDevices); } @@ -221,9 +221,9 @@ void MediaListBox::kfloppy() { if (currentFloppy) { - KProcess proc; + TDEProcess proc; proc << "kfloppy" << currentFloppy->mountPoint(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); proc.detach(); currentFloppy = 0L; } @@ -433,11 +433,11 @@ void MediaListBox::mousePressEvent ( TQMouseEvent *mpe ) int dy = itemRect(device).y(); if ((device->removable() || device->ejectable()) && device->mounted() && mpe->y() > dy+11 && mpe->y() < dy+33) { - KProcess proc; + TDEProcess proc; device->ejectable()? proc << "kdeeject" /*<< "-q"*/ << device->mountPoint(): proc << "umount" << device->mountPoint(); // umount? - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); proc.detach(); return; } diff --git a/sidebar/dndlistbox.h b/sidebar/dndlistbox.h index 25e6e85..1bd25e2 100644 --- a/sidebar/dndlistbox.h +++ b/sidebar/dndlistbox.h @@ -6,7 +6,7 @@ #include #endif -#include +#include #include #include #include "baghirasidebariface.h" @@ -18,13 +18,13 @@ class TQDragLeaveEvent; class TQDropEvent; class TQKeyEvent; class TQPoint; -class KPopupMenu; +class TDEPopupMenu; class LinkConfig; class ListBoxLink; class ListBoxDevice; class TQResizeEvent; -class ResizingLinkBox : public KListBox +class ResizingLinkBox : public TDEListBox { Q_OBJECT @@ -51,7 +51,7 @@ protected: void mousePressEvent ( TQMouseEvent * ); void mouseReleaseEvent ( TQMouseEvent * ); void contentsWheelEvent ( TQWheelEvent * ); - KPopupMenu *popupMenu; + TDEPopupMenu *popupMenu; uint size_; private slots: void setIconSize(int); @@ -76,7 +76,7 @@ protected: void mousePressEvent ( TQMouseEvent * ); void resizeEvent ( TQResizeEvent * ); private: - KPopupMenu *devicePopup; + TDEPopupMenu *devicePopup; DCOPClient *client; ListBoxDevice *currentFloppy; typedef TQPtrList DeviceList; @@ -108,7 +108,7 @@ protected: void dropEvent ( TQDropEvent * ); void startDrag(); private: - ListBoxLink *currentItem; //TODO: unshadow int KListBox::currentItem() + ListBoxLink *currentItem; //TODO: unshadow int TDEListBox::currentItem() LinkConfig *dialog; bool dragging_; void pasteURL(int mode, TQListBoxItem *after = 0); diff --git a/sidebar/linkconfig.ui b/sidebar/linkconfig.ui index db753bc..f387f47 100644 --- a/sidebar/linkconfig.ui +++ b/sidebar/linkconfig.ui @@ -124,7 +124,7 @@ - + icon diff --git a/sidebar/linkview.cpp b/sidebar/linkview.cpp index fa9223b..23b6cbe 100644 --- a/sidebar/linkview.cpp +++ b/sidebar/linkview.cpp @@ -2,9 +2,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "dndlistbox.h" #include "listboxlink.h" @@ -144,7 +144,7 @@ void LinkView::loadLinks() { if (!locations) return; - KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc"); config.setGroup("Sidebar"); splitter->setSizes(config.readIntListEntry ("Sizes")); loadedLinks = (uint)config.readNumEntry("NumLinks", 0); @@ -174,7 +174,7 @@ void LinkView::saveLinks() { if (!locations) return; - KConfig *config = new KConfig(TQDir::homeDirPath() + "/.qt/baghirarc"); + TDEConfig *config = new TDEConfig(TQDir::homeDirPath() + "/.qt/baghirarc"); config->setGroup("Sidebar"); config->writeEntry("Sizes", splitter->sizes()); config->writeEntry("NumLinks", (int)locations->count()); diff --git a/sidebar/listboxlink.cpp b/sidebar/listboxlink.cpp index 484fa12..87c1f82 100644 --- a/sidebar/listboxlink.cpp +++ b/sidebar/listboxlink.cpp @@ -9,7 +9,7 @@ static TQBitmap eject = TQBitmap( eject_width, eject_height, eject_bits, true ); static TQBitmap locked = TQBitmap( lock_width, lock_height, lock_bits, true ); -ListBoxLink::ListBoxLink( const TQString & icon, uint size, const TQString & title, const TQString & url): TQListBoxPixmap(KGlobal::iconLoader()->loadIcon(icon, KIcon::Desktop, size), title),url_(url),icon_(icon) +ListBoxLink::ListBoxLink( const TQString & icon, uint size, const TQString & title, const TQString & url): TQListBoxPixmap(TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Desktop, size), title),url_(url),icon_(icon) { } diff --git a/sidebar/listboxlink.h b/sidebar/listboxlink.h index f5664e0..25b587a 100644 --- a/sidebar/listboxlink.h +++ b/sidebar/listboxlink.h @@ -8,7 +8,7 @@ #include -class KListBox; +class TDEListBox; class TQPainter; class TQPixmap; class TQStringList; diff --git a/starter/Makefile.am b/starter/Makefile.am index 6fee0e8..bf43641 100644 --- a/starter/Makefile.am +++ b/starter/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libbaghirastarter.la libbaghirastarter_la_SOURCES = baghiralinkdrag.cpp menu.cpp starter.cpp starterconfig.ui starterhelp.ui config.ui help.ui linkconfig.ui starteriface.skel libbaghirastarter_la_LDFLAGS = -module -avoid-version $(all_libraries) -libbaghirastarter_la_LIBADD = -lXtst $(LIB_KDEUI) +libbaghirastarter_la_LIBADD = -lXtst $(LIB_TDEUI) starter_DATA = starter.desktop starterdir = $(kde_datadir)/kicker/applets diff --git a/starter/config.ui b/starter/config.ui index 6fb994d..279974e 100644 --- a/starter/config.ui +++ b/starter/config.ui @@ -176,7 +176,7 @@ genericName - + iconButton diff --git a/starter/linkconfig.ui b/starter/linkconfig.ui index 8f949f6..4da1c42 100644 --- a/starter/linkconfig.ui +++ b/starter/linkconfig.ui @@ -80,7 +80,7 @@ - + icon diff --git a/starter/menu.cpp b/starter/menu.cpp index 5e33a71..cae0206 100644 --- a/starter/menu.cpp +++ b/starter/menu.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -10,31 +10,31 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include -#include +#include #include #include -#include +#include //WARNING: THIS IS NOT PORTABLE! // #include // #include @@ -63,7 +63,7 @@ static TQColor commentColor; static TQColor infoColor; -static KConfig *config; +static TDEConfig *config; static bool useKTTS; @@ -92,8 +92,8 @@ StartMenuButton::StartMenuButton( int size, TQString icon, TQString title, TQStr { setBackgroundOrigin(TQWidget::ParentOrigin); int bigSize = _BIGSIZE_(size); - m_pix = KGlobal::iconLoader()->loadIcon(icon, KIcon::Desktop, size); - m_hoverPix = KGlobal::iconLoader()->loadIcon(icon, KIcon::Desktop, bigSize); + m_pix = TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Desktop, size); + m_hoverPix = TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Desktop, bigSize); m_pixmapLabel = new TQLabel(this, name); m_pixmapLabel->setPixmap(m_pix); m_pixmapLabel->setBackgroundOrigin(TQWidget::AncestorOrigin); @@ -143,8 +143,8 @@ void StartMenuButton::reloadIcon(int size) if (m_orientation == Status) setFixedSize(bigSize+2,bigSize+2); m_pixmapLabel->setFixedSize(bigSize+2,bigSize+2); - m_pix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, size); - m_hoverPix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, bigSize); + m_pix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, size); + m_hoverPix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, bigSize); m_pixmapLabel->setPixmap(m_pix); } @@ -247,8 +247,8 @@ void StartMenuButton::edit() m_icon = ((Panel*)parentWidget())->linkConfigDialog->icon->icon(); m_title = ((Panel*)parentWidget())->linkConfigDialog->title->text(); int bigSize = _BIGSIZE_(((Panel*)parentWidget())->_size); - m_pix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, ((Panel*)parentWidget())->_size); - m_hoverPix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, bigSize); + m_pix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, ((Panel*)parentWidget())->_size); + m_hoverPix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, bigSize); m_pixmapLabel->setPixmap(m_pix); if (m_orientation == Horizontal || m_orientation == Vertical) m_titleLabel->setText("" + m_title + ""); @@ -337,8 +337,8 @@ StartMenuEntry::StartMenuEntry(KService * service, TQString relPath, int size, b m_service = service; exec = m_service->exec(); display = false; - m_pix = m_service->pixmap( KIcon::Desktop, size ); - m_hoverPix = m_service->pixmap( KIcon::Desktop, bigSize ); + m_pix = m_service->pixmap( TDEIcon::Desktop, size ); + m_hoverPix = m_service->pixmap( TDEIcon::Desktop, bigSize ); m_titleLabel = new TQLabel("

" + m_service->name() + "

", this); m_titleLabel->setTextFormat( TQt::RichText ); m_commentLabel = new TQLabel(m_service->comment(), this); @@ -366,8 +366,8 @@ void StartMenuEntry::reloadIcon(int size) { int bigSize = _BIGSIZE_(size); m_pixmapLabel->setFixedSize(bigSize+2,bigSize+2); - m_pix = m_service->pixmap( KIcon::Desktop, size ); - m_hoverPix = m_service->pixmap( KIcon::Desktop, bigSize ); + m_pix = m_service->pixmap( TDEIcon::Desktop, size ); + m_hoverPix = m_service->pixmap( TDEIcon::Desktop, bigSize ); m_pixmapLabel->setPixmap(m_pix); } @@ -494,26 +494,26 @@ void StartMenuEntry::focusInEvent ( TQFocusEvent * ) TQString text = i18n("for TTS output, telling which item is focussed (keyboard) and than reads the comment", "%1 focussed. %2").arg(m_titleLabel->text()).arg(m_commentLabel->text()); emit sayText(text); } - setPaletteBackgroundColor(KGlobalSettings::highlightColor()); - m_commentLabel->setPaletteBackgroundColor(KGlobalSettings::highlightColor()); - setPaletteForegroundColor(KGlobalSettings::highlightedTextColor()); - m_commentLabel->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor()); + setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); + m_commentLabel->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); + setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor()); + m_commentLabel->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor()); } void StartMenuEntry::focusOutEvent ( TQFocusEvent * ) { emit unhovered(); isCurrent = false; - setPaletteBackgroundColor(KGlobalSettings::baseColor()); - m_commentLabel->setPaletteBackgroundColor(KGlobalSettings::baseColor()); + setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); + m_commentLabel->setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); if (hasMouse()) { - setPaletteForegroundColor(KGlobalSettings::highlightColor()); - m_commentLabel->setPaletteForegroundColor(KGlobalSettings::highlightColor()); + setPaletteForegroundColor(TDEGlobalSettings::highlightColor()); + m_commentLabel->setPaletteForegroundColor(TDEGlobalSettings::highlightColor()); } else { - setPaletteForegroundColor(KGlobalSettings::textColor()); + setPaletteForegroundColor(TDEGlobalSettings::textColor()); m_commentLabel->setPaletteForegroundColor(commentColor); } } @@ -528,8 +528,8 @@ void StartMenuEntry::enterEvent( TQEvent * ) } if (!isCurrent) { - setPaletteForegroundColor(KGlobalSettings::highlightColor()); - m_commentLabel->setPaletteForegroundColor(KGlobalSettings::highlightColor()); + setPaletteForegroundColor(TDEGlobalSettings::highlightColor()); + m_commentLabel->setPaletteForegroundColor(TDEGlobalSettings::highlightColor()); } m_pixmapLabel->setPixmap(m_hoverPix); } @@ -539,7 +539,7 @@ void StartMenuEntry::leaveEvent( TQEvent * ) emit unhovered(); if (!isCurrent) { - setPaletteForegroundColor(KGlobalSettings::textColor()); + setPaletteForegroundColor(TDEGlobalSettings::textColor()); m_commentLabel->setPaletteForegroundColor(commentColor); } m_pixmapLabel->setPixmap(m_pix); @@ -550,7 +550,7 @@ void StartMenuEntry::execute() usage++; lastUse = TQDate::currentDate(); rank = 8 + usage; - KApplication::startServiceByDesktopPath(m_service->desktopEntryPath(), TQStringList(), 0, 0, 0, "", true); + TDEApplication::startServiceByDesktopPath(m_service->desktopEntryPath(), TQStringList(), 0, 0, 0, "", true); emit executed(); } @@ -558,7 +558,7 @@ Panel::Panel(int size, TQWidget * parent, const char * name) : TQWidget(parent, { linkConfigDialog = new LinkConfig(); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); -// setPaletteBackgroundColor(KGlobalSettings::highlightColor()); +// setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); setAcceptDrops(true); config->setGroup("Panel"); TQStringList commands = config->readListEntry("Commands", '§'); @@ -582,7 +582,7 @@ Panel::Panel(int size, TQWidget * parent, const char * name) : TQWidget(parent, } } -void Panel::save(KConfig *config) +void Panel::save(TDEConfig *config) { config->setGroup("Panel"); TQObjectList *kids = const_cast(children()); @@ -1087,7 +1087,7 @@ AppList::AppList(int size, TQWidget * parent) : TQScrollView(parent), _size(size connect (((TQObject*)configDialog_->buttonCancel), SIGNAL(clicked()), this, SLOT(unblockPopup())); m_widget = new TQFrame(viewport()); m_widget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - m_widget->setPaletteBackgroundColor(KGlobalSettings::baseColor()); + m_widget->setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); addChild(m_widget,0,0); setResizePolicy(TQScrollView::AutoOneFit); m_widget->show(); @@ -1097,8 +1097,8 @@ AppList::AppList(int size, TQWidget * parent) : TQScrollView(parent), _size(size infoLabel->setTextFormat( TQt::RichText ); infoLayout->addWidget(infoLabel); m_VLayout = new TQVBoxLayout(infoLayout); - m_iconLoader = KGlobal::iconLoader(); - m_popup = new KPopupMenu(this); + m_iconLoader = TDEGlobal::iconLoader(); + m_popup = new TDEPopupMenu(this); m_popup->insertItem(i18n("Edit Entry"), this, SLOT(editDialog())); m_popup->insertItem(i18n("Remove Entry"), this, SLOT(removeEntry())); m_popup->insertSeparator(); @@ -1149,7 +1149,7 @@ void AppList::addDialog() configDialog_->startAsUser->setChecked( false ); configDialog_->username->clear(); configDialog_->workingDir->clear(); - configDialog_->shortcut->setShortcut(KShortcut::null(), false); + configDialog_->shortcut->setShortcut(TDEShortcut::null(), false); configDialog_->setCaption ( i18n("New Entry") ); ((TQWidget*)(configDialog_->extendedGroup))->hide(); @@ -1250,7 +1250,7 @@ void AppList::editEntry() sme->lastUse = lu; sme->usage = u; sme->rank = 8 + u - lu.daysTo(TQDate::currentDate()); - if (!config) config = new KConfig("bStarter", false, false); + if (!config) config = new TDEConfig("bStarter", false, false); config->setGroup("Statistics"); sme->saveStats(); delete config; @@ -1262,7 +1262,7 @@ void AppList::editEntry() void AppList::writeEntry(TQString path, bool hidden ) { - KConfig *config = new KConfig(path); + TDEConfig *config = new TDEConfig(path); config->setDesktopGroup(); if (!configDialog_->description->text().isEmpty()) @@ -1297,9 +1297,9 @@ void AppList::writeEntry(TQString path, bool hidden ) config->writeEntry("Type", "Application"); if (configDialog_->startAsUser->isChecked()) { - config->writeEntry("X-KDE-SubstituteUID", true); + config->writeEntry("X-TDE-SubstituteUID", true); if (!configDialog_->username->text().isEmpty()) - config->writeEntry("X-KDE-Username", configDialog_->username->text()); + config->writeEntry("X-TDE-Username", configDialog_->username->text()); } delete config; @@ -1364,14 +1364,14 @@ void AppList::init() insertGroup(m_root, captions, paths); paths.sort(); configDialog_->category->insertStringList(paths); - configDialog_->category->completionObject()->setCompletionMode( KGlobalSettings::CompletionPopupAuto ); + configDialog_->category->completionObject()->setCompletionMode( TDEGlobalSettings::CompletionPopupAuto ); configDialog_->category->completionObject()->insertItems(paths); // if (config) { delete config; config = 0L; } sort(); reset(); } -void AppList::save(KConfig *config) +void AppList::save(TDEConfig *config) { config->setGroup("Statistics"); TQPtrListIterator it(entryList); @@ -1714,7 +1714,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent, { m_panelPos = StartMenu::Nowhere; panelLayout = new TQGridLayout ( this, 3, 3 ); - config = new KConfig("bStarter", true, false); + config = new TDEConfig("bStarter", true, false); config->setGroup("Shell"); history = config->readListEntry("History"); config->setGroup("Settings"); @@ -1722,8 +1722,8 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent, m_spokenText = 0; _filterData = new KURIFilterData(); int r,g,b,r2,g2,b2; - KGlobalSettings::baseColor().getRgb(&r,&g,&b); - KGlobalSettings::textColor().getRgb(&r2,&g2,&b2); + TDEGlobalSettings::baseColor().getRgb(&r,&g,&b); + TDEGlobalSettings::textColor().getRgb(&r2,&g2,&b2); commentColor.setRgb((r+r2)/2,(g+g2)/2,(b+b2)/2); infoColor.setRgb((3*r+r2)/4,(3*g+g2)/4,(3*b+b2)/4); currentHistoryItem = history.end(); @@ -1732,7 +1732,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent, TQHBoxLayout *headerLayout = new TQHBoxLayout(header, 5, 3); userButton = new StartMenuButton(_size, "folder_home", TQString(getenv("USER")), "~", StartMenuButton::Status, header, "_B_ALI_HEADER"); headerLayout->addWidget(userButton); - header->setPaletteBackgroundColor(KGlobalSettings::highlightColor()); + header->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); connect (userButton, SIGNAL(pressed(const TQString &)), this, SLOT(execute(const TQString &))); connect (userButton, SIGNAL(pressed(const TQString &)), this, SLOT(close())); TQBoxLayout *mainLayout = new TQVBoxLayout(); @@ -1754,7 +1754,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent, categoryCombo->setEditable ( true ); categoryCombo->setInsertionPolicy(TQComboBox::NoInsertion); searchLine->installEventFilter(this); - searchLine->setCompletionMode(KGlobalSettings::CompletionAuto); + searchLine->setCompletionMode(TDEGlobalSettings::CompletionAuto); config->setGroup("Shortcuts"); // read shortcuts... TQStringList cuts = config->readListEntry ("Shortcuts", ','); @@ -1813,7 +1813,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent, void StartMenu::save() { - config = new KConfig("bStarter", false, false); + config = new TDEConfig("bStarter", false, false); config->setGroup("Shell"); TQStringList lst; for ( TQStringList::Iterator it = history.begin(); it != history.end(); ++it ) @@ -2050,7 +2050,7 @@ void StartMenu::execute(const TQString& command) _filterData->setData( command.stripWhiteSpace() ); TQStringList filters; - filters << "kurisearchfilter" << "kshorturifilter"; + filters << "kurisearchfilter" << "tdeshorturifilter"; KURIFilter::self()->filterURI( *(_filterData), filters ); TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url()); diff --git a/starter/menu.h b/starter/menu.h index c858a07..98a6e63 100644 --- a/starter/menu.h +++ b/starter/menu.h @@ -19,7 +19,7 @@ #include #include "mykey.h" -class KIconLoader; +class TDEIconLoader; class TQPaintEvent; class TQMouseEvent; class TQEvent; @@ -27,7 +27,7 @@ class TQPixmap; class TQVBoxLayout; class TQComboBox; class StartMenuButton; -class KConfig; +class TDEConfig; class LinkConfig; class Panel : public TQWidget//TQScrollView @@ -42,7 +42,7 @@ public: void setOrientation ( Orientation o ); // void addItem ( TQWidget *w ); StartMenuButton* addIcon ( TQString icon, TQString title, TQString command, TQPoint pt = TQPoint(-1,-1) ); - void save(KConfig* config); + void save(TDEConfig* config); void repositionIcon ( StartMenuButton* bt, TQPoint pt ); void ensureVisible(TQRect & rect); void reloadIcons(int size); @@ -176,7 +176,7 @@ signals: void executed(); }; -class KPopupMenu; +class TDEPopupMenu; class ConfigDialog; class HelpDialog; @@ -210,21 +210,21 @@ public slots: protected: TQStringList categories; int favItemAmount; - void save(KConfig* config); + void save(TDEConfig* config); void mouseReleaseEvent ( TQMouseEvent * e ); void windowActivationChange ( bool oldActive ); private: void init(); void insertGroup(KServiceGroup *g, TQStringList & captions, TQStringList & paths); KServiceGroup::Ptr m_root; - KIconLoader *m_iconLoader; + TDEIconLoader *m_iconLoader; TQLabel *infoLabel; TQVBoxLayout * infoLayout; TQVBoxLayout * m_VLayout; TQFrame * m_widget; bool newbie; TQStringList neewbieApps; - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; bool popupBlocked_; int _size; typedef TQSortedList StartMenuEntryList; diff --git a/starter/starter.cpp b/starter/starter.cpp index d7e8d83..e411b77 100644 --- a/starter/starter.cpp +++ b/starter/starter.cpp @@ -2,12 +2,12 @@ #include #include #include -#include -#include -#include -#include -#include -# include +#include +#include +#include +#include +#include +# include #include #include #include @@ -38,14 +38,14 @@ starter::starter(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : DCOPObject("StarterIface"), KPanelApplet(configFile, type, actions, parent, name) { - configPopup = new KPopupMenu(this); + configPopup = new TDEPopupMenu(this); popupBlocked = false; mainView = new TQLabel(this); configDialog = new StarterConfig(this); TQRect desktop = TQDesktopWidget().availableGeometry( configDialog ); configDialog->move((desktop.width() - configDialog->width())/2, (desktop.height() - configDialog->height())/2); - KConfig config("bStarter", false, false); + TDEConfig config("bStarter", false, false); config.setGroup("Settings"); configDialog->buttonShortcut->setEnabled(false); configDialog->BaseURL->setURL(config.readEntry("BaseImage", "" )); @@ -79,7 +79,7 @@ starter::starter(const TQString& configFile, Type type, int actions, TQWidget *p //--- connect(configDialog->categoryList, SIGNAL(highlighted(int)), this, SLOT(activateShortcutButton(int))); - connect(configDialog->buttonShortcut, SIGNAL(capturedShortcut (const KShortcut &)), this, SLOT(addShortcut(const KShortcut &))); + connect(configDialog->buttonShortcut, SIGNAL(capturedShortcut (const TDEShortcut &)), this, SLOT(addShortcut(const TDEShortcut &))); connect(configDialog->categoryList, SIGNAL(highlighted ( const TQString & )), this, SLOT(updateShortcutButton(const TQString &))); connect(configDialog->buttonOk, SIGNAL(clicked()), this, SLOT(updateSettings())); StarterHelp *helpDialog = new StarterHelp(configDialog); @@ -102,7 +102,7 @@ void starter::activateShortcutButton(int i) configDialog->buttonShortcut->setEnabled(bool(i)); } -void starter::addShortcut(const KShortcut &cut) +void starter::addShortcut(const TDEShortcut &cut) { // in case of empty shortcut, remove the entry from the list and return if (!short(cut.keyCodeQt())) @@ -114,7 +114,7 @@ void starter::addShortcut(const KShortcut &cut) shortcutList.remove(it); break; } - configDialog->buttonShortcut->setShortcut(KShortcut::null(), false); + configDialog->buttonShortcut->setShortcut(TDEShortcut::null(), false); return; } // generate MyKey @@ -162,11 +162,11 @@ void starter::updateShortcutButton(const TQString & category) { TQKeyEvent qke( TQEvent::KeyPress, it.key().key(), 0, it.key().modFlags()); KKey kkey(&qke); - KShortcut ksc(kkey); + TDEShortcut ksc(kkey); configDialog->buttonShortcut->setShortcut(ksc, false); return; } - configDialog->buttonShortcut->setShortcut(KShortcut::null(), false); + configDialog->buttonShortcut->setShortcut(TDEShortcut::null(), false); } starter::~starter() @@ -176,7 +176,7 @@ starter::~starter() void starter::updateSettings() { startMenu->updateShortcuts(shortcutList); - KConfig *config = new KConfig("bStarter", false, false); + TDEConfig *config = new TDEConfig("bStarter", false, false); config->setGroup("Settings"); config->writeEntry("BaseImage", configDialog->BaseURL->url()); config->writeEntry("HoverImage", configDialog->HoverURL->url()); @@ -222,12 +222,12 @@ void starter::updateSettings() void starter::reloadImages() { - KIconLoader* iLoader = KGlobal::iconLoader(); + TDEIconLoader* iLoader = TDEGlobal::iconLoader(); TQString pth; if (_VALID_(BaseURL)) pth = configDialog->BaseURL->url(); else - pth = iLoader->iconPath("bStarter", KIcon::Small, true); + pth = iLoader->iconPath("bStarter", TDEIcon::Small, true); if (pth) pixmap = TQImage(pth); if (!pth || pixmap.isNull()) @@ -239,7 +239,7 @@ void starter::reloadImages() if (_VALID_(HoverURL)) pth = configDialog->HoverURL->url(); else - pth = iLoader->iconPath("bStarter_hover", KIcon::Small, true); + pth = iLoader->iconPath("bStarter_hover", TDEIcon::Small, true); if (pth) hoverPixmap = TQImage(pth); if (!pth || hoverPixmap.isNull()) @@ -251,7 +251,7 @@ void starter::reloadImages() if (_VALID_(DownURL)) pth = configDialog->DownURL->url(); else - pth = iLoader->iconPath("bStarter_down", KIcon::Small, true); + pth = iLoader->iconPath("bStarter_down", TDEIcon::Small, true); if (pth) downPixmap = TQImage(pth); if (!pth || downPixmap.isNull()) @@ -281,12 +281,12 @@ void starter::resizeEvent ( TQResizeEvent *rev ) void starter::configureMenu() { - KApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true); + TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true); } void starter::preferences() { - KApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true); + TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true); } int starter::widthForHeight(int height) const @@ -475,7 +475,7 @@ extern "C" { KPanelApplet* init( TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("starter"); + TDEGlobal::locale()->insertCatalogue("starter"); return new starter(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "baghirastarter"); diff --git a/starter/starter.desktop b/starter/starter.desktop index cfc27dc..01f1fde 100644 --- a/starter/starter.desktop +++ b/starter/starter.desktop @@ -2,6 +2,6 @@ Encoding=UTF-8 Name=Baghira Starter Icon=bStarter -X-KDE-Library=libbaghirastarter -X-KDE-UniqueApplet=true +X-TDE-Library=libbaghirastarter +X-TDE-UniqueApplet=true diff --git a/starter/starter.h b/starter/starter.h index 0175ea4..52352b6 100644 --- a/starter/starter.h +++ b/starter/starter.h @@ -11,14 +11,14 @@ #include #include // #include -#include -#include +#include +#include #include "starteriface.h" #include "mykey.h" class DCOPClient; class TQLabel; -class KPopupMenu; +class TDEPopupMenu; class StartMenu; class StarterConfig; @@ -49,7 +49,7 @@ private: TQLabel *mainView; // TQPainter m_painter; DCOPClient *client; - KPopupMenu *configPopup; + TDEPopupMenu *configPopup; StartMenu *startMenu; TQPixmap pixmap; TQPixmap hoverPixmap; @@ -58,7 +58,7 @@ private: typedef TQMap ShortcutList; ShortcutList shortcutList; private slots: - void addShortcut(const KShortcut&); + void addShortcut(const TDEShortcut&); void updateShortcutButton(const TQString&); void configureMenu(); void reloadImages(); diff --git a/style/Makefile.am b/style/Makefile.am index cc324e4..12efbcb 100644 --- a/style/Makefile.am +++ b/style/Makefile.am @@ -1,11 +1,11 @@ AM_CPPFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefx $(all_includes) noinst_HEADERS = baghira.h pixmaps.h bitmaps.h METASOURCES = AUTO kde_style_LTLIBRARIES = baghira.la baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -baghira_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -lXtst +baghira_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lXtst baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp lnkdir = $(kde_datadir)/kstyle/themes lnk_DATA = baghira.themerc diff --git a/style/baghira.cpp b/style/baghira.cpp index bb61570..09397ac 100644 --- a/style/baghira.cpp +++ b/style/baghira.cpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include "config.h" @@ -132,13 +132,13 @@ TQPixmap LiquidStyle::popupBack; //============ -class KAccessToolBarButton : public KToolBarButton +class KAccessToolBarButton : public TDEToolBarButton { // to get me access to the toolbbar friend class LiquidStyle; public: KAccessToolBarButton( TQWidget* parent=0, const char* name=0 ) - : KToolBarButton( parent, name ) {} + : TDEToolBarButton( parent, name ) {} }; @@ -172,7 +172,7 @@ static const int arrowHMargin = 6; static const int rightBorder = 12; -LiquidStyle::LiquidStyle() : KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ) +LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ) { TQIntDictbfi(31);// assuming 31 btns will be enough - a pointer list would be more accurate, but we need to lookup this every 50ms... TQIntDictbtnShadowedDict(223);// we need around 10/color, 3 colors/button assuming 10 different colors (e.g. kcalc) @@ -1357,12 +1357,12 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->setBrush( oldBrush ); } else - KStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + TDEStyle::drawPrimitive( pe, p, r, cg, flags, opt ); } } // general switch } -void LiquidStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, +void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt ) const @@ -1514,7 +1514,7 @@ void LiquidStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, break; } default: - KStyle::drawKStylePrimitive( kpe, p, widget, r, cg, flags, opt ); + TDEStyle::drawTDEStylePrimitive( kpe, p, widget, r, cg, flags, opt ); } } @@ -2154,7 +2154,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, break; }*/ default: - KStyle::drawControl( element, p, widget, r, cg, flags, opt ); + TDEStyle::drawControl( element, p, widget, r, cg, flags, opt ); } } @@ -2166,7 +2166,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, // break; // } // default: -// KStyle::drawControlMask( element, p, widget, r, opt ); +// TDEStyle::drawControlMask( element, p, widget, r, opt ); // break; // } // } @@ -2178,7 +2178,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, // // break; // // } // // default: -// KStyle::drawComplexControlMask( control, p, widget, r, opt ); +// TDEStyle::drawComplexControlMask( control, p, widget, r, opt ); // // } // } @@ -2251,7 +2251,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons TQRect button, menuarea; button = querySubControlMetrics( control, widget, SC_ToolButton, opt ); menuarea = querySubControlMetrics( control, widget, SC_ToolButtonMenu, opt ); - if (::tqt_cast(toolbutton)) + if (::tqt_cast(toolbutton)) { toolbutton2 = (const KAccessToolBarButton*)toolbutton; #if GCC_VERSION < 40000 @@ -2304,11 +2304,11 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons else { myPosition pos = full; - KToolBar *bar = NULL; + TDEToolBar *bar = NULL; - if (toolbutton2 && toolbutton2->parentWidget() && ::tqt_cast(toolbutton2->parentWidget()) ) - { //position calculation - would be nice if ktoolbarbutton provided this as flag - bar = (KToolBar*)toolbutton2->parentWidget(); + if (toolbutton2 && toolbutton2->parentWidget() && ::tqt_cast(toolbutton2->parentWidget()) ) + { //position calculation - would be nice if tdetoolbarbutton provided this as flag + bar = (TDEToolBar*)toolbutton2->parentWidget(); int buttonId = toolbutton2->id(); int buttonIndex = bar->itemIndex(buttonId); @@ -2332,19 +2332,19 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons { if (buttonIndex == 0) { - KToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1)); + TDEToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1)); (tmpButton && tmpButton->x() == toolbutton2->x()+toolbutton2->width()) ? pos = left : pos = full; } else if (buttonIndex == bar->count() - 1) { - KToolBarButton *tmpButton = NULL; + TDEToolBarButton *tmpButton = NULL; tmpButton = bar->getButton(bar->idAt(buttonIndex-1)); (tmpButton && tmpButton->x() + tmpButton->width() == toolbutton2->x()) ? pos = right : pos = full; } else { - KToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1)); - KToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1)); + TDEToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1)); + TDEToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1)); tmpButton1 && tmpButton1->x() + tmpButton1->width() == toolbutton2->x() ? pos = center : pos = left; if (!(tmpButton2 && tmpButton2->x() == toolbutton2->x()+toolbutton2->width())) @@ -2355,21 +2355,21 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons { if (buttonIndex == 0) { - KToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1)); + TDEToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1)); (tmpButton && tmpButton->y() == toolbutton2->y()+toolbutton2->height()) ? pos = left : pos = full; } else if (buttonIndex == bar->count() - 1) { - KToolBarButton *tmpButton = NULL; + TDEToolBarButton *tmpButton = NULL; tmpButton = bar->getButton(bar->idAt(buttonIndex-1)); (tmpButton && tmpButton->y() + tmpButton->height() == toolbutton2->y()) ? pos = right : pos = full; } else { - KToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1)); - KToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1)); + TDEToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1)); + TDEToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1)); tmpButton1 && tmpButton1->y() + tmpButton1->height() == toolbutton2->y() ? pos = center : pos = left; if (!(tmpButton2 && tmpButton2->y() == toolbutton2->y()+toolbutton2->height())) @@ -2413,7 +2413,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons case CC_ScrollBar: { const_cast( this ) ->currentScrollBar = ( TQScrollBar * ) widget; - KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); + TDEStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); break; } case CC_SpinWidget: { @@ -2511,7 +2511,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons // Draw slider groove if ((controls & SC_SliderGroove) && groove.isValid()) { - drawKStylePrimitive( KPE_SliderGroove, &p2, widget, groove, cg, flags, opt ); + drawTDEStylePrimitive( KPE_SliderGroove, &p2, widget, groove, cg, flags, opt ); // Draw the focus rect around the groove /* if (slider->hasFocus()) @@ -2527,7 +2527,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ((controls & SC_SliderHandle) && handle.isValid()) { if (active == SC_SliderHandle) flags |= Style_Active; - drawKStylePrimitive( KPE_SliderHandle, &p2, widget, handle, cg, flags, opt ); + drawTDEStylePrimitive( KPE_SliderHandle, &p2, widget, handle, cg, flags, opt ); } p2.end(); @@ -2842,7 +2842,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons #endif //QT_NO_TITLEBAR default: - KStyle::drawComplexControl( control, p, widget, + TDEStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); break; } @@ -2860,9 +2860,9 @@ int LiquidStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption if (optionHandler->CenterTabs() && !TQApplication::reverseLayout()) return AlignHCenter; else - return KStyle::styleHint(sh, w, opt, shr); + return TDEStyle::styleHint(sh, w, opt, shr); default: - return KStyle::styleHint(sh, w, opt, shr); + return TDEStyle::styleHint(sh, w, opt, shr); } } @@ -2870,7 +2870,7 @@ TQRect LiquidStyle::subRect( SubRect r, const TQWidget *widget ) const { if (r == SR_ComboBoxFocusRect){ return querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ); } - return ( KStyle::subRect( r, widget ) ); + return ( TDEStyle::subRect( r, widget ) ); } int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const @@ -2955,7 +2955,7 @@ int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const case PM_ButtonShiftVertical: return 0; default: - return KStyle::pixelMetric( m, widget ); + return TDEStyle::pixelMetric( m, widget ); } } @@ -3000,7 +3000,7 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents, } case CT_ComboBox: { - // TQSize sz = KStyle::sizeFromContents( contents, widget, contentSize, opt ); + // TQSize sz = TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); // return ( TQSize( sz.width()+3, sz.height() > 25 ? sz.height() : 25 ) ); if ( ::tqt_cast(widget) && ((const TQComboBox *)widget)->editable()) return ( TQSize( contentSize.width()+27, contentSize.height() + 4 > 22 ? contentSize.height() + 4 : 26 ) ); @@ -3054,14 +3054,14 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents, default: break; } - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); } TQPixmap LiquidStyle::stylePixmap( StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt ) const { - return KStyle::stylePixmap( stylepixmap, widget, opt ); + return TDEStyle::stylePixmap( stylepixmap, widget, opt ); } #include "eventfilter.cpp" @@ -3091,11 +3091,11 @@ TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, const TQWidg case SC_TitleBarUnshadeButton: return TQRect( widget->width() - 29, 1, 24, 16 ); default: - return ( KStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); + return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); } } else - return ( KStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); + return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); } TQImage LiquidStyle::fetchImage( const char *name ){ diff --git a/style/baghira.h b/style/baghira.h index adbe60d..340738a 100644 --- a/style/baghira.h +++ b/style/baghira.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include // #define BITMAP_ITEMS 75 // Don't worry, they're demand loaded ;-) #define LIQUID_MENU_CHANGE 667 @@ -490,7 +490,7 @@ public: bool fadeIn; }; -class LiquidStyle : public KStyle +class LiquidStyle : public TDEStyle { Q_OBJECT public: @@ -505,7 +505,7 @@ public: virtual void polish( TQPalette &p ); virtual void unPolish( TQApplication *a ); int styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption & opt, TQStyleHintReturn * shr) const; - void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; void drawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; // void drawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/style/eventfilter.cpp b/style/eventfilter.cpp index ba09ff6..4f860b5 100644 --- a/style/eventfilter.cpp +++ b/style/eventfilter.cpp @@ -164,7 +164,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev ) } else if ( obj->inherits( "TQDockWindow" ) ) { - if (KStyle::eventFilter( obj, ev )) + if (TDEStyle::eventFilter( obj, ev )) return true; TQWidget * w = ( TQWidget * ) obj; if ( w->backgroundMode() != TQt::PaletteBackground ) @@ -261,7 +261,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev ) } return false; } - else if (::tqt_cast(obj)) + else if (::tqt_cast(obj)) { TQObjectList *handlerList = obj->queryList( "TQDockWindowHandle" ); for (uint i= 0; i < handlerList->count(); i++) @@ -402,7 +402,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev ) } return false; } - else if (::tqt_cast(obj)) + else if (::tqt_cast(obj)) { TQObjectList *handlerList = obj->queryList( "TQDockWindowHandle" ); for (uint i= 0; i < handlerList->count(); i++) @@ -668,7 +668,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev ) progAnimWidgets[(TQWidget*)obj] = 0; return false; } - if ( !qstrcmp(obj->name(), "kde toolbar widget") ) + if ( !qstrcmp(obj->name(), "tde toolbar widget") ) { TQWidget* lb = static_cast(obj); if (lb->backgroundMode() == TQt::PaletteButton) @@ -824,10 +824,10 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev ) for (uint i= 0; i < kids->count(); i++) { TQWidget *kid = (TQWidget*)kids->at(i); - if (kid && kid->paletteBackgroundPixmap() && !(kid->isTopLevel() || kid->inherits( "KonqIconViewWidget" ) || kid->inherits( "khtml") || kid->inherits( "KActiveLabel") || qstrcmp( kid->name(), "_B_ALI_HEADER" ) == 0 || (kid->parentWidget() && kid->parentWidget()->inherits("Thumbnail") || kid->parentWidget()->inherits("MarkListItem")) )) + if (kid && kid->paletteBackgroundPixmap() && !(kid->isTopLevel() || kid->inherits( "KonqIconViewWidget" ) || kid->inherits( "tdehtml") || kid->inherits( "KActiveLabel") || qstrcmp( kid->name(), "_B_ALI_HEADER" ) == 0 || (kid->parentWidget() && kid->parentWidget()->inherits("Thumbnail") || kid->parentWidget()->inherits("MarkListItem")) )) { //we can loose those kids anytime - especially if the user plays on konqueror... - if (::tqt_cast(kid)) + if (::tqt_cast(kid)) kid->setErasePixmap(tmpBrushPix); else { diff --git a/style/optionHandler.cpp b/style/optionHandler.cpp index 2ab110a..589786a 100644 --- a/style/optionHandler.cpp +++ b/style/optionHandler.cpp @@ -12,7 +12,7 @@ #include #include #include -// #include +// #include #include #include #include diff --git a/style/polish.cpp b/style/polish.cpp index 2f4bbeb..650afc9 100644 --- a/style/polish.cpp +++ b/style/polish.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -30,10 +30,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include @@ -376,7 +376,7 @@ void LiquidStyle::polish( TQWidget *w ) - if (qstrcmp( w->name(), "kde toolbar widget" ) == 0 ) + if (qstrcmp( w->name(), "tde toolbar widget" ) == 0 ) w->installEventFilter( this ); if (::tqt_cast(w)) @@ -416,7 +416,7 @@ void LiquidStyle::polish( TQWidget *w ) if ( ::tqt_cast(w)) { - if (optionHandler->useToolButtonFrame() && w->inherits("KToolBar")) + if (optionHandler->useToolButtonFrame() && w->inherits("TDEToolBar")) ((TQToolBar*)w)->boxLayout()->setSpacing( 0 ); ((TQToolBar*)w)->setMargin( 4 ); w->setBackgroundMode(PaletteBackground); @@ -434,7 +434,7 @@ void LiquidStyle::polish( TQWidget *w ) } //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if (tmpBool = ::tqt_cast(w) || w->inherits( "TQToolBarSeparator" ) || w->inherits( "KToolBarSeparator" ) ) + if (tmpBool = ::tqt_cast(w) || w->inherits( "TQToolBarSeparator" ) || w->inherits( "TDEToolBarSeparator" ) ) { if (tmpBool && w->parentWidget() && ::tqt_cast(w->parentWidget()) ) { @@ -465,10 +465,10 @@ void LiquidStyle::polish( TQWidget *w ) goto kstpolish; } - if ( !isPlain () && (w->inherits( "KonqIconViewWidget" ) || w->inherits( "khtml")/* || w->inherits( "TQtVisionView")*/)) + if ( !isPlain () && (w->inherits( "KonqIconViewWidget" ) || w->inherits( "tdehtml")/* || w->inherits( "TQtVisionView")*/)) { // if you want custom backgrounds in konqueror, you have to reset pixmap, since Konq animation can't handle it - // original liquid did this on khtml, too (at speed loss) so we'll see, if we get errors from this... + // original liquid did this on tdehtml, too (at speed loss) so we'll see, if we get errors from this... TQPalette pal( w->palette() ); pal.setBrush( TQColorGroup::Background, pal.active().background() ); w->setPalette( pal ); @@ -483,9 +483,9 @@ void LiquidStyle::polish( TQWidget *w ) if ((::tqt_cast(w) || w->inherits("KateView") || w->inherits("TEWidget") || w->inherits("CHexViewWidget")) && !(w->isA("KOAgenda"))) { - if (::tqt_cast(w) && optionHandler->custCols[7] != -1 && ((KListView*)w)->alternateBackground() == KGlobalSettings::alternateBackgroundColor()) + if (::tqt_cast(w) && optionHandler->custCols[7] != -1 && ((TDEListView*)w)->alternateBackground() == TDEGlobalSettings::alternateBackgroundColor()) { - ((KListView*)w)->setAlternateBackground(TQColor(optionHandler->custCols[7])); + ((TDEListView*)w)->setAlternateBackground(TQColor(optionHandler->custCols[7])); } #if _FORCE_SCROLLBARS_ if (::tqt_cast(w) && !w->inherits( "KActiveLabel" )) @@ -613,7 +613,7 @@ void LiquidStyle::polish( TQWidget *w ) bool italic = w->font().italic(); bool underline = w->font().underline(); bool overline = w->font().overline(); - w->setFont(KGlobalSettings::menuFont()); + w->setFont(TDEGlobalSettings::menuFont()); if (bold) (const_cast(&w->font()))->setBold(true); if (italic) @@ -671,7 +671,7 @@ void LiquidStyle::polish( TQWidget *w ) //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if ( w->parentWidget() && ( ( ::tqt_cast(w) && ::tqt_cast(w->parentWidget())) || w->inherits( "KCompletionBox" ) ) ) { + if ( w->parentWidget() && ( ( ::tqt_cast(w) && ::tqt_cast(w->parentWidget())) || w->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) w; listbox->setBackgroundMode( NoBackground ); w->installEventFilter( this ); @@ -745,7 +745,7 @@ void LiquidStyle::polish( TQWidget *w ) w->setBackgroundMode( TQWidget::NoBackground ); } //if (testWidget) tqWarning("testwidget stage %d",testInt++); - kstpolish: KStyle::polish( w ); // nothing of all above? do default kde stuff + kstpolish: TDEStyle::polish( w ); // nothing of all above? do default kde stuff } @@ -763,7 +763,7 @@ void LiquidStyle::unPolish( TQWidget *w ) { goto kstunpolish; } - if ( w->inherits("TQToolBar") || qstrcmp( w->name(), "kde toolbar widget" ) == 0 ) { + if ( w->inherits("TQToolBar") || qstrcmp( w->name(), "tde toolbar widget" ) == 0 ) { w->setBackgroundOrigin( TQWidget::WidgetOrigin ); // w->unsetPalette(); goto kstunpolish; @@ -780,7 +780,7 @@ void LiquidStyle::unPolish( TQWidget *w ) { goto kstunpolish; } if ( !isPlain () && w->inherits( "KonqIconViewWidget" ) || - w->inherits( "KHTMLView" ) ) { + w->inherits( "TDEHTMLView" ) ) { w->unsetPalette(); goto kstunpolish; } @@ -874,5 +874,5 @@ void LiquidStyle::unPolish( TQWidget *w ) { goto kstunpolish; } } -kstunpolish: KStyle::unPolish( w ); +kstunpolish: TDEStyle::unPolish( w ); } diff --git a/style/utils.cpp b/style/utils.cpp index 31ef75a..e39b5b0 100644 --- a/style/utils.cpp +++ b/style/utils.cpp @@ -1401,7 +1401,7 @@ bool LiquidStyle::isHTMLWidget( const TQWidget *widget ) const if ( w ) { w = w->parent(); - if ( w && w->inherits( "KHTMLView" ) ) + if ( w && w->inherits( "TDEHTMLView" ) ) return ( true ); } }