Browse Source

Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 2 years ago
parent
commit
88b7febc23
65 changed files with 428 additions and 428 deletions
  1. 10
    10
      README
  2. 1
    1
      bab/Makefile.am
  3. 1
    1
      bab/bab.desktop
  4. 2
    2
      bab/bab.h
  5. 28
    28
      bab/main.cpp
  6. 1
    1
      bab/styleconfdialog.cpp
  7. 2
    2
      bab/styleconfdialog.h
  8. 1
    1
      colorscheme/Makefile.am
  9. 1
    1
      config/Makefile.am
  10. 4
    4
      config/colordialog.cpp
  11. 32
    32
      config/kstyle_baghira_config.cpp
  12. 6
    6
      config/kstyle_baghira_config.h
  13. 1
    1
      deco/Doxyfile
  14. 10
    10
      deco/Makefile.am
  15. 1
    1
      deco/baghira.desktop
  16. 7
    7
      deco/baghiraclient.cc
  17. 1
    1
      deco/baghiraclient.h
  18. 7
    7
      deco/config/Makefile.am
  19. 9
    9
      deco/config/baghiraconfig.cc
  20. 9
    9
      deco/config/baghiraconfig.cc.new
  21. 4
    4
      deco/config/baghiraconfig.h
  22. 4
    4
      deco/config/baghiraconfig.h.new
  23. 1
    1
      deco/config/configdialog.ui
  24. 1
    1
      deco/config/configdialog.ui.new
  25. 1
    1
      kickermenu-3.3/Makefile.am
  26. 2
    2
      kickermenu-3.3/b_menuapplet.desktop
  27. 10
    10
      kickermenu-3.3/menuapplet.cpp
  28. 4
    4
      kickermenu-3.3/menuapplet.h
  29. 1
    1
      kickermenu/Makefile.am
  30. 1
    1
      kickermenu/configure.in.in
  31. 16
    16
      kickermenu/menuapplet.cpp
  32. 5
    5
      kickermenu/menuapplet.h
  33. 1
    1
      sessionapplet/Makefile.am
  34. 11
    11
      sessionapplet/dmctl.cpp
  35. 5
    5
      sessionapplet/dmctl.h
  36. 14
    14
      sessionapplet/usermanager.cpp
  37. 2
    2
      sessionapplet/usermanager.desktop
  38. 2
    2
      sessionapplet/usermanager.h
  39. 1
    1
      sidebar/Makefile.am
  40. 4
    4
      sidebar/baghirasidebar.cpp
  41. 1
    1
      sidebar/baghirasidebar.desktop
  42. 3
    3
      sidebar/baghirasidebar.h
  43. 1
    1
      sidebar/baghirasidebar_add.desktop
  44. 1
    1
      sidebar/configure.in.in
  45. 25
    25
      sidebar/dndlistbox.cpp
  46. 6
    6
      sidebar/dndlistbox.h
  47. 1
    1
      sidebar/linkconfig.ui
  48. 4
    4
      sidebar/linkview.cpp
  49. 1
    1
      sidebar/listboxlink.cpp
  50. 1
    1
      sidebar/listboxlink.h
  51. 1
    1
      starter/Makefile.am
  52. 1
    1
      starter/config.ui
  53. 1
    1
      starter/linkconfig.ui
  54. 54
    54
      starter/menu.cpp
  55. 7
    7
      starter/menu.h
  56. 21
    21
      starter/starter.cpp
  57. 2
    2
      starter/starter.desktop
  58. 5
    5
      starter/starter.h
  59. 2
    2
      style/Makefile.am
  60. 37
    37
      style/baghira.cpp
  61. 3
    3
      style/baghira.h
  62. 6
    6
      style/eventfilter.cpp
  63. 1
    1
      style/optionHandler.cpp
  64. 18
    18
      style/polish.cpp
  65. 1
    1
      style/utils.cpp

+ 10
- 10
README View File

@@ -9,7 +9,7 @@ Installation
9 9
 tar -xjf baghira.tar.bz2
10 10
 cd baghira/baghira
11 11
 either try ./install.sh or
12
-./configure --prefix=`kde-config --prefix` --disable-debug [--enable-final]
12
+./configure --prefix=`tde-config --prefix` --disable-debug [--enable-final]
13 13
 (!!!BEGINNERS: the direction of the accents is _important_ (top-left to bottom-right), the rectangular brackets mean "this is optional" - don't type them!!!)
14 14
 make
15 15
 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
123 123
 * (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
124 124
 * (kickermenu) update: using XClassHint to display the appname (better than relying on the netwm info)
125 125
 * (kickermenu) update: using app menu instead of desktop menu for modal dialogs
126
-* (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):
126
+* (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):
127 127
 --------------------start---------------
128 128
 #!/bin/sh
129
-sed s/"X-KDE-Library=menu_panelapplet"/"X-KDE-Library=b_menu_panelapplet"/g $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop > _baghirabuffer_
130
-rm -f $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
131
-mv _baghirabuffer_ $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
129
+sed s/"X-TDE-Library=menu_panelapplet"/"X-TDE-Library=b_menu_panelapplet"/g $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop > _baghirabuffer_
130
+rm -f $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
131
+mv _baghirabuffer_ $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
132 132
 ---------------------end----------------
133 133
 
134 134
 0.6a
@@ -165,7 +165,7 @@ so the only solution i found was to disable the palette update for the toolbutto
165 165
 0.5e
166 166
 ----
167 167
 style:
168
-- fixed the "kde toolbar widget" thing (location bar/juk slider etc.)
168
+- fixed the "tde toolbar widget" thing (location bar/juk slider etc.)
169 169
 - worked around brushed metal kicker translucency support
170 170
 - changed the appereance of the kicker executor (like konqueror combobox)
171 171
 - worked around konqueror statusbar offset
@@ -201,7 +201,7 @@ bab:
201 201
 - added some colored throbbers and an xcf so you can create your own colors
202 202
 - sorting headers appear colored
203 203
 - put the menuapplet into its own library, so it won't conflict with the kde one and is installed by default
204
-- corrected kwin (stippled) frame to align the style
204
+- corrected twin (stippled) frame to align the style
205 205
 - corercted brushed toolbars (disalignment)
206 206
 
207 207
 0.5c
@@ -217,7 +217,7 @@ anyway, i don't know since which version this holds, therefore maybe you want to
217 217
 
218 218
 Mainly kde3.3 alignments
219 219
 - fixed juk toolbar stuff (and any other)
220
-- fixed new kwin buttons
220
+- fixed new twin buttons
221 221
 - toplevelmenubars are not set to stipples anymore, honoring the fact, that the kicker menuapplet recolors them itself to kicker background
222 222
 - arrows will are dark grey rather than black - makes them appear more smooth
223 223
 
@@ -249,7 +249,7 @@ Bab:
249 249
 Goodies:
250 250
 The stuff in this folder is not autoinstalled.
251 251
 Look into it and use whatever you want, however you want (except claiming cr and suing me for nonliterally copying ;)
252
-- added new stuff: bootsplash, konqui tile, kdm picture, lilo-bootscreen
252
+- added new stuff: bootsplash, konqui tile, tdm picture, lilo-bootscreen
253 253
 *** read the readme! ***
254 254
 
255 255
 0.5a
@@ -411,7 +411,7 @@ haha...! i even had some letters left ;)
411 411
 - bugfixed the setting stuff (misdisplayd groupboxes, ability to unset shadows under popups...)
412 412
 - Tab vs. Chooser is now optional
413 413
   o the default setting is somewhat clever, i.e. if the toplevel widget is a dialog, tabs appear as choosers, as oldstyle tabs elsewise
414
-    -> result: apps like konqueror, kdevelop, quanta, konsole... will show tabs, dialogs will show choosers
414
+    -> result: apps like konqueror, tdevelop, quanta, konsole... will show tabs, dialogs will show choosers
415 415
   o you can define the tab behaviour for aqua and brushed metal individually in the bab menu
416 416
 - fixed menu animation stuff
417 417
 - fixed bookmark menu behaviour (so could have told me...)

+ 1
- 1
bab/Makefile.am View File

@@ -19,4 +19,4 @@ bin_PROGRAMS = bab
19 19
 # the application source, library search path, and link libraries
20 20
 bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel
21 21
 bab_LDFLAGS = $(KDE_RPATH) $(all_libraries)
22
-bab_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
22
+bab_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)

+ 1
- 1
bab/bab.desktop View File

@@ -5,6 +5,6 @@ Name[xx]=xxbabxx
5 5
 Exec=bab %i %m -caption "%c"
6 6
 Icon=baghira
7 7
 Type=Application
8
-DocPath=
8
+X-DocPath=
9 9
 Comment=Access to the big black cat
10 10
 Terminal=0

+ 2
- 2
bab/bab.h View File

@@ -29,7 +29,7 @@
29 29
 #include <tqwidget.h>
30 30
 #include <tqpixmap.h>
31 31
 #include <tqsettings.h>
32
-#include <kmainwindow.h>
32
+#include <tdemainwindow.h>
33 33
 #include <ksystemtray.h>
34 34
 
35 35
 class bab;
@@ -75,7 +75,7 @@ class TQCheckBox;
75 75
  * @author Thomas Lübking <baghira-style@gmx.net>
76 76
  * @version 0.1
77 77
  */
78
-class bab : public KMainWindow
78
+class bab : public TDEMainWindow
79 79
 {
80 80
     Q_OBJECT
81 81
 public:

+ 28
- 28
bab/main.cpp View File

@@ -31,17 +31,17 @@
31 31
 #include <tqvbox.h>
32 32
 #include <tqpainter.h>
33 33
 #include <dcopclient.h>
34
-#include <kapplication.h>
35
-// #include <kconfig.h>
34
+#include <tdeapplication.h>
35
+// #include <tdeconfig.h>
36 36
 #include <kiconloader.h>
37
-#include <kaboutdata.h>
38
-#include <kcmdlineargs.h>
37
+#include <tdeaboutdata.h>
38
+#include <tdecmdlineargs.h>
39 39
 #include <kipc.h>
40 40
 #include <klibloader.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kprocess.h>
43 43
 #if KDE_IS_VERSION(3,4,0)
44
-#include <kwin.h>
44
+#include <twin.h>
45 45
 #endif
46 46
 #include <stdio.h>
47 47
 #include <X11/Xlib.h>
@@ -54,20 +54,20 @@ static const char description[] =
54 54
 
55 55
 static const char version[] = "cvs";
56 56
 
57
-static KCmdLineOptions options[] =
57
+static TDECmdLineOptions options[] =
58 58
 {
59 59
 //    { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
60
-    KCmdLineLastOption
60
+    TDECmdLineLastOption
61 61
 };
62 62
 
63 63
 int main(int argc, char **argv)
64 64
 {
65
-   KAboutData about("bab", I18N_NOOP("BAB - Baghira Aqua/Brushed Switcher"), version, description,
66
-                  KAboutData::License_GPL, "(C) 2004/2005 Thomas Lübking", 0, 0, "baghira-style@gmx.net");
65
+   TDEAboutData about("bab", I18N_NOOP("BAB - Baghira Aqua/Brushed Switcher"), version, description,
66
+                  TDEAboutData::License_GPL, "(C) 2004/2005 Thomas Lübking", 0, 0, "baghira-style@gmx.net");
67 67
    about.addAuthor( "Thomas Lübking", 0, "baghira-style@gmx.net" );
68
-   KCmdLineArgs::init(argc, argv, &about);
69
-   KCmdLineArgs::addCmdLineOptions( options );
70
-   KApplication app;
68
+   TDECmdLineArgs::init(argc, argv, &about);
69
+   TDECmdLineArgs::addCmdLineOptions( options );
70
+   TDEApplication app;
71 71
    DCOPClient* client = app.dcopClient();
72 72
    client->registerAs( "bab", false);
73 73
    client->setDefaultObject( "babInterface" );
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
94 94
 }
95 95
 
96 96
 
97
-bab::bab() : KMainWindow(0,"bab",TQt::WStyle_StaysOnTop | TQt::WX11BypassWM ){
97
+bab::bab() : TDEMainWindow(0,"bab",TQt::WStyle_StaysOnTop | TQt::WX11BypassWM ){
98 98
    bSwitcher = new BabSwitcher(this,"switcher");
99 99
    TQToolTip::add(bSwitcher, i18n("leftclick toggles state<br>rightclick toggles setupmenu"));
100 100
    bSwitcher->show();
@@ -195,7 +195,7 @@ bab::~ bab()
195 195
    if (bSwitcher) delete bSwitcher;
196 196
 }
197 197
 
198
-/*Taken from kcontrol, kcmshell style*/
198
+/*Taken from kcontrol, tdecmshell style*/
199 199
 void bab::configureBaghira()
200 200
 {
201 201
 
@@ -235,7 +235,7 @@ void bab::configureBaghira()
235 235
    TQObject *decoObject = 0;
236 236
    if (tw)
237 237
    {
238
-      KLibrary* library2 = loader->library( TQFile::encodeName("kwin_baghira_config") );
238
+      KLibrary* library2 = loader->library( TQFile::encodeName("twin_baghira_config") );
239 239
       if (!library2)
240 240
       {
241 241
          tqWarning("There was an error loading the configuration dialog for the deco.");
@@ -247,7 +247,7 @@ void bab::configureBaghira()
247 247
          tqWarning("There was an error loading the configuration dialog for this style.");
248 248
          return;
249 249
       }
250
-      typedef TQObject*(* factoryRoutine2)( KConfig* conf, TQWidget* parent );
250
+      typedef TQObject*(* factoryRoutine2)( TDEConfig* conf, TQWidget* parent );
251 251
       factoryRoutine2 factory2 = (factoryRoutine2)(allocPtr2);
252 252
       decoObject = factory2( 0, tw );
253 253
       decoConfig = (TQWidget*)tw->child("ConfigDialog");
@@ -266,7 +266,7 @@ void bab::configureBaghira()
266 266
    connect(dial, SIGNAL(defaults()), styleConfig, SLOT(defaults()));
267 267
    connect(dial, SIGNAL(save()), styleConfig, SLOT(save()));
268 268
    connect(dial, SIGNAL(defaults()), decoObject, SLOT(defaults()));
269
-   connect(dial, SIGNAL(save(KConfig*)), decoObject, SLOT(save(KConfig*)));
269
+   connect(dial, SIGNAL(save(TDEConfig*)), decoObject, SLOT(save(TDEConfig*)));
270 270
    
271 271
    if (dial->exec() == TQDialog::Accepted)
272 272
    {
@@ -277,7 +277,7 @@ void bab::configureBaghira()
277 277
          KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
278 278
       }
279 279
       if (dial->isDecoDirty())
280
-         kapp->dcopClient()->send("kwin", "KWinInterface", "reconfigure()", TQByteArray());
280
+         kapp->dcopClient()->send("twin", "KWinInterface", "reconfigure()", TQByteArray());
281 281
    }
282 282
    tw->removeChild( decoObject );
283 283
    dial->insertChild( decoObject );
@@ -322,7 +322,7 @@ void bab::showEvent(TQShowEvent *e){
322 322
 
323 323
 void bab::saveSettings(){
324 324
    TQSettings *config = new TQSettings();
325
-//    KConfig *config = new KConfig("baghirarc");
325
+//    TDEConfig *config = new TDEConfig("baghirarc");
326 326
    config->beginGroup("/baghira/BAB");
327 327
    config->writeEntry("defaultState", DefStyle->currentItem());
328 328
    config->writeEntry("roundCorners", cornerCheck->isChecked());
@@ -334,12 +334,12 @@ TQPoint *BabSwitcher::globalPos = new TQPoint(0,0);
334 334
 
335 335
 BabSwitcher::BabSwitcher(bab *parent, const char *name) 
336 336
                                           : KSystemTray(parent,name), DCOPObject("babInterface") {
337
-   KIconLoader* iLoader = KGlobal::iconLoader();
338
-   JaguarIcon = iLoader->loadIcon("bab_jaguar", KIcon::Small, 22);
339
-   PantherIcon = iLoader->loadIcon("bab_panther", KIcon::Small, 22);
340
-   iTunesIcon = iLoader->loadIcon("bab_itunes", KIcon::Small, 22);
341
-   TigerIcon = iLoader->loadIcon("bab_tiger", KIcon::Small, 22);
342
-   MilkIcon = iLoader->loadIcon("bab_milk", KIcon::Small, 22);
337
+   TDEIconLoader* iLoader = TDEGlobal::iconLoader();
338
+   JaguarIcon = iLoader->loadIcon("bab_jaguar", TDEIcon::Small, 22);
339
+   PantherIcon = iLoader->loadIcon("bab_panther", TDEIcon::Small, 22);
340
+   iTunesIcon = iLoader->loadIcon("bab_itunes", TDEIcon::Small, 22);
341
+   TigerIcon = iLoader->loadIcon("bab_tiger", TDEIcon::Small, 22);
342
+   MilkIcon = iLoader->loadIcon("bab_milk", TDEIcon::Small, 22);
343 343
    installEventFilter(this);
344 344
 }
345 345
 
@@ -462,7 +462,7 @@ TQString BabSwitcher::deco()
462 462
 
463 463
 void BabSwitcher::start(TQString name, TQString settings)
464 464
 {
465
-   KProcess proc;
465
+   TDEProcess proc;
466 466
    TQString section; int i = 0; bool done = false;
467 467
    if (name.contains(' '))
468 468
    {
@@ -491,7 +491,7 @@ void BabSwitcher::start(TQString name, TQString settings)
491 491
       symlink (tmpString.latin1(), tmpString2.latin1());
492 492
       proc << name;
493 493
    }
494
-   proc.start(KProcess::DontCare);
494
+   proc.start(TDEProcess::DontCare);
495 495
    proc.detach();
496 496
 }
497 497
 

+ 1
- 1
bab/styleconfdialog.cpp View File

@@ -19,7 +19,7 @@
19 19
  */
20 20
 
21 21
 #include "styleconfdialog.h"
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 
24 24
 StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
25 25
   KDialogBase(parent, "StyleConfigDialog",

+ 2
- 2
bab/styleconfdialog.h View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <kdialogbase.h>
25 25
 
26
-class KConfig;
26
+class TDEConfig;
27 27
 class StyleConfigDialog: public KDialogBase
28 28
 {
29 29
   Q_OBJECT
@@ -43,7 +43,7 @@ private slots:
43 43
 signals:
44 44
   void defaults();
45 45
   void save();
46
-  void save(KConfig*);
46
+  void save(TDEConfig*);
47 47
 
48 48
 private:
49 49
   bool m_styleDirty;

+ 1
- 1
colorscheme/Makefile.am View File

@@ -1,3 +1,3 @@
1
-lnkdir = $(kde_datadir)/kdisplay/color-schemes
1
+lnkdir = $(kde_datadir)/tdedisplay/color-schemes
2 2
 lnk_DATA = AquaBlue.kcsrc AquaGraphite.kcsrc
3 3
 EXTRA_DIST = $(lnk_DATA)

+ 1
- 1
config/Makefile.am View File

@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kstyle_baghira_config.la
7 7
 
8 8
 kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui
9 9
 # kstyle_baghira_config_la_METASOURCES = AUTO
10
-kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
10
+kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
11 11
 kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN)
12 12
 
13 13
 

+ 4
- 4
config/colordialog.cpp View File

@@ -7,8 +7,8 @@
7 7
 #include <tqpixmap.h>
8 8
 #include <tqpushbutton.h>
9 9
 #include <tqstyle.h>
10
-#include <kglobal.h>
11
-#include <kglobalsettings.h>
10
+#include <tdeglobal.h>
11
+#include <tdeglobalsettings.h>
12 12
 #include <kcolordialog.h>
13 13
 #include <kiconloader.h>
14 14
 #include "colorpicker.h"
@@ -45,7 +45,7 @@ ColorDialog::ColorDialog(TQWidget* parent, const char* name) : TQDialog( parent,
45 45
    TQVBoxLayout *topRight = new TQVBoxLayout(top);
46 46
    TQLabel *info = new TQLabel("<qt>Select custom colors or grab directly from screen.<br>Click image left to switch between items.</qt>",this);
47 47
    topRight->addWidget(info);
48
-   TQIconSet icon = KGlobal::iconLoader()->loadIconSet("colorpicker", KIcon::Small);
48
+   TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("colorpicker", TDEIcon::Small);
49 49
    buttonCP = new TQPushButton(icon, TQString::null, this);
50 50
    topRight->addWidget(buttonCP);
51 51
    TQLabel *lb = new TQLabel("From other app:",this);
@@ -74,7 +74,7 @@ ColorDialog::ColorDialog(TQWidget* parent, const char* name) : TQDialog( parent,
74 74
    picker[High]->setColor(colorGroup().highlight());
75 75
    picker[HighText]->setColor(colorGroup().highlightedText());
76 76
    picker[ButText]->setColor(colorGroup().buttonText ());
77
-   picker[Alternate]->setColor(KGlobalSettings::alternateBackgroundColor());
77
+   picker[Alternate]->setColor(TDEGlobalSettings::alternateBackgroundColor());
78 78
    for (int i = 0; i < NUMCOLORS; i++)
79 79
       picker[i]->blockSignals(false);
80 80
 //    demo->repaint(false);

+ 32
- 32
config/kstyle_baghira_config.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqfile.h>
28 28
 #include <tqfileinfo.h>
29 29
 #include <tqgroupbox.h>
30
-#include <kfiledialog.h>
30
+#include <tdefiledialog.h>
31 31
 #include <tqpainter.h>
32 32
 //#include <tqpalette.h>
33 33
 // #include <tqsettings.h>
@@ -37,20 +37,20 @@
37 37
 #include <tqlabel.h>
38 38
 #include <tqlineedit.h>
39 39
 #include <tqpixmap.h>
40
-#include <klistview.h>
40
+#include <tdelistview.h>
41 41
 #include <tqtabwidget.h>
42 42
 #include <tqtimer.h>
43 43
 #include <dcopclient.h>
44
-#include <kapplication.h>
44
+#include <tdeapplication.h>
45 45
 #include <kcolorbutton.h>
46
-#include <kconfig.h>
46
+#include <tdeconfig.h>
47 47
 #include <kimageeffect.h>
48
-#include <klocale.h>
49
-#include <kmessagebox.h>
50
-#include <kglobal.h>
51
-#include <kglobalsettings.h>
48
+#include <tdelocale.h>
49
+#include <tdemessagebox.h>
50
+#include <tdeglobal.h>
51
+#include <tdeglobalsettings.h>
52 52
 #include <kprocess.h>
53
-#include <kparts/genericfactory.h>
53
+#include <tdeparts/genericfactory.h>
54 54
 
55 55
 #include <X11/Xlib.h>
56 56
 #include <X11/Xatom.h>
@@ -66,8 +66,8 @@
66 66
 
67 67
 //#define VERSION "0.7"
68 68
 
69
-#ifndef KDE_VERSION_STRING
70
-#define KDE_VERSION_STRING "error"
69
+#ifndef TDE_VERSION_STRING
70
+#define TDE_VERSION_STRING "error"
71 71
 #endif
72 72
 #ifndef TQT_BUILD_KEY
73 73
 #define TQT_BUILD_KEY "error error error error"
@@ -105,24 +105,24 @@ void kstyle_baghira_config::openHtml1()
105 105
 {
106 106
    TQStringList args;
107 107
    args << "exec" << "http://baghira.sf.net/";
108
-   kapp->kdeinitExec("kfmclient", args);
108
+   kapp->tdeinitExec("kfmclient", args);
109 109
 }
110 110
 
111 111
 void kstyle_baghira_config::openHtml2()
112 112
 {
113 113
    TQStringList args;
114 114
    args << "exec" << "http://www.sf.net/projects/baghira/files/";
115
-   kapp->kdeinitExec("kfmclient", args);
115
+   kapp->tdeinitExec("kfmclient", args);
116 116
 }
117 117
 
118 118
 void kstyle_baghira_config::startBab()
119 119
 {
120
-   kapp->kdeinitExec("bab");
120
+   kapp->tdeinitExec("bab");
121 121
 }
122 122
 
123 123
 void kstyle_baghira_config::startKRuler()
124 124
 {
125
-   kapp->kdeinitExec("kruler");
125
+   kapp->tdeinitExec("kruler");
126 126
 }
127 127
 
128 128
 TQImage* kstyle_baghira_config::tintButton(TQImage &src, TQColor c)
@@ -296,7 +296,7 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name,
296 296
    
297 297
    TQWidget *rulesWidget = new TQWidget(dialog_->tabWidget);
298 298
    TQHBoxLayout *rwlh = new TQHBoxLayout(rulesWidget);
299
-   applist = new KListView(rulesWidget);
299
+   applist = new TDEListView(rulesWidget);
300 300
    applist->setFullWidth(true);
301 301
 #if KDE_IS_VERSION(3,3,91)
302 302
    applist->setShadeSortColumn(false);
@@ -314,9 +314,9 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name,
314 314
       {
315 315
          TQFileInfo FI = TQFileInfo(d, d[i]);
316 316
          if (FI.isSymLink())
317
-            applist->insertItem(new KListViewItem(applist, d[i], FI.readLink().section('/',-1,-1)));
317
+            applist->insertItem(new TDEListViewItem(applist, d[i], FI.readLink().section('/',-1,-1)));
318 318
          else
319
-            applist->insertItem(new KListViewItem(applist, d[i]));
319
+            applist->insertItem(new TDEListViewItem(applist, d[i]));
320 320
       }
321 321
    }
322 322
    rwlh->addWidget(applist);
@@ -351,7 +351,7 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name,
351 351
    help_ = new Help(dialog_);
352 352
    about_ = new About(dialog_);
353 353
    about_->versionLabel->setText(VERSION);
354
-   about_->kdeLabel->setText(KDE_VERSION_STRING);
354
+   about_->kdeLabel->setText(TDE_VERSION_STRING);
355 355
    crCurrent = 0;
356 356
    crNotes[0] = "<qt>© 2003-2005 by Thomas Lübking<br>http://baghira.SourceForge.net</qt>";
357 357
    crNotes[1] = "<qt>© \"Design\" 2001-2005 by Apple inc.<br>http://www.apple.com";
@@ -481,7 +481,7 @@ void kstyle_baghira_config::load()
481 481
 
482 482
 void kstyle_baghira_config::load(TQString &fileName)
483 483
 {
484
-   KConfig *config = new KConfig(fileName);
484
+   TDEConfig *config = new TDEConfig(fileName);
485 485
 //    TQSettings config;
486 486
    config->setGroup("BAB");
487 487
    // general Design
@@ -576,7 +576,7 @@ void kstyle_baghira_config::load(TQString &fileName)
576 576
    config->setGroup("Sidebar");
577 577
    delete config;
578 578
    
579
-   config = new KConfig("kdeglobals");
579
+   config = new TDEConfig("kdeglobals");
580 580
    config->setGroup( "Toolbar style" );
581 581
    dialog_->toolbuttonHighColor->setColor(config->readColorEntry("HighlightColor", new TQColor(103,141,178)) );
582 582
    delete config;
@@ -666,7 +666,7 @@ void kstyle_baghira_config::save()
666 666
 
667 667
 void kstyle_baghira_config::changeTooluttonHighlightColor(const TQColor & color)
668 668
 {
669
-   KConfig *config = new KConfig("kdeglobals");
669
+   TDEConfig *config = new TDEConfig("kdeglobals");
670 670
    config->setGroup( "Toolbar style" );
671 671
    config->writeEntry("HighlightColor", color);
672 672
    delete config;
@@ -684,7 +684,7 @@ void kstyle_baghira_config::handleButtonStyles(int i)
684 684
 void kstyle_baghira_config::save(TQString &fileName)
685 685
 {
686 686
 //     TQSettings *config = new TQSettings;
687
-    KConfig *config = new KConfig(fileName);
687
+    TDEConfig *config = new TDEConfig(fileName);
688 688
     config->setGroup("BAB");
689 689
     //General Design
690 690
     config->writeEntry("defaultState", dialog_->defaultStyle->currentItem());
@@ -739,15 +739,15 @@ Hidden=true\n\
739 739
 Type=Plugin\n\
740 740
 Encoding=UTF-8\n\
741 741
 Name=BaghiraMenu\n\
742
-X-KDE-Library=b_menu_panelapplet\n\
743
-X-KDE-UniqueApplet=true\n";
742
+X-TDE-Library=b_menu_panelapplet\n\
743
+X-TDE-UniqueApplet=true\n";
744 744
         file.writeBlock( msg, tqstrlen(msg) );
745 745
         file.close();
746 746
     }
747 747
     else
748 748
         file.remove();
749 749
     if (dialog_->replaceMenubar->isOn() != menuReplaced)
750
-        KApplication::dcopClient()->send("kicker", "default", "restart()", "");
750
+        TDEApplication::dcopClient()->send("kicker", "default", "restart()", "");
751 751
     //Srollbars
752 752
     config->writeEntry("Special_AnimateSlider", dialog_->animateSlider->isOn());
753 753
     config->writeEntry("Special_ShadowSlider", dialog_->shadowSlider->isOn());
@@ -868,7 +868,7 @@ void kstyle_baghira_config::removeApp(TQString name)
868 868
 
869 869
 void kstyle_baghira_config::addApp(TQString string, TQString linkString)
870 870
 {
871
-   applist->insertItem(new KListViewItem(applist, string, linkString));
871
+   applist->insertItem(new TDEListViewItem(applist, string, linkString));
872 872
    applist->sort();
873 873
 }
874 874
 
@@ -950,13 +950,13 @@ void kstyle_baghira_config::menuToggled(bool active)
950 950
 {
951 951
     if (!active || !loadDone)
952 952
         return;
953
-    KConfigGroup menuConfig(KGlobal::config(), "KDE");
953
+    TDEConfigGroup menuConfig(TDEGlobal::config(), "KDE");
954 954
     if (!menuConfig.readBoolEntry("macStyle", false))
955 955
         if (KMessageBox::questionYesNo(0, i18n("<qt>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<br>Do you want to activate it now?</qt>"), 0L, KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes)
956 956
     {
957
-        KProcess proc;
958
-        proc << "kcmshell" << "desktopbehavior";
959
-        proc.start(KProcess::DontCare);
957
+        TDEProcess proc;
958
+        proc << "tdecmshell" << "desktopbehavior";
959
+        proc.start(TDEProcess::DontCare);
960 960
         proc.detach();
961 961
     }
962 962
     configChanged();
@@ -1179,7 +1179,7 @@ void AppSetter::resetColorPicker()
1179 1179
       colorDialog->picker[High]->setColor(colorGroup().highlight());
1180 1180
       colorDialog->picker[HighText]->setColor(colorGroup().highlightedText());
1181 1181
       colorDialog->picker[ButText]->setColor(colorGroup().buttonText ());
1182
-      colorDialog->picker[Alternate]->setColor(KGlobalSettings::alternateBackgroundColor());
1182
+      colorDialog->picker[Alternate]->setColor(TDEGlobalSettings::alternateBackgroundColor());
1183 1183
       for (int i = 0; i < 8; i++)
1184 1184
          colorDialog->picker[i]->blockSignals(false);
1185 1185
       ((TQWidget*)colorDialog->demo)->repaint(false);

+ 6
- 6
config/kstyle_baghira_config.h View File

@@ -21,15 +21,15 @@
21 21
 #ifndef _KSTYLE_BAGHIRA_CONFIG_H_
22 22
 #define _KSTYLE_BAGHIRA_CONFIG_H_
23 23
 
24
-//#include <kcmodule.h>
24
+//#include <tdecmodule.h>
25 25
 #include <tqcolor.h>
26 26
 #include <tqimage.h>
27
-#include <kaboutdata.h>
27
+#include <tdeaboutdata.h>
28 28
 #include "configdialog.h"
29 29
 #include "help.h"
30 30
 #include "about.h"
31 31
 
32
-class KListView;
32
+class TDEListView;
33 33
 class TQPushButton;
34 34
 class AppSetter;
35 35
 class TQTimer;
@@ -50,7 +50,7 @@ public:
50 50
    void save(TQString &fileName);
51 51
 //    virtual int buttons();
52 52
    virtual TQString quickHelp() const;
53
-   virtual const KAboutData *aboutData()const
53
+   virtual const TDEAboutData *aboutData()const
54 54
    { return myAboutData; };
55 55
 
56 56
 public slots:
@@ -78,11 +78,11 @@ protected:
78 78
 private:
79 79
    TQString crNotes[3];
80 80
    AppSetter *appsetter;
81
-   KListView *applist;
81
+   TDEListView *applist;
82 82
    TQImage* tintButton(TQImage &src, TQColor c);
83 83
    TQImage* tintBrush( TQImage &img, TQColor c/*, int saturation*/ );
84 84
    WId findWindow();
85
-   KAboutData *myAboutData;
85
+   TDEAboutData *myAboutData;
86 86
    Config *dialog_;
87 87
    Help* help_;
88 88
    About* about_;

+ 1
- 1
deco/Doxyfile View File

@@ -3,7 +3,7 @@
3 3
 #---------------------------------------------------------------------------
4 4
 # Project related configuration options
5 5
 #---------------------------------------------------------------------------
6
-PROJECT_NAME           = baghira_deco.kdevelop
6
+PROJECT_NAME           = baghira_deco.tdevelop
7 7
 PROJECT_NUMBER         = $VERSION$
8 8
 OUTPUT_DIRECTORY       = 
9 9
 OUTPUT_LANGUAGE        = English

+ 10
- 10
deco/Makefile.am View File

@@ -4,22 +4,22 @@ SUBDIRS = config
4 4
 
5 5
 KDE_CXXFLAGS = -DQT_PLUGIN
6 6
 
7
-INCLUDES = $(all_includes) -I$(kde_includes)/kwin
7
+INCLUDES = $(all_includes) -I$(kde_includes)/twin
8 8
 
9
-kwindir = $(kde_datadir)/kwin/
10
-kwin_DATA = baghira.desktop
9
+twindir = $(kde_datadir)/twin/
10
+twin_DATA = baghira.desktop
11 11
 
12
-EXTRA_DIST = $(kwin_DATA) images
12
+EXTRA_DIST = $(twin_DATA) images
13 13
 
14 14
 noinst_HEADERS = baghiraclient.h pixmaps.h masks.h
15 15
 
16
-kde_module_LTLIBRARIES = kwin3_baghira.la
17
-kwin3_baghira_la_SOURCES = baghiraclient.cc
18
-kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la
19
-kwin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module
20
-kwin3_baghira_la_METASOURCES = AUTO
16
+kde_module_LTLIBRARIES = twin3_baghira.la
17
+twin3_baghira_la_SOURCES = baghiraclient.cc
18
+twin3_baghira_la_LIBADD = $(kde_libraries)/libtdecorations.la
19
+twin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -module
20
+twin3_baghira_la_METASOURCES = AUTO
21 21
 
22
-DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES)
22
+DISTCLEANFILES = $(twin3_baghira_la_METASOURCES)
23 23
 
24 24
 pixmaps.h: $(srcdir)/generatePixmaps.sh
25 25
 	$(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir)

+ 1
- 1
deco/baghira.desktop View File

@@ -2,4 +2,4 @@
2 2
 [Desktop Entry]
3 3
 Encoding=UTF-8
4 4
 Name=Baghira
5
-X-KDE-Library=kwin3_baghira
5
+X-TDE-Library=twin3_baghira

+ 7
- 7
deco/baghiraclient.cc View File

@@ -7,14 +7,14 @@
7 7
 // Please see the header file for copyright and license information.
8 8
 //////////////////////////////////////////////////////////////////////////////
9 9
 
10
-// #include <kconfig.h>
11
-#include <kglobal.h>
12
-#include <kglobalsettings.h>
10
+// #include <tdeconfig.h>
11
+#include <tdeglobal.h>
12
+#include <tdeglobalsettings.h>
13 13
 #include <kimageeffect.h>
14
-#include <klocale.h>
14
+#include <tdelocale.h>
15 15
 #include <kpixmapeffect.h>
16
-#include <kwin.h>
17
-#include <kwinmodule.h>
16
+#include <twin.h>
17
+#include <twinmodule.h>
18 18
 #include <tqapplication.h>
19 19
 #include <tqbitmap.h>
20 20
 #include <tqcursor.h>
@@ -370,7 +370,7 @@ unsigned long BaghiraFactory::readConfig() {
370 370
 	
371 371
         TQSettings config;
372 372
         config.beginGroup("/baghira/Style");
373
-//         KConfig config( "baghirarc" );
373
+//         TDEConfig config( "baghirarc" );
374 374
 //         config.setGroup( "Style" );
375 375
 	bgStipple_ = config.readBoolEntry( "Design_StippleBackground", false);
376 376
 	contrast_ = config.readNumEntry( "Design_StippleContrast", 30 );

+ 1
- 1
deco/baghiraclient.h View File

@@ -32,7 +32,7 @@
32 32
 #include <kdecoration.h>
33 33
 #include <kdecorationfactory.h>
34 34
 #include <kpixmap.h>
35
-#include <kdeversion.h>
35
+#include <tdeversion.h>
36 36
 /*
37 37
 #define BUTTONSIZE 15;
38 38
 #define MENUBUTTONWIDTH 20;

+ 7
- 7
deco/config/Makefile.am View File

@@ -6,16 +6,16 @@ INCLUDES = $(all_includes) -I$(srcdir)/../../config
6 6
 
7 7
 noinst_HEADERS = baghiraconfig.h aquariusbutton.h colorpicker.h pixmaps.h
8 8
 
9
-kde_module_LTLIBRARIES = kwin_baghira_config.la
10
-kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
11
-kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
12
-kwin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
13
-kwin_baghira_config_la_METASOURCES = AUTO
9
+kde_module_LTLIBRARIES = twin_baghira_config.la
10
+twin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
11
+twin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
12
+twin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
13
+twin_baghira_config_la_METASOURCES = AUTO
14 14
 
15
-DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES)
15
+DISTCLEANFILES = $(twin_baghira_config_la_METASOURCES)
16 16
 
17 17
 messages:
18
-	$(XGETTEXT) *.cpp -o $(podir)/kwin_baghira_config.pot
18
+	$(XGETTEXT) *.cpp -o $(podir)/twin_baghira_config.pot
19 19
 
20 20
 pixmaps.h: $(srcdir)/generatePixmaps.sh
21 21
 	$(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir)

+ 9
- 9
deco/config/baghiraconfig.cc View File

@@ -7,9 +7,9 @@
7 7
 // Please see the header file for copyright and license information.
8 8
 //////////////////////////////////////////////////////////////////////////////
9 9
 
10
-#include <kconfig.h>
11
-#include <klocale.h>
12
-#include <kglobal.h>
10
+#include <tdeconfig.h>
11
+#include <tdelocale.h>
12
+#include <tdeglobal.h>
13 13
 #include <kcolorbutton.h>
14 14
 #include <tqbutton.h>
15 15
 #include <tqbuttongroup.h>
@@ -38,13 +38,13 @@
38 38
 // -------------
39 39
 // Constructor
40 40
 
41
-BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent)
41
+BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent)
42 42
     : TQObject(parent), /*config_(0),*/ dialog_(0)
43 43
 {
44
-//     config_ = new KConfig("baghirarc");
44
+//     config_ = new TDEConfig("baghirarc");
45 45
 //     config_ = new TQSettings;
46 46
 //     config_->beginGroup("/baghira/Deco");
47
-    KGlobal::locale()->insertCatalogue("kwin_baghira_config");
47
+    TDEGlobal::locale()->insertCatalogue("twin_baghira_config");
48 48
 
49 49
     dialog_ = new ConfigDialog(parent);
50 50
     buttonDialog_ = new ButtonColors(parent, "Button Colors");
@@ -162,7 +162,7 @@ BaghiraConfig::~BaghiraConfig()
162 162
 // ------
163 163
 // Load configuration data
164 164
 
165
-void BaghiraConfig::load(KConfig*)
165
+void BaghiraConfig::load(TDEConfig*)
166 166
 {
167 167
     TQSettings *config_ = new TQSettings;
168 168
     config_->beginGroup("/baghira/Deco");
@@ -279,7 +279,7 @@ void BaghiraConfig::load(KConfig*)
279 279
 // ------
280 280
 // Save configuration data
281 281
 
282
-void BaghiraConfig::save(KConfig*)
282
+void BaghiraConfig::save(TDEConfig*)
283 283
 {
284 284
     TQSettings *config_ = new TQSettings;
285 285
     config_->beginGroup("/baghira/Deco");
@@ -721,7 +721,7 @@ void ButtonColors::init(){
721 721
     
722 722
 extern "C"
723 723
 {   
724
-    TQObject* allocate_config(KConfig* config, TQWidget* parent) {
724
+    TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
725 725
         return(new BaghiraConfig(config, parent));
726 726
     }
727 727
 }   

+ 9
- 9
deco/config/baghiraconfig.cc.new View File

@@ -7,9 +7,9 @@
7 7
 // Please see the header file for copyright and license information.
8 8
 //////////////////////////////////////////////////////////////////////////////
9 9
 
10
-#include <kconfig.h>
11
-#include <klocale.h>
12
-#include <kglobal.h>
10
+#include <tdeconfig.h>
11
+#include <tdelocale.h>
12
+#include <tdeglobal.h>
13 13
 #include <kcolorbutton.h>
14 14
 #include <tqbutton.h>
15 15
 #include <tqbuttongroup.h>
@@ -39,13 +39,13 @@
39 39
 // -------------
40 40
 // Constructor
41 41
 
42
-BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent)
42
+BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent)
43 43
     : TQObject(parent), /*config_(0),*/ dialog_(0)
44 44
 {
45
-//     config_ = new KConfig("baghirarc");
45
+//     config_ = new TDEConfig("baghirarc");
46 46
 //     config_ = new TQSettings;
47 47
 //     config_->beginGroup("/baghira/Deco");
48
-    KGlobal::locale()->insertCatalogue("kwin_baghira_config");
48
+    TDEGlobal::locale()->insertCatalogue("twin_baghira_config");
49 49
 
50 50
     dialog_ = new ConfigDialog(parent);
51 51
     buttonDialog_ = new ButtonColors(parent, "Button Colors");
@@ -163,7 +163,7 @@ BaghiraConfig::~BaghiraConfig()
163 163
 // ------
164 164
 // Load configuration data
165 165
 
166
-void BaghiraConfig::load(KConfig*)
166
+void BaghiraConfig::load(TDEConfig*)
167 167
 {
168 168
     TQSettings *config_ = new TQSettings;
169 169
     config_->beginGroup("/baghira/Deco");
@@ -280,7 +280,7 @@ void BaghiraConfig::load(KConfig*)
280 280
 // ------
281 281
 // Save configuration data
282 282
 
283
-void BaghiraConfig::save(KConfig*)
283
+void BaghiraConfig::save(TDEConfig*)
284 284
 {
285 285
     TQSettings *config_ = new TQSettings;
286 286
     config_->beginGroup("/baghira/Deco");
@@ -722,7 +722,7 @@ void ButtonColors::init(){
722 722
     
723 723
 extern "C"
724 724
 {   
725
-    TQObject* allocate_config(KConfig* config, TQWidget* parent) {
725
+    TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
726 726
         return(new BaghiraConfig(config, parent));
727 727
     }
728 728
 }   

+ 4
- 4
deco/config/baghiraconfig.h View File

@@ -32,7 +32,7 @@
32 32
 #include "colorpicker.h"
33 33
 #include "aquariusbutton.h"
34 34
 
35
-class KConfig;
35
+class TDEConfig;
36 36
 class TQSettings;
37 37
 class ConfigDialog;
38 38
 class TQLabel;
@@ -124,15 +124,15 @@ class BaghiraConfig : public TQObject
124 124
 {
125 125
     Q_OBJECT
126 126
 public:
127
-    BaghiraConfig(KConfig* config, TQWidget* parent);
127
+    BaghiraConfig(TDEConfig* config, TQWidget* parent);
128 128
     ~BaghiraConfig();
129 129
     
130 130
 signals:
131 131
     void changed();
132 132
 
133 133
 public slots:
134
-    void load(KConfig* conf);
135
-    void save(KConfig* conf);
134
+    void load(TDEConfig* conf);
135
+    void save(TDEConfig* conf);
136 136
     void defaults();
137 137
 
138 138
 private:

+ 4
- 4
deco/config/baghiraconfig.h.new View File

@@ -33,7 +33,7 @@
33 33
 #include "colorpicker.h"
34 34
 #include "aquariusbutton.h"
35 35
 
36
-class KConfig;
36
+class TDEConfig;
37 37
 class TQSettings;
38 38
 class ConfigDialog;
39 39
 class TQLabel;
@@ -126,15 +126,15 @@ class BaghiraConfig : public TQObject
126 126
 {
127 127
     Q_OBJECT
128 128
 public:
129
-    BaghiraConfig(KConfig* config, TQWidget* parent);
129
+    BaghiraConfig(TDEConfig* config, TQWidget* parent);
130 130
     ~BaghiraConfig();
131 131
     
132 132
 signals:
133 133
     void changed();
134 134
 
135 135
 public slots:
136
-    void load(KConfig* conf);
137
-    void save(KConfig* conf);
136
+    void load(TDEConfig* conf);
137
+    void save(TDEConfig* conf);
138 138
     void defaults();
139 139
 
140 140
 private:

+ 1
- 1
deco/config/configdialog.ui View File

@@ -123,7 +123,7 @@
123 123
                         <string>Draw Comic Frame</string>
124 124
                     </property>
125 125
                     <property name="toolTip" stdset="0">
126
-                        <string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the kwin dropshadow patch.</string>
126
+                        <string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the twin dropshadow patch.</string>
127 127
                     </property>
128 128
                 </widget>
129 129
                 <widget class="TQCheckBox" row="7" column="0">

+ 1
- 1
deco/config/configdialog.ui.new View File

@@ -211,7 +211,7 @@ from multipart titles</string>
211 211
                         <string>Draw Comic Frame</string>
212 212
                     </property>
213 213
                     <property name="toolTip" stdset="0">
214
-                        <string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the kwin dropshadow patch.</string>
214
+                        <string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the twin dropshadow patch.</string>
215 215
                     </property>
216 216
                 </widget>
217 217
                 <widget class="TQCheckBox" row="8" column="0">

+ 1
- 1
kickermenu-3.3/Makefile.am View File

@@ -14,7 +14,7 @@ lnk_DATA = b_menuapplet.desktop
14 14
 EXTRA_DIST = $(lnk_DATA)
15 15
 
16 16
 b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
17
-b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
17
+b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
18 18
 
19 19
 messages:
20 20
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot

+ 2
- 2
kickermenu-3.3/b_menuapplet.desktop View File

@@ -5,5 +5,5 @@ Comment=Applet embedding standalone menubars (Patched baghira version)
5 5
 
6 6
 Icon=menu
7 7
 
8
-X-KDE-Library=b_menu_panelapplet
9
-X-KDE-UniqueApplet=true
8
+X-TDE-Library=b_menu_panelapplet
9
+X-TDE-UniqueApplet=true

+ 10
- 10
kickermenu-3.3/menuapplet.cpp View File

@@ -30,15 +30,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30 30
 
31 31
 #include <assert.h>
32 32
 #include <tqcursor.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <tqtooltip.h>
35
-#include <kglobal.h>
36
-#include <klocale.h>
35
+#include <tdeglobal.h>
36
+#include <tdelocale.h>
37 37
 #include <tqlayout.h>
38 38
 #include <kdebug.h>
39 39
 #include <netwm.h>
40
-#include <kapplication.h>
41
-#include <kwin.h>
40
+#include <tdeapplication.h>
41
+#include <twin.h>
42 42
 
43 43
 #include <X11/Xlib.h>
44 44
 
@@ -63,7 +63,7 @@ extern "C"
63 63
 {
64 64
     KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
65 65
     {
66
-      KGlobal::locale()->insertCatalogue("kmenuapplet");
66
+      TDEGlobal::locale()->insertCatalogue("kmenuapplet");
67 67
       return new KickerMenuApplet::Applet( configFile_P, parent_P );
68 68
     }
69 69
 }
@@ -120,7 +120,7 @@ Applet::~Applet()
120 120
     delete selection;
121 121
     delete selection_watcher;
122 122
     delete module;
123
-    KGlobal::locale()->removeCatalogue("kmenuapplet");
123
+    TDEGlobal::locale()->removeCatalogue("kmenuapplet");
124 124
     }
125 125
 
126 126
 void Applet::initPopup()
@@ -428,7 +428,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */)
428 428
 void Applet::claimSelection()
429 429
     {
430 430
     assert( selection == NULL );
431
-    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
431
+    selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
432 432
 // force taking the selection, but don't kill previous owner
433 433
     if( selection->claim( true, false ))
434 434
 	{
@@ -464,7 +464,7 @@ void Applet::lostSelection()
464 464
     active_menu = NULL;
465 465
     if( selection_watcher == NULL )
466 466
         {
467
-        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
467
+        selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
468 468
         connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection()));
469 469
         }
470 470
     delete module;
@@ -476,7 +476,7 @@ void Applet::lostSelection()
476 476
 
477 477
 void Applet::readSettings()
478 478
     {
479
-    KConfig cfg( "kdesktoprc", true );
479
+    TDEConfig cfg( "kdesktoprc", true );
480 480
     cfg.setGroup( "Menubar" );
481 481
     desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
482 482
     cfg.setGroup( "KDE" );

+ 4
- 4
kickermenu-3.3/menuapplet.h View File

@@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29 29
 #include <tqintdict.h>
30 30
 #include <tqvaluelist.h>
31 31
 #include <tqmenubar.h>
32
-#include <kwindowlistmenu.h>
33
-#include <kwinmodule.h>
32
+#include <twindowlistmenu.h>
33
+#include <twinmodule.h>
34 34
 #include <kmanagerselection.h>
35 35
 #include <dcopclient.h>
36 36
 #include <dcopobject.h>
@@ -80,8 +80,8 @@ class Applet : public KPanelApplet, public DCOPObject
80 80
 	TQValueList< MenuEmbed* > menus;
81 81
 	MenuEmbed* active_menu;
82 82
 	KArrowButton grow_indicator_left, grow_indicator_right;
83
-	KSelectionOwner* selection;
84
-        KSelectionWatcher* selection_watcher;
83
+	TDESelectionOwner* selection;
84
+        TDESelectionWatcher* selection_watcher;
85 85
         bool desktop_menu;
86 86
         DCOPClient dcopclient;
87 87
         // to show current active window (not necessary equal to the menubar)   

+ 1
- 1
kickermenu/Makefile.am View File

@@ -9,7 +9,7 @@ noinst_HEADERS = menuapplet.h
9 9
 b_menu_panelapplet_la_METASOURCES = AUTO
10 10
 
11 11
 b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
12
-b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
12
+b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
13 13
 
14 14
 messages:
15 15
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot

+ 1
- 1
kickermenu/configure.in.in View File

@@ -1,2 +1,2 @@
1
-AM_CONDITIONAL( HAVE_3_4, test $(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )
1
+AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )
2 2
 

+ 16
- 16
kickermenu/menuapplet.cpp View File

@@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 31
 #include <tqtooltip.h>
32 32
 #include <tqtimer.h>
33 33
 #include <tqvariant.h> // avoid X11 #define's
34
-#include <kapplication.h>
35
-#include <kconfig.h>
34
+#include <tdeapplication.h>
35
+#include <tdeconfig.h>
36 36
 #include <kdebug.h>
37
-#include <kglobal.h>
38
-#include <kglobalsettings.h>
39
-#include <klocale.h>
40
-#include <kwin.h>
41
-#include <kwinmodule.h>
37
+#include <tdeglobal.h>
38
+#include <tdeglobalsettings.h>
39
+#include <tdelocale.h>
40
+#include <twin.h>
41
+#include <twinmodule.h>
42 42
 
43 43
 #include <netwm.h>
44 44
 
@@ -67,7 +67,7 @@ extern "C"
67 67
 {
68 68
     KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
69 69
     {
70
-      KGlobal::locale()->insertCatalogue("kmenuapplet");
70
+      TDEGlobal::locale()->insertCatalogue("kmenuapplet");
71 71
       return new KickerMenuApplet::Applet( configFile_P, parent_P );
72 72
     }
73 73
 }
@@ -87,7 +87,7 @@ const long SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::Do
87 87
 
88 88
 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 )
89 89
 {
90
-   KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
90
+   TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
91 91
    config.setGroup("Menubar");
92 92
    _maxWidth = config.readNumEntry("Width", TQDesktopWidget().availableGeometry().width());
93 93
    _menuMover = new TQLabel("<<|>>", this );
@@ -103,7 +103,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple
103 103
    windowList = new KWindowListMenu(windowIndicator);
104 104
    connect(windowList, SIGNAL(aboutToShow()), this, SLOT(initPopup()));
105 105
    windowIndicator->insertItem( "KDE", windowList, 0);
106
-   TQFont tmpFont = KGlobalSettings::menuFont();
106
+   TQFont tmpFont = TDEGlobalSettings::menuFont();
107 107
    windowIndicator->setFont(tmpFont);
108 108
 //    windowIndicator->adjustSize();
109 109
 //    int tmpHeight = windowIndicator->height();
@@ -117,7 +117,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple
117 117
    //==============
118 118
    // toolbarAppearanceChanged(int) is sent when changing macstyle
119 119
    connect( kapp, SIGNAL( toolbarAppearanceChanged( int )), this, SLOT( readSettings()));
120
-   connect( kapp, SIGNAL( kdisplayFontChanged()), this, SLOT( fontChanged()));
120
+   connect( kapp, SIGNAL( tdedisplayFontChanged()), this, SLOT( fontChanged()));
121 121
    claimSelection();
122 122
    readSettings();
123 123
    updateTopEdgeOffset();
@@ -129,14 +129,14 @@ Applet::~Applet()
129 129
    delete selection;
130 130
    delete selection_watcher;
131 131
    delete module;
132
-   KGlobal::locale()->removeCatalogue("kmenuapplet");
132
+   TDEGlobal::locale()->removeCatalogue("kmenuapplet");
133 133
 }
134 134
 
135 135
 void Applet::fontChanged()
136 136
 {
137 137
    if (!windowIndicator)
138 138
       return;
139
-   TQFont tmpFont = KGlobalSettings::menuFont();
139
+   TQFont tmpFont = TDEGlobalSettings::menuFont();
140 140
 //    windowIndicator->setFont(tmpFont);
141 141
 //    windowIndicator->adjustSize();
142 142
 //    int tmpHeight = windowIndicator->height();
@@ -504,7 +504,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */)
504 504
 void Applet::claimSelection()
505 505
 {
506 506
    assert( selection == NULL );
507
-   selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
507
+   selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
508 508
 // force taking the selection, but don't kill previous owner
509 509
    if( selection->claim( true, false ))
510 510
    {
@@ -536,7 +536,7 @@ void Applet::lostSelection()
536 536
     active_menu = NULL;
537 537
     if( selection_watcher == NULL )
538 538
         {
539
-        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
539
+        selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
540 540
         connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection()));
541 541
         }
542 542
     delete module;
@@ -548,7 +548,7 @@ void Applet::lostSelection()
548 548
 
549 549
 void Applet::readSettings()
550 550
     {
551
-    KConfig cfg( "kdesktoprc", true );
551
+    TDEConfig cfg( "kdesktoprc", true );
552 552
     cfg.setGroup( "Menubar" );
553 553
     desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
554 554
     cfg.setGroup( "KDE" );

+ 5
- 5
kickermenu/menuapplet.h View File

@@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 28
 #include <kpanelapplet.h>
29 29
 #include <tqintdict.h>
30 30
 #include <tqvaluelist.h>
31
-#include <kmenubar.h>
32
-#include <kwindowlistmenu.h>
33
-#include <kwinmodule.h>
31
+#include <tdemenubar.h>
32
+#include <twindowlistmenu.h>
33
+#include <twinmodule.h>
34 34
 #include <kmanagerselection.h>
35 35
 #include <dcopclient.h>
36 36
 #include <dcopobject.h>
@@ -85,8 +85,8 @@ private:
85 85
    KWinModule* module;
86 86
    TQValueList< MenuEmbed* > menus;
87 87
    MenuEmbed* active_menu;
88
-   KSelectionOwner* selection;
89
-   KSelectionWatcher* selection_watcher;
88
+   TDESelectionOwner* selection;
89
+   TDESelectionWatcher* selection_watcher;
90 90
    bool desktop_menu;
91 91
    DCOPClient dcopclient;
92 92
    int topEdgeOffset;

+ 1
- 1
sessionapplet/Makefile.am View File

@@ -5,7 +5,7 @@ lib_LTLIBRARIES = usermanager_panelapplet.la
5 5
 
6 6
 usermanager_panelapplet_la_SOURCES = usermanager.cpp dmctl.cpp
7 7
 usermanager_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries)
8
-usermanager_panelapplet_la_LIBADD = $(LIB_KDEUI)
8
+usermanager_panelapplet_la_LIBADD = $(LIB_TDEUI)
9 9
 
10 10
 usermanager_DATA = usermanager.desktop
11 11
 usermanagerdir = $(kde_datadir)/kicker/applets

+ 11
- 11
sessionapplet/dmctl.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #ifdef Q_WS_X11
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <dcopclient.h>
26 26
 
27 27
 #include <sys/types.h>
@@ -91,16 +91,16 @@ DM::exec( const char *cmd )
91 91
 }
92 92
 
93 93
 /**
94
- * Execute a KDM remote control command.
94
+ * Execute a TDM remote control command.
95 95
  * @param cmd the command to execute. FIXME: undocumented yet.
96 96
  * @param ret the result buffer.
97 97
  * @return result:
98 98
  *  @li If true, the command was successfully executed.
99 99
  *   @p ret might contain addional results.
100 100
  *  @li If false and @p ret is empty, a communication error occurred
101
- *   (most probably KDM is not running).
101
+ *   (most probably TDM is not running).
102 102
  *  @li If false and @p ret is non-empty, it contains the error message
103
- *   from KDM.
103
+ *   from TDM.
104 104
  */
105 105
 bool
106 106
 DM::exec( const char *cmd, TQCString &buf )
@@ -157,24 +157,24 @@ DM::canShutdown()
157 157
 }
158 158
 
159 159
 void
160
-DM::shutdown( KApplication::ShutdownType shutdownType,
161
-              KApplication::ShutdownMode shutdownMode,
160
+DM::shutdown( TDEApplication::ShutdownType shutdownType,
161
+              TDEApplication::ShutdownMode shutdownMode,
162 162
               const TQString &bootOption )
163 163
 {
164 164
 	if (!bootOption.isEmpty() && DMType != NewKDM)
165 165
 		return;
166 166
 
167
-	if (shutdownType != KApplication::ShutdownTypeNone) {
167
+	if (shutdownType != TDEApplication::ShutdownTypeNone) {
168 168
 		TQCString cmd( "shutdown\t" );
169
-		cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
169
+		cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
170 170
 		            "reboot\t" : "halt\t" );
171 171
 		if (!bootOption.isNull())
172 172
 			cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" );
173
-		cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ?
173
+		cmd.append( shutdownMode == TDEApplication::ShutdownModeInteractive ?
174 174
 		            "ask\n" :
175
-		            shutdownMode == KApplication::ShutdownModeForceNow ?
175
+		            shutdownMode == TDEApplication::ShutdownModeForceNow ?
176 176
 		            "forcenow\n" :
177
-		            shutdownMode == KApplication::ShutdownModeTryNow ?
177
+		            shutdownMode == TDEApplication::ShutdownModeTryNow ?
178 178
 		            "trynow\n" : "schedule\n" );
179 179
 		exec( cmd.data() );
180 180
 	}

+ 5
- 5
sessionapplet/dmctl.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef DMCTL_H
22 22
 #define DMCTL_H
23 23
 
24
-#include <kapplication.h>
24
+#include <tdeapplication.h>
25 25
 
26 26
 struct SessEnt {
27 27
 	TQString display, from, user, session;
@@ -40,8 +40,8 @@ public:
40 40
 	~DM();
41 41
 
42 42
 	bool canShutdown();
43
-	void shutdown( KApplication::ShutdownType shutdownType,
44
-	               KApplication::ShutdownMode shutdownMode,
43
+	void shutdown( TDEApplication::ShutdownType shutdownType,
44
+	               TDEApplication::ShutdownMode shutdownMode,
45 45
 	               const TQString &bootOption = TQString::null );
46 46
 
47 47
 	void setLock( bool on );
@@ -70,8 +70,8 @@ public:
70 70
 	DM() {}
71 71
 
72 72
 	bool canShutdown() { return false; }
73
-	void shutdown( KApplication::ShutdownType shutdownType,
74
-	               KApplication::ShutdownMode shutdownMode,
73
+	void shutdown( TDEApplication::ShutdownType shutdownType,
74
+	               TDEApplication::ShutdownMode shutdownMode,
75 75
 	               const TQString &bootOption = TQString::null ) {}
76 76
 
77 77
 	void setLock( bool ) {}

+ 14
- 14
sessionapplet/usermanager.cpp View File

@@ -19,25 +19,25 @@
19 19
  ***************************************************************************/
20 20
 
21 21
 #include <stdlib.h>
22
-#include <kmenubar.h>
22
+#include <tdemenubar.h>
23 23
 // #include <tqlabel.h>
24 24
 #include <tqlayout.h>
25 25
 #include <tqpopupmenu.h>
26 26
 #include <dcopclient.h>
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 #include <kiconloader.h>
29
-#include <klocale.h>
30
-#include <kconfig.h>
29
+#include <tdelocale.h>
30
+#include <tdeconfig.h>
31 31
 #include <ksimpleconfig.h>
32
-#include <kapplication.h>
33
-#include <kdeversion.h>
34
-#include <kmessagebox.h>
32
+#include <tdeapplication.h>
33
+#include <tdeversion.h>
34
+#include <tdemessagebox.h>
35 35
 #include <kservice.h>
36 36
 #include <kstandarddirs.h>
37 37
 #include "dmctl.h"
38 38
 #include "usermanager.h"
39 39
 
40
-#define _ICONSET_(i) KGlobal::iconLoader()->loadIconSet(i, KIcon::Small, 0, false)
40
+#define _ICONSET_(i) TDEGlobal::iconLoader()->loadIconSet(i, TDEIcon::Small, 0, false)
41 41
 
42 42
 
43 43
 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
66 66
    // languages
67 67
    langPopup = new TQPopupMenu(this);
68 68
    
69
-   KConfigBase *config = KGlobal::config();
69
+   TDEConfigBase *config = TDEGlobal::config();
70 70
    config->setGroup("Locale");
71 71
    langList = config->readListEntry ("Language", ':');
72 72
 //    TQString flag( locate( "locale", TQString::fromLatin1( "l10n/%1/flag.png" ).arg(langList[0]) ) );
@@ -123,14 +123,14 @@ void UserManager::logout()
123 123
 void UserManager::slotPopulateLanguages()
124 124
 {
125 125
    langPopup->clear();
126
-   KConfig *config = new KConfig("kdeglobals");
126
+   TDEConfig *config = new TDEConfig("kdeglobals");
127 127
    config->setGroup("Locale");
128 128
    langList = config->readListEntry ("Language", ':');
129 129
    int i = 0;
130 130
    for ( TQStringList::ConstIterator it = langList.begin();
131 131
          it != langList.end(); ++it )
132 132
    {
133
-      KConfig entry(locate( "locale", TQString::fromLatin1( "%1/entry.desktop" ).arg(*it) ));
133
+      TDEConfig entry(locate( "locale", TQString::fromLatin1( "%1/entry.desktop" ).arg(*it) ));
134 134
       entry.setGroup("KCM Locale");
135 135
       TQString name = entry.readEntry("Name", i18n("without name"));
136 136
       
@@ -147,7 +147,7 @@ void UserManager::slotLanguageActivated( int i )
147 147
       return; // no change, no action
148 148
    menu->changeItem ( 1, '[' + langList[i].section('_',0,0) + ']'/**langPopup->pixmap(i)*/ );
149 149
 //    langLabel->setPixmap(*langPopup->pixmap(i));
150
-   KConfig *config = new KConfig("kdeglobals");
150
+   TDEConfig *config = new TDEConfig("kdeglobals");
151 151
    config->setGroup("Locale");
152 152
    TQString tmp = langList[i];
153 153
    langList.remove(langList.at(i));
@@ -193,7 +193,7 @@ void UserManager::slotPopulateSessions()
193 193
       }
194 194
       // save
195 195
    sessionPopup->insertSeparator();
196
-   KConfig ksmserver("ksmserverrc", false, false);
196
+   TDEConfig ksmserver("ksmserverrc", false, false);
197 197
    ksmserver.setGroup("General");
198 198
    if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
199 199
    {
@@ -275,7 +275,7 @@ extern "C"
275 275
 {
276 276
     KPanelApplet* init( TQWidget *parent, const TQString& configFile)
277 277
     {
278
-        KGlobal::locale()->insertCatalogue("usermanager");
278
+        TDEGlobal::locale()->insertCatalogue("usermanager");
279 279
         return new UserManager(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "usermanager");
280 280
     }
281 281
 }

+ 2
- 2
sessionapplet/usermanager.desktop View File

@@ -4,5 +4,5 @@ Comment=Session Control, Lock, Logout, Change
4 4
 Name=SessionManager
5 5
 Name[xx]=xxSessionManagerxx
6 6
 Icon=fork
7
-X-KDE-Library=usermanager_panelapplet
8
-X-KDE-UniqueApplet = true
7
+X-TDE-Library=usermanager_panelapplet
8
+X-TDE-UniqueApplet = true

+ 2
- 2
sessionapplet/usermanager.h View File

@@ -30,7 +30,7 @@
30 30
 #include <tqstring.h>
31 31
 #include <tqiconset.h>
32 32
 #include <tqstringlist.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 
35 35
 class KMenuBar;
36 36
 class TQPopunMenu;
@@ -63,7 +63,7 @@ protected:
63 63
    void doNewSession(bool lock_);
64 64
     
65 65
 private:
66
-   KConfig *ksConfig;
66
+   TDEConfig *ksConfig;
67 67
    TQWidget *mainView;
68 68
    KMenuBar *menu;
69 69
    TQPopupMenu *sessionPopup;

+ 1
- 1
sidebar/Makefile.am View File

@@ -7,7 +7,7 @@ noinst_HEADERS = baghiralinkdrag.h baghirasidebar.h linkview.h listboxlink.h dnd
7 7
 
8 8
 konqsidebar_baghirasidebar_la_SOURCES = baghiralinkdrag.cpp baghirasidebar.cpp linkview.cpp listboxlink.cpp dndlistbox.cpp linkconfig.ui baghirasidebariface.skel
9 9
 konqsidebar_baghirasidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
10
-konqsidebar_baghirasidebar_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KFILE)
10
+konqsidebar_baghirasidebar_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_KFILE)
11 11
 
12 12
 baghirasidebar_entry_DATA = baghirasidebar.desktop
13 13
 baghirasidebar_entrydir = $(kde_datadir)/konqsidebartng/entries

+ 4
- 4
sidebar/baghirasidebar.cpp View File

@@ -9,7 +9,7 @@
9 9
 #include "baghirasidebar.h"
10 10
 #include "baghirasidebar.moc"
11 11
 
12
-baghiraSidebar::baghiraSidebar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
12
+baghiraSidebar::baghiraSidebar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
13 13
                    KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
14 14
 {
15 15
    scrollView = new LinkView(widgetParent);
@@ -36,7 +36,7 @@ void baghiraSidebar::handleURL(const KURL &url)
36 36
       scrollView->Hardware()->setSelected(item, FALSE);
37 37
       return;
38 38
    }
39
-   item = scrollView->Locations()->KListBox::currentItem();
39
+   item = scrollView->Locations()->TDEListBox::currentItem();
40 40
    if (scrollView->Locations()->isSelected(item) && 
41 41
       KURL(((ListBoxLink*)(scrollView->Locations()->item(item)))->URL()).url() != url.url() )
42 42
    {
@@ -53,7 +53,7 @@ extern "C" {
53 53
       map->insert("Icon", "bab_brushed");
54 54
       map->insert("Name", "Baghira Sidebar");
55 55
       map->insert("Open", "true");
56
-      map->insert("X-KDE-KonqSidebarModule","konqsidebar_baghirasidebar");
56
+      map->insert("X-TDE-KonqSidebarModule","konqsidebar_baghirasidebar");
57 57
       fn->setLatin1("baghirasidebar%1.desktop");
58 58
       return true;
59 59
    }
@@ -61,7 +61,7 @@ extern "C" {
61 61
 
62 62
 extern "C"
63 63
 {
64
-    void* create_konqsidebar_baghirasidebar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
64
+    void* create_konqsidebar_baghirasidebar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
65 65
     {
66 66
         return new baghiraSidebar(instance,par,widp,desktopname,name);
67 67
     }

+ 1
- 1
sidebar/baghirasidebar.desktop View File

@@ -8,5 +8,5 @@ Name=baghirasidebar
8 8
 Name[xx]=xxbaghirasidebarxx
9 9
 
10 10
 Open=false
11
-X-KDE-KonqSidebarModule=konqsidebar_baghirasidebar
11
+X-TDE-KonqSidebarModule=konqsidebar_baghirasidebar
12 12
 

+ 3
- 3
sidebar/baghirasidebar.h View File

@@ -7,10 +7,10 @@
7 7
 #endif
8 8
 
9 9
 #include <konqsidebarplugin.h>
10
-#include <kconfig.h>
10
+#include <tdeconfig.h>
11 11
 
12 12
 class LinkView;
13
-class KListBox;
13
+class TDEListBox;
14 14
 class TQListBoxItem;
15 15
 
16 16
 class baghiraSidebar : public KonqSidebarPlugin
@@ -27,7 +27,7 @@ public:
27 27
      * @param desktopName The filename of the configuration file.
28 28
      * @param name A TQt object name for your plugin.
29 29
      **/
30
-     baghiraSidebar(KInstance *inst,TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name=0);
30
+     baghiraSidebar(TDEInstance *inst,TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name=0);
31 31
 
32 32
     /** destructor */
33 33
     ~baghiraSidebar();

+ 1
- 1
sidebar/baghirasidebar_add.desktop View File

@@ -7,4 +7,4 @@ Name[de]=Baghira Sideabr hinzuf
7 7
 Open=false
8 8
 Type=Link
9 9
 URL=
10
-X-KDE-KonqSidebarAddModule=konqsidebar_baghirasidebar
10
+X-TDE-KonqSidebarAddModule=konqsidebar_baghirasidebar

+ 1
- 1
sidebar/configure.in.in View File

@@ -1,2 +1,2 @@
1
-AM_CONDITIONAL( HAVE_3_4, test $(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )
1
+AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )
2 2
 

+ 25
- 25
sidebar/dndlistbox.cpp View File

@@ -4,17 +4,17 @@
4 4
 #include <kurl.h>
5 5
 #include <tqstrlist.h>
6 6
 #include <tqtimer.h>
7
-#include <kapplication.h>
8
-#include <klocale.h>
9
-#include <kfileitem.h>
10
-#include <kpopupmenu.h>
7
+#include <tdeapplication.h>
8
+#include <tdelocale.h>
9
+#include <tdefileitem.h>
10
+#include <tdepopupmenu.h>
11 11
 #include <kicondialog.h>
12 12
 #include <kiconloader.h>
13 13
 #include <klineedit.h>
14 14
 #include <kprocess.h>
15 15
 #include <kurlrequester.h>
16 16
 #include <kstandarddirs.h>
17
-#include <kwin.h>
17
+#include <twin.h>
18 18
 #include <tqclipboard.h>
19 19
 #include "listboxlink.h"
20 20
 #include "linkconfig.h"
@@ -37,12 +37,12 @@
37 37
 #define MEDIA_PROPS 12
38 38
 #define MEDIALIST_PROPS 13
39 39
 
40
-ResizingLinkBox::ResizingLinkBox( TQWidget * parent, const char * name, WFlags f ) : KListBox( parent, name, f)
40
+ResizingLinkBox::ResizingLinkBox( TQWidget * parent, const char * name, WFlags f ) : TDEListBox( parent, name, f)
41 41
 {
42
-   KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
42
+   TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
43 43
    config.setGroup("Sidebar");
44 44
    size_ = config.readNumEntry (TQString(name) + "_IconSize", 48);
45
-   popupMenu = new KPopupMenu;
45
+   popupMenu = new TDEPopupMenu;
46 46
    popupMenu->insertTitle (i18n("Icon Size"),122,122);
47 47
    popupMenu->insertItem("16x16", this, SLOT(setIconSize(int)),0,16,123);
48 48
    popupMenu->insertItem("22x22", this, SLOT(setIconSize(int)),0,22,124);
@@ -54,14 +54,14 @@ ResizingLinkBox::ResizingLinkBox( TQWidget * parent, const char * name, WFlags f
54 54
 
55 55
 void ResizingLinkBox::insertItem( const TQListBoxItem *lbi, int index )
56 56
 {
57
-   KListBox::insertItem( lbi, index );
57
+   TDEListBox::insertItem( lbi, index );
58 58
    if (height() <= numRows()*itemHeight())
59 59
       emit itemNumberChanged(TRUE);
60 60
 }
61 61
 
62 62
 void ResizingLinkBox::insertItem( const TQListBoxItem *lbi, const TQListBoxItem *after )
63 63
 {
64
-   KListBox::insertItem( lbi, after );
64
+   TDEListBox::insertItem( lbi, after );
65 65
    if (height() <= numRows()*itemHeight())
66 66
       emit itemNumberChanged(TRUE);
67 67
 }
@@ -75,7 +75,7 @@ void ResizingLinkBox::insertItem( const TQString & icon, const TQString & title,
75 75
 void ResizingLinkBox::removeItem( int index )
76 76
 {
77 77
    blockSignals ( true );
78
-   KListBox::removeItem(index);
78
+   TDEListBox::removeItem(index);
79 79
    blockSignals ( false );
80 80
    emit itemNumberChanged(FALSE);
81 81
 }
@@ -83,7 +83,7 @@ void ResizingLinkBox::removeItem( int index )
83 83
 void ResizingLinkBox::setIconSize(int size)
84 84
 {
85 85
    size_ = size;
86
-   KConfig *config = new KConfig(TQDir::homeDirPath() + "/.qt/baghirarc");
86
+   TDEConfig *config = new TDEConfig(TQDir::homeDirPath() + "/.qt/baghirarc");
87 87
    config->setGroup("Sidebar");
88 88
    config->writeEntry (TQString(name()) + "_IconSize", size);
89 89
    config->sync();
@@ -102,14 +102,14 @@ void ResizingLinkBox::setIconSize(int size)
102 102
       {
103 103
          insertItem( new ListBoxLink(runner->icon(), size, runner->text(), runner->URL()), i );
104 104
       }
105
-      KListBox::removeItem(i+1);
105
+      TDEListBox::removeItem(i+1);
106 106
    }
107 107
    blockSignals ( false );
108 108
 }
109 109
 
110 110
 void ResizingLinkBox::mousePressEvent ( TQMouseEvent *mpe )
111 111
 {
112
-   KListBox::mousePressEvent( mpe );
112
+   TDEListBox::mousePressEvent( mpe );
113 113
 }
114 114
 
115 115
 void ResizingLinkBox::mouseReleaseEvent ( TQMouseEvent *mpe )
@@ -118,27 +118,27 @@ void ResizingLinkBox::mouseReleaseEvent ( TQMouseEvent *mpe )
118 118
    {
119 119
       ListBoxLink *link = (ListBoxLink*)itemAt(mpe->pos());
120 120
       if (isSelected(link)) emit clicked(link);
121
-      KListBox::mousePressEvent( mpe );
121
+      TDEListBox::mousePressEvent( mpe );
122 122
       return;
123 123
    }
124
-   KListBox::mouseReleaseEvent( mpe );
124
+   TDEListBox::mouseReleaseEvent( mpe );
125 125
 }
126 126
 
127 127
 void ResizingLinkBox::contentsWheelEvent ( TQWheelEvent * we )
128 128
 {
129 129
    if (we->state() == TQt::ControlButton)
130
-      KListBox::contentsWheelEvent ( we );
130
+      TDEListBox::contentsWheelEvent ( we );
131 131
    else
132 132
       emit scrolled(0, -we->delta());
133 133
 }
134 134
 
135 135
 MediaListBox::MediaListBox( TQWidget * parent, const char * name, WFlags f ) : ResizingLinkBox(parent, name, f), DCOPObject("BaghiraSidebarIface")
136 136
 {
137
-   KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
137
+   TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
138 138
    config.setGroup("Sidebar");
139 139
    hiddenDevices = config.readListEntry("HiddenDevices");
140 140
    currentFloppy = 0L;
141
-   devicePopup = new KPopupMenu(this);
141
+   devicePopup = new TDEPopupMenu(this);
142 142
    devicePopup->setCheckable ( true );
143 143
    popupMenu->insertItem(i18n("Device List"), devicePopup, 1, 0);
144 144
    popupMenu->insertSeparator( 0 );
@@ -151,7 +151,7 @@ MediaListBox::MediaListBox( TQWidget * parent, const char * name, WFlags f ) : R
151 151
    insertItem(new ListBoxDevice("network", size_, i18n("Network"), "lan:/localhost", "", "", TRUE, FALSE, FALSE));
152 152
 #endif
153 153
    insertItem(new ListBoxDevice("hdd_mount", size_, i18n("Startvolume"), TQDir::rootDirPath(), "", "", TRUE, FALSE, FALSE));
154
-   client = KApplication::dcopClient();
154
+   client = TDEApplication::dcopClient();
155 155
    client->connectDCOPSignal("kded", "mediamanager", "mediumAdded(TQString)", "BaghiraSidebarIface", "mediumAdded(TQString)", FALSE);
156 156
    client->connectDCOPSignal("kded", "mediamanager", "mediumRemoved(TQString)", "BaghiraSidebarIface", "mediumRemoved(const TQString)", FALSE);
157 157
    client->connectDCOPSignal("kded", "mediamanager", "mediumChanged(TQString)", "BaghiraSidebarIface", "mediumChanged(TQString)", FALSE);
@@ -206,7 +206,7 @@ MediaListBox::~MediaListBox()
206 206
    ListBoxDevice *runner;
207 207
    for ( runner = deviceList.first(); runner; runner = deviceList.next() )
208 208
       hiddenDevices.append(runner->name());
209
-   KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
209
+   TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
210 210
    config.setGroup("Sidebar");
211 211
    config.writeEntry("HiddenDevices", hiddenDevices);
212 212
 }
@@ -221,9 +221,9 @@ void MediaListBox::kfloppy()
221 221
 {
222 222
    if (currentFloppy)
223 223
    {
224
-      KProcess proc;
224
+      TDEProcess proc;
225 225
       proc << "kfloppy" << currentFloppy->mountPoint();
226
-      proc.start(KProcess::DontCare);
226
+      proc.start(TDEProcess::DontCare);
227 227
       proc.detach();
228 228
       currentFloppy = 0L;
229 229
    }
@@ -433,11 +433,11 @@ void MediaListBox::mousePressEvent ( TQMouseEvent *mpe )
433 433
       int dy = itemRect(device).y();
434 434
       if ((device->removable() || device->ejectable()) && device->mounted() && mpe->y() > dy+11 && mpe->y() < dy+33)
435 435
       {
436
-         KProcess proc;
436
+         TDEProcess proc;
437 437
          device->ejectable()?
438 438
             proc << "kdeeject" /*<< "-q"*/ << device->mountPoint():
439 439
             proc << "umount" << device->mountPoint(); // umount?
440
-         proc.start(KProcess::DontCare);
440
+         proc.start(TDEProcess::DontCare);
441 441
          proc.detach();
442 442
          return;
443 443
       }

+ 6
- 6
sidebar/dndlistbox.h View File

@@ -6,7 +6,7 @@
6 6
 #include <config.h>
7 7
 #endif
8 8
 
9
-#include <klistbox.h>
9
+#include <tdelistbox.h>
10 10
 #include <tqptrlist.h>
11 11
 #include <tqstringlist.h>
12 12
 #include "baghirasidebariface.h"
@@ -18,13 +18,13 @@ class TQDragLeaveEvent;
18 18
 class TQDropEvent;
19 19
 class TQKeyEvent;
20 20
 class TQPoint;
21
-class KPopupMenu;
21
+class TDEPopupMenu;
22 22
 class LinkConfig;
23 23
 class ListBoxLink;
24 24
 class ListBoxDevice;
25 25
 class TQResizeEvent;
26 26
 
27
-class ResizingLinkBox : public KListBox
27
+class ResizingLinkBox : public TDEListBox
28 28
 {
29 29
     Q_OBJECT
30 30
     
@@ -51,7 +51,7 @@ protected:
51 51
    void mousePressEvent ( TQMouseEvent * );
52 52
    void mouseReleaseEvent ( TQMouseEvent * );
53 53
    void contentsWheelEvent ( TQWheelEvent * );
54
-   KPopupMenu *popupMenu;
54
+   TDEPopupMenu *popupMenu;
55 55
    uint size_;
56 56
 private slots:
57 57
    void setIconSize(int);
@@ -76,7 +76,7 @@ protected:
76 76
    void mousePressEvent ( TQMouseEvent * );
77 77
    void resizeEvent ( TQResizeEvent * );
78 78
 private:
79
-   KPopupMenu *devicePopup;
79
+   TDEPopupMenu *devicePopup;
80 80
    DCOPClient *client;
81 81
    ListBoxDevice *currentFloppy;
82 82
    typedef TQPtrList<ListBoxDevice> DeviceList;
@@ -108,7 +108,7 @@ protected:
108 108
    void dropEvent ( TQDropEvent * );
109 109
    void startDrag();
110 110
 private:
111
-   ListBoxLink *currentItem; //TODO: unshadow int KListBox::currentItem()
111
+   ListBoxLink *currentItem; //TODO: unshadow int TDEListBox::currentItem()
112 112
    LinkConfig *dialog;
113 113
    bool dragging_;
114 114
    void pasteURL(int mode, TQListBoxItem *after = 0);

+ 1
- 1
sidebar/linkconfig.ui View File

@@ -124,7 +124,7 @@
124 124
                 </widget>
125 125
             </hbox>
126 126
         </widget>
127
-        <widget class="KIconButton" row="0" column="1">
127
+        <widget class="TDEIconButton" row="0" column="1">
128 128
             <property name="name">
129 129
                 <cstring>icon</cstring>
130 130
             </property>

+ 4
- 4
sidebar/linkview.cpp View File

@@ -2,9 +2,9 @@
2 2
 #include <stdlib.h>
3 3
 #include <tqcursor.h>
4 4
 #include <tqsplitter.h>
5
-#include <klocale.h>
5
+#include <tdelocale.h>
6 6
 #include <tqdir.h>
7
-#include <kconfig.h>
7
+#include <tdeconfig.h>
8 8
 #include <tqtimer.h>
9 9
 #include "dndlistbox.h"
10 10
 #include "listboxlink.h"
@@ -144,7 +144,7 @@ void LinkView::loadLinks()
144 144
 {
145 145
    if (!locations)
146 146
       return;
147
-   KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
147
+   TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
148 148
    config.setGroup("Sidebar");
149 149
    splitter->setSizes(config.readIntListEntry ("Sizes"));
150 150
    loadedLinks = (uint)config.readNumEntry("NumLinks", 0);
@@ -174,7 +174,7 @@ void LinkView::saveLinks()
174 174
 {
175 175
    if (!locations)
176 176
       return;
177
-   KConfig *config = new KConfig(TQDir::homeDirPath() + "/.qt/baghirarc");
177
+   TDEConfig *config = new TDEConfig(TQDir::homeDirPath() + "/.qt/baghirarc");
178 178
    config->setGroup("Sidebar");
179 179
    config->writeEntry("Sizes", splitter->sizes());
180 180
    config->writeEntry("NumLinks", (int)locations->count());

+ 1
- 1
sidebar/listboxlink.cpp View File

@@ -9,7 +9,7 @@
9 9
 static TQBitmap eject = TQBitmap( eject_width, eject_height, eject_bits, true );
10 10
 static TQBitmap locked = TQBitmap( lock_width, lock_height, lock_bits, true );
11 11
 
12
-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)
12
+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)
13 13
 {
14 14
 }
15 15
 

+ 1
- 1
sidebar/listboxlink.h View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 #include <tqlistbox.h>
10 10
 
11
-class KListBox;
11
+class TDEListBox;
12 12
 class TQPainter;
13 13
 class TQPixmap;
14 14
 class TQStringList;

+ 1
- 1
starter/Makefile.am View File

@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libbaghirastarter.la
6 6
 
7 7
 libbaghirastarter_la_SOURCES = baghiralinkdrag.cpp menu.cpp starter.cpp starterconfig.ui starterhelp.ui config.ui help.ui linkconfig.ui starteriface.skel
8 8
 libbaghirastarter_la_LDFLAGS = -module -avoid-version $(all_libraries)
9
-libbaghirastarter_la_LIBADD = -lXtst $(LIB_KDEUI) 
9
+libbaghirastarter_la_LIBADD = -lXtst $(LIB_TDEUI) 
10 10
 
11 11
 starter_DATA = starter.desktop
12 12
 starterdir = $(kde_datadir)/kicker/applets

+ 1
- 1
starter/config.ui View File

@@ -176,7 +176,7 @@
176 176
                         <cstring>genericName</cstring>
177 177
                     </property>
178 178
                 </widget>
179
-                <widget class="KIconButton" row="0" column="2" rowspan="2" colspan="1">
179
+                <widget class="TDEIconButton" row="0" column="2" rowspan="2" colspan="1">
180 180
                     <property name="name">
181 181
                         <cstring>iconButton</cstring>
182 182
                     </property>

+ 1
- 1
starter/linkconfig.ui View File

@@ -80,7 +80,7 @@
80 80
                 </widget>
81 81
             </hbox>
82 82
         </widget>
83
-        <widget class="KIconButton" row="0" column="1">
83
+        <widget class="TDEIconButton" row="0" column="1">
84 84
             <property name="name">
85 85
                 <cstring>icon</cstring>
86 86
             </property>

+ 54
- 54
starter/menu.cpp View File

@@ -2,7 +2,7 @@
2 2
 #include <tqcursor.h>
3 3
 #include <tqdatetime.h>
4 4
 #include <tqdir.h>
5
-#include <kpopupmenu.h>
5
+#include <tdepopupmenu.h>
6 6
 #include <tqobjectlist.h>
7 7
 #include <tqpainter.h>
8 8
 #include <tqptrlist.h>
@@ -10,31 +10,31 @@
10 10
 #include <tqstringlist.h>
11 11
 #include <tqvbox.h>
12 12
 #include <dcopclient.h>
13
-#include <kapplication.h>
14
-#include <kconfig.h>
13
+#include <tdeapplication.h>
14
+#include <tdeconfig.h>
15 15
 #include <kcombobox.h>
16
-#include <kdeversion.h>
16
+#include <tdeversion.h>
17 17
 #include <kurl.h>
18
-#include <kfileitem.h>
18
+#include <tdefileitem.h>
19 19
 #include <kicondialog.h>
20 20
 #include <kiconloader.h>
21 21
 #include <kkeybutton.h>
22
-#include <klistbox.h>
23
-#include <klocale.h>
24
-#include <kmessagebox.h>
22
+#include <tdelistbox.h>
23
+#include <tdelocale.h>
24
+#include <tdemessagebox.h>
25 25
 #include <kpixmapeffect.h>
26 26
 #include <kprocess.h>
27 27
 #include <kurifilter.h>
28 28
 #include <kurl.h>
29 29
 #include <krun.h>
30 30
 #include <kservice.h>
31
-#include <kshortcut.h>
31
+#include <tdeshortcut.h>
32 32
 #include <ksqueezedtextlabel.h>
33 33
 #include <kstandarddirs.h>
34
-#include <ksycocaentry.h>
34
+#include <tdesycocaentry.h>
35 35
 #include <ktextedit.h>
36 36
 #include <kurlrequester.h>
37
-#include <kwin.h>
37
+#include <twin.h>
38 38
 //WARNING: THIS IS NOT PORTABLE!
39 39
 // #include <X11/Xlib.h>
40 40
 // #include <X11/Xatom.h>
@@ -63,7 +63,7 @@
63 63
 
64 64
 static TQColor commentColor;
65 65
 static TQColor infoColor;
66
-static KConfig *config;
66
+static TDEConfig *config;
67 67
 static bool useKTTS;
68 68
 
69 69
 
@@ -92,8 +92,8 @@ StartMenuButton::StartMenuButton( int size, TQString icon, TQString title, TQStr
92 92
 {
93 93
    setBackgroundOrigin(TQWidget::ParentOrigin);
94 94
    int bigSize = _BIGSIZE_(size);
95
-   m_pix = KGlobal::iconLoader()->loadIcon(icon, KIcon::Desktop, size);
96
-   m_hoverPix = KGlobal::iconLoader()->loadIcon(icon, KIcon::Desktop, bigSize);
95
+   m_pix = TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Desktop, size);
96
+   m_hoverPix = TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Desktop, bigSize);
97 97
    m_pixmapLabel = new TQLabel(this, name);
98 98
    m_pixmapLabel->setPixmap(m_pix);
99 99
    m_pixmapLabel->setBackgroundOrigin(TQWidget::AncestorOrigin);
@@ -143,8 +143,8 @@ void StartMenuButton::reloadIcon(int size)
143 143
    if (m_orientation == Status)
144 144
       setFixedSize(bigSize+2,bigSize+2);
145 145
    m_pixmapLabel->setFixedSize(bigSize+2,bigSize+2);
146
-   m_pix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, size);
147
-   m_hoverPix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, bigSize);
146
+   m_pix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, size);
147
+   m_hoverPix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, bigSize);
148 148
    m_pixmapLabel->setPixmap(m_pix);
149 149
 }
150 150
 
@@ -247,8 +247,8 @@ void StartMenuButton::edit()
247 247
    m_icon = ((Panel*)parentWidget())->linkConfigDialog->icon->icon();
248 248
    m_title = ((Panel*)parentWidget())->linkConfigDialog->title->text();
249 249
    int bigSize = _BIGSIZE_(((Panel*)parentWidget())->_size);
250
-   m_pix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, ((Panel*)parentWidget())->_size);
251
-   m_hoverPix = KGlobal::iconLoader()->loadIcon(m_icon, KIcon::Desktop, bigSize);
250
+   m_pix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, ((Panel*)parentWidget())->_size);
251
+   m_hoverPix = TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::Desktop, bigSize);
252 252
    m_pixmapLabel->setPixmap(m_pix);
253 253
    if (m_orientation == Horizontal || m_orientation == Vertical)
254 254
       m_titleLabel->setText("<qt><b>" + m_title + "</b></qt>");
@@ -337,8 +337,8 @@ StartMenuEntry::StartMenuEntry(KService * service, TQString relPath, int size, b
337 337
    m_service = service;
338 338
    exec = m_service->exec();
339 339
    display = false;
340
-   m_pix = m_service->pixmap( KIcon::Desktop, size );
341
-   m_hoverPix = m_service->pixmap( KIcon::Desktop, bigSize );
340
+   m_pix = m_service->pixmap( TDEIcon::Desktop, size );
341
+   m_hoverPix = m_service->pixmap( TDEIcon::Desktop, bigSize );
342 342
    m_titleLabel = new TQLabel("<qt><h3>" + m_service->name() + "</h3></qt>", this);
343 343
    m_titleLabel->setTextFormat( TQt::RichText );
344 344
    m_commentLabel = new TQLabel(m_service->comment(), this);
@@ -366,8 +366,8 @@ void StartMenuEntry::reloadIcon(int size)
366 366
 {
367 367
    int bigSize = _BIGSIZE_(size);
368 368
    m_pixmapLabel->setFixedSize(bigSize+2,bigSize+2);
369
-   m_pix = m_service->pixmap( KIcon::Desktop, size );
370
-   m_hoverPix = m_service->pixmap( KIcon::Desktop, bigSize );
369
+   m_pix = m_service->pixmap( TDEIcon::Desktop, size );
370
+   m_hoverPix = m_service->pixmap( TDEIcon::Desktop, bigSize );
371 371
    m_pixmapLabel->setPixmap(m_pix);
372 372
 }
373 373
 
@@ -494,26 +494,26 @@ void StartMenuEntry::focusInEvent ( TQFocusEvent * )
494 494
       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());
495 495
       emit sayText(text);
496 496
    }
497
-   setPaletteBackgroundColor(KGlobalSettings::highlightColor());
498
-   m_commentLabel->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
499
-   setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
500
-   m_commentLabel->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
497
+   setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
498
+   m_commentLabel->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
499
+   setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
500
+   m_commentLabel->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
501 501
 }
502 502
 
503 503
 void StartMenuEntry::focusOutEvent ( TQFocusEvent * )
504 504
 {
505 505
    emit unhovered();
506 506
    isCurrent = false;
507
-   setPaletteBackgroundColor(KGlobalSettings::baseColor());
508
-   m_commentLabel->setPaletteBackgroundColor(KGlobalSettings::baseColor());
507
+   setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
508
+   m_commentLabel->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
509 509
    if (hasMouse())
510 510
    {
511
-      setPaletteForegroundColor(KGlobalSettings::highlightColor());
512
-      m_commentLabel->setPaletteForegroundColor(KGlobalSettings::highlightColor());
511
+      setPaletteForegroundColor(TDEGlobalSettings::highlightColor());
512
+      m_commentLabel->setPaletteForegroundColor(TDEGlobalSettings::highlightColor());
513 513
    }
514 514
    else
515 515
    {
516
-      setPaletteForegroundColor(KGlobalSettings::textColor());
516
+      setPaletteForegroundColor(TDEGlobalSettings::textColor());
517 517
       m_commentLabel->setPaletteForegroundColor(commentColor);
518 518
    }
519 519
 }
@@ -528,8 +528,8 @@ void StartMenuEntry::enterEvent( TQEvent * )
528 528
    }
529 529
    if (!isCurrent)
530 530
    {
531
-      setPaletteForegroundColor(KGlobalSettings::highlightColor());
532
-      m_commentLabel->setPaletteForegroundColor(KGlobalSettings::highlightColor());
531
+      setPaletteForegroundColor(TDEGlobalSettings::highlightColor());
532
+      m_commentLabel->setPaletteForegroundColor(TDEGlobalSettings::highlightColor());
533 533
    }
534 534
    m_pixmapLabel->setPixmap(m_hoverPix);
535 535
 }
@@ -539,7 +539,7 @@ void StartMenuEntry::leaveEvent( TQEvent * )
539 539
    emit unhovered();
540 540
    if (!isCurrent)
541 541
    {
542
-      setPaletteForegroundColor(KGlobalSettings::textColor());
542
+      setPaletteForegroundColor(TDEGlobalSettings::textColor());
543 543
       m_commentLabel->setPaletteForegroundColor(commentColor);
544 544
    }
545 545
    m_pixmapLabel->setPixmap(m_pix);
@@ -550,7 +550,7 @@ void StartMenuEntry::execute()
550 550
    usage++;
551 551
    lastUse = TQDate::currentDate();
552 552
    rank = 8 + usage;
553
-   KApplication::startServiceByDesktopPath(m_service->desktopEntryPath(), TQStringList(), 0, 0, 0, "", true);
553
+   TDEApplication::startServiceByDesktopPath(m_service->desktopEntryPath(), TQStringList(), 0, 0, 0, "", true);
554 554
    emit executed();
555 555
 }
556 556
 
@@ -558,7 +558,7 @@ Panel::Panel(int size, TQWidget * parent, const char * name) : TQWidget(parent,
558 558
 {
559 559
    linkConfigDialog = new LinkConfig();
560 560
    setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
561
-//    setPaletteBackgroundColor(KGlobalSettings::highlightColor());
561
+//    setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
562 562
    setAcceptDrops(true);
563 563
    config->setGroup("Panel");
564 564
    TQStringList commands = config->readListEntry("Commands", '§');
@@ -582,7 +582,7 @@ Panel::Panel(int size, TQWidget * parent, const char * name) : TQWidget(parent,
582 582
    }
583 583
 }
584 584
 
585
-void Panel::save(KConfig *config)
585
+void Panel::save(TDEConfig *config)
586 586
 {
587 587
    config->setGroup("Panel");
588 588
    TQObjectList *kids = const_cast<TQObjectList*>(children());
@@ -1087,7 +1087,7 @@ AppList::AppList(int size, TQWidget * parent) : TQScrollView(parent), _size(size
1087 1087
    connect (((TQObject*)configDialog_->buttonCancel), SIGNAL(clicked()), this, SLOT(unblockPopup()));
1088 1088
    m_widget = new TQFrame(viewport());
1089 1089
    m_widget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
1090
-   m_widget->setPaletteBackgroundColor(KGlobalSettings::baseColor());
1090
+   m_widget->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
1091 1091
    addChild(m_widget,0,0);
1092 1092
    setResizePolicy(TQScrollView::AutoOneFit);
1093 1093
    m_widget->show();
@@ -1097,8 +1097,8 @@ AppList::AppList(int size, TQWidget * parent) : TQScrollView(parent), _size(size
1097 1097
    infoLabel->setTextFormat( TQt::RichText );
1098 1098
    infoLayout->addWidget(infoLabel);
1099 1099
    m_VLayout = new TQVBoxLayout(infoLayout);
1100
-   m_iconLoader = KGlobal::iconLoader();
1101
-   m_popup = new KPopupMenu(this);
1100
+   m_iconLoader = TDEGlobal::iconLoader();
1101
+   m_popup = new TDEPopupMenu(this);
1102 1102
    m_popup->insertItem(i18n("Edit Entry"), this, SLOT(editDialog()));
1103 1103
    m_popup->insertItem(i18n("Remove Entry"), this, SLOT(removeEntry()));
1104 1104
    m_popup->insertSeparator();
@@ -1149,7 +1149,7 @@ void AppList::addDialog()
1149 1149
    configDialog_->startAsUser->setChecked( false );
1150 1150
    configDialog_->username->clear();
1151 1151
    configDialog_->workingDir->clear();
1152
-   configDialog_->shortcut->setShortcut(KShortcut::null(), false);
1152
+   configDialog_->shortcut->setShortcut(TDEShortcut::null(), false);
1153 1153
 
1154 1154
    configDialog_->setCaption ( i18n("New Entry") );
1155 1155
    ((TQWidget*)(configDialog_->extendedGroup))->hide();
@@ -1250,7 +1250,7 @@ void AppList::editEntry()
1250 1250
    sme->lastUse = lu;
1251 1251
    sme->usage = u;
1252 1252
    sme->rank = 8 + u - lu.daysTo(TQDate::currentDate());
1253
-   if (!config) config = new KConfig("bStarter", false, false);
1253
+   if (!config) config = new TDEConfig("bStarter", false, false);
1254 1254
    config->setGroup("Statistics");
1255 1255
    sme->saveStats();
1256 1256
    delete config;
@@ -1262,7 +1262,7 @@ void AppList::editEntry()
1262 1262
 
1263 1263
 void AppList::writeEntry(TQString path, bool hidden )
1264 1264
 {
1265
-   KConfig *config = new KConfig(path);
1265
+   TDEConfig *config = new TDEConfig(path);
1266 1266
    config->setDesktopGroup();
1267 1267
    
1268 1268
    if (!configDialog_->description->text().isEmpty())
@@ -1297,9 +1297,9 @@ void AppList::writeEntry(TQString path, bool hidden )
1297 1297
    config->writeEntry("Type", "Application");
1298 1298
    if (configDialog_->startAsUser->isChecked())
1299 1299
    {
1300
-      config->writeEntry("X-KDE-SubstituteUID", true);
1300
+      config->writeEntry("X-TDE-SubstituteUID", true);
1301 1301
       if (!configDialog_->username->text().isEmpty())
1302
-         config->writeEntry("X-KDE-Username", configDialog_->username->text());
1302
+         config->writeEntry("X-TDE-Username", configDialog_->username->text());
1303 1303
    }
1304 1304
    
1305 1305
    delete config;
@@ -1364,14 +1364,14 @@ void AppList::init()
1364 1364
    insertGroup(m_root, captions, paths);
1365 1365
    paths.sort();
1366 1366
    configDialog_->category->insertStringList(paths);
1367
-   configDialog_->category->completionObject()->setCompletionMode( KGlobalSettings::CompletionPopupAuto );
1367
+   configDialog_->category->completionObject()->setCompletionMode( TDEGlobalSettings::CompletionPopupAuto );
1368 1368
    configDialog_->category->completionObject()->insertItems(paths);
1369 1369
 //    if (config) { delete config; config = 0L; }
1370 1370
    sort();
1371 1371
    reset();
1372 1372
 }
1373 1373
 
1374
-void AppList::save(KConfig *config)
1374
+void AppList::save(TDEConfig *config)
1375 1375
 {
1376 1376
    config->setGroup("Statistics");
1377 1377
    TQPtrListIterator<StartMenuEntry> it(entryList);
@@ -1714,7 +1714,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent,
1714 1714
 {
1715 1715
    m_panelPos = StartMenu::Nowhere;
1716 1716
    panelLayout = new TQGridLayout ( this, 3, 3 );
1717
-   config = new KConfig("bStarter", true, false);
1717
+   config = new TDEConfig("bStarter", true, false);
1718 1718
    config->setGroup("Shell");
1719 1719
    history = config->readListEntry("History");
1720 1720
    config->setGroup("Settings");
@@ -1722,8 +1722,8 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent,
1722 1722
       m_spokenText = 0;
1723 1723
    _filterData = new KURIFilterData();
1724 1724
    int r,g,b,r2,g2,b2;
1725
-   KGlobalSettings::baseColor().getRgb(&r,&g,&b);
1726
-   KGlobalSettings::textColor().getRgb(&r2,&g2,&b2);
1725
+   TDEGlobalSettings::baseColor().getRgb(&r,&g,&b);
1726
+   TDEGlobalSettings::textColor().getRgb(&r2,&g2,&b2);
1727 1727
    commentColor.setRgb((r+r2)/2,(g+g2)/2,(b+b2)/2);
1728 1728
    infoColor.setRgb((3*r+r2)/4,(3*g+g2)/4,(3*b+b2)/4);
1729 1729
    currentHistoryItem = history.end();
@@ -1732,7 +1732,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent,
1732 1732
    TQHBoxLayout *headerLayout = new TQHBoxLayout(header, 5, 3);
1733 1733
    userButton = new StartMenuButton(_size, "folder_home", TQString(getenv("USER")), "~", StartMenuButton::Status, header, "_B_ALI_HEADER");
1734 1734
    headerLayout->addWidget(userButton);
1735
-   header->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
1735
+   header->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
1736 1736
    connect (userButton, SIGNAL(pressed(const TQString &)), this, SLOT(execute(const TQString &)));
1737 1737
    connect (userButton, SIGNAL(pressed(const TQString &)), this, SLOT(close()));
1738 1738
    TQBoxLayout *mainLayout = new TQVBoxLayout();
@@ -1754,7 +1754,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent,
1754 1754
    categoryCombo->setEditable ( true );
1755 1755
    categoryCombo->setInsertionPolicy(TQComboBox::NoInsertion);
1756 1756
    searchLine->installEventFilter(this);
1757
-   searchLine->setCompletionMode(KGlobalSettings::CompletionAuto);
1757
+   searchLine->setCompletionMode(TDEGlobalSettings::CompletionAuto);
1758 1758
    config->setGroup("Shortcuts");
1759 1759
    // read shortcuts...
1760 1760
    TQStringList cuts = config->readListEntry ("Shortcuts", ',');
@@ -1813,7 +1813,7 @@ StartMenu::StartMenu( int size, TQWidget * parent, WFlags f ) : TQWidget(parent,
1813 1813
 
1814 1814
 void StartMenu::save()
1815 1815
 {
1816
-   config = new KConfig("bStarter", false, false);
1816
+   config = new TDEConfig("bStarter", false, false);
1817 1817
    config->setGroup("Shell");
1818 1818
    TQStringList lst;
1819 1819
    for ( TQStringList::Iterator it = history.begin(); it != history.end(); ++it )
@@ -2050,7 +2050,7 @@ void StartMenu::execute(const TQString& command)
2050 2050
    
2051 2051
    _filterData->setData( command.stripWhiteSpace() );
2052 2052
    TQStringList filters;
2053
-   filters << "kurisearchfilter" << "kshorturifilter";
2053
+   filters << "kurisearchfilter" << "tdeshorturifilter";
2054 2054
    KURIFilter::self()->filterURI( *(_filterData), filters );
2055 2055
    
2056 2056
    TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url());

+ 7
- 7
starter/menu.h View File

@@ -19,7 +19,7 @@
19 19
 #include <kservicegroup.h>
20 20
 #include "mykey.h"
21 21
 
22
-class KIconLoader;
22
+class TDEIconLoader;
23 23
 class TQPaintEvent;
24 24
 class TQMouseEvent;
25 25
 class TQEvent;
@@ -27,7 +27,7 @@ class TQPixmap;
27 27
 class TQVBoxLayout;
28 28
 class TQComboBox;
29 29
 class StartMenuButton;
30
-class KConfig;
30
+class TDEConfig;
31 31
 class LinkConfig;
32 32
 
33 33
 class Panel : public TQWidget//TQScrollView
@@ -42,7 +42,7 @@ public:
42 42
    void setOrientation ( Orientation o );
43 43
 //    void addItem ( TQWidget *w );
44 44
    StartMenuButton* addIcon ( TQString icon, TQString title, TQString command, TQPoint pt = TQPoint(-1,-1) );
45
-   void save(KConfig* config);
45
+   void save(TDEConfig* config);
46 46
    void repositionIcon ( StartMenuButton* bt, TQPoint pt );
47 47
    void ensureVisible(TQRect & rect);
48 48
    void reloadIcons(int size);
@@ -176,7 +176,7 @@ signals:
176 176
    void executed();
177 177
 };
178 178
 
179
-class KPopupMenu;
179
+class TDEPopupMenu;
180 180
 class ConfigDialog;
181 181
 class HelpDialog;
182 182
 
@@ -210,21 +210,21 @@ public slots:
210 210
 protected:
211 211
    TQStringList categories;
212 212
    int favItemAmount;
213
-   void save(KConfig* config);
213
+   void save(TDEConfig* config);
214 214
    void mouseReleaseEvent ( TQMouseEvent * e );
215 215
    void windowActivationChange ( bool oldActive );
216 216
 private:
217 217
    void init();
218 218
    void insertGroup(KServiceGroup *g, TQStringList & captions, TQStringList & paths);
219 219
    KServiceGroup::Ptr m_root;
220
-   KIconLoader *m_iconLoader;
220
+   TDEIconLoader *m_iconLoader;
221 221
    TQLabel *infoLabel;
222 222
    TQVBoxLayout * infoLayout;
223 223
    TQVBoxLayout * m_VLayout;
224 224
    TQFrame * m_widget;
225 225
    bool newbie;
226 226
    TQStringList neewbieApps;
227
-   KPopupMenu *m_popup;
227
+   TDEPopupMenu *m_popup;
228 228
    bool popupBlocked_;
229 229
    int _size;
230 230
    typedef TQSortedList<StartMenuEntry> StartMenuEntryList;

+ 21
- 21
starter/starter.cpp View File

@@ -2,12 +2,12 @@
2 2
 #include <tqcombobox.h>
3 3
 #include <tqcursor.h>
4 4
 #include <tqdesktopwidget.h>
5
-#include <kglobal.h>
6
-#include <klocale.h>
7
-#include <kconfig.h>
8
-#include <kmessagebox.h>
9
-#include <kapplication.h>
10
-# include <kpopupmenu.h>
5
+#include <tdeglobal.h>
6
+#include <tdelocale.h>
7
+#include <tdeconfig.h>
8
+#include <tdemessagebox.h>
9
+#include <tdeapplication.h>
10
+# include <tdepopupmenu.h>
11 11
 #include <tqimage.h>
12 12
 #include <tqfile.h>
13 13
 #include <tqlabel.h>
@@ -38,14 +38,14 @@
38 38
 starter::starter(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
39 39
 : DCOPObject("StarterIface"), KPanelApplet(configFile, type, actions, parent, name)
40 40
 {
41
-   configPopup = new KPopupMenu(this);
41
+   configPopup = new TDEPopupMenu(this);
42 42
    popupBlocked = false;
43 43
    mainView = new TQLabel(this);
44 44
 
45 45
    configDialog = new StarterConfig(this);
46 46
    TQRect desktop = TQDesktopWidget().availableGeometry( configDialog );
47 47
    configDialog->move((desktop.width() - configDialog->width())/2, (desktop.height() - configDialog->height())/2);
48
-   KConfig config("bStarter", false, false);
48
+   TDEConfig config("bStarter", false, false);
49 49
    config.setGroup("Settings");
50 50
    configDialog->buttonShortcut->setEnabled(false);
51 51
    configDialog->BaseURL->setURL(config.readEntry("BaseImage", "" ));
@@ -79,7 +79,7 @@ starter::starter(const TQString& configFile, Type type, int actions, TQWidget *p
79 79
    
80 80
    //---
81 81
    connect(configDialog->categoryList, SIGNAL(highlighted(int)), this, SLOT(activateShortcutButton(int)));
82
-   connect(configDialog->buttonShortcut, SIGNAL(capturedShortcut (const KShortcut &)), this, SLOT(addShortcut(const KShortcut &)));
82
+   connect(configDialog->buttonShortcut, SIGNAL(capturedShortcut (const TDEShortcut &)), this, SLOT(addShortcut(const TDEShortcut &)));
83 83
    connect(configDialog->categoryList, SIGNAL(highlighted ( const TQString & )), this, SLOT(updateShortcutButton(const TQString &)));
84 84
    connect(configDialog->buttonOk, SIGNAL(clicked()), this, SLOT(updateSettings()));
85 85
    StarterHelp *helpDialog = new StarterHelp(configDialog);
@@ -102,7 +102,7 @@ void starter::activateShortcutButton(int i)
102 102
    configDialog->buttonShortcut->setEnabled(bool(i));
103 103
 }
104 104
 
105
-void starter::addShortcut(const KShortcut &cut)
105
+void starter::addShortcut(const TDEShortcut &cut)
106 106
 {
107 107
    // in case of empty shortcut, remove the entry from the list and return
108 108
    if (!short(cut.keyCodeQt()))
@@ -114,7 +114,7 @@ void starter::addShortcut(const KShortcut &cut)
114 114
             shortcutList.remove(it);
115 115
             break;
116 116
          }
117
-      configDialog->buttonShortcut->setShortcut(KShortcut::null(), false);
117
+      configDialog->buttonShortcut->setShortcut(TDEShortcut::null(), false);
118 118
       return;
119 119
    }
120 120
    // generate MyKey
@@ -162,11 +162,11 @@ void starter::updateShortcutButton(const TQString & category)
162 162
       {
163 163
          TQKeyEvent qke( TQEvent::KeyPress, it.key().key(), 0, it.key().modFlags());
164 164
          KKey kkey(&qke);
165
-         KShortcut ksc(kkey);
165
+         TDEShortcut ksc(kkey);
166 166
          configDialog->buttonShortcut->setShortcut(ksc, false);
167 167
          return;
168 168
       }
169
-   configDialog->buttonShortcut->setShortcut(KShortcut::null(), false);
169
+   configDialog->buttonShortcut->setShortcut(TDEShortcut::null(), false);
170 170
 }
171 171
 
172 172
 starter::~starter()
@@ -176,7 +176,7 @@ starter::~starter()
176 176
 void starter::updateSettings()
177 177
 {
178 178
    startMenu->updateShortcuts(shortcutList);
179
-   KConfig *config = new KConfig("bStarter", false, false);
179
+   TDEConfig *config = new TDEConfig("bStarter", false, false);
180 180
    config->setGroup("Settings");
181 181
    config->writeEntry("BaseImage", configDialog->BaseURL->url());
182 182
    config->writeEntry("HoverImage", configDialog->HoverURL->url());
@@ -222,12 +222,12 @@ void starter::updateSettings()
222 222
 
223 223
 void starter::reloadImages()
224 224
 {
225
-   KIconLoader* iLoader = KGlobal::iconLoader();
225
+   TDEIconLoader* iLoader = TDEGlobal::iconLoader();
226 226
    TQString pth;
227 227
    if (_VALID_(BaseURL))
228 228
       pth = configDialog->BaseURL->url();
229 229
    else
230
-      pth = iLoader->iconPath("bStarter", KIcon::Small, true);
230
+      pth = iLoader->iconPath("bStarter", TDEIcon::Small, true);
231 231
    if (pth)
232 232
       pixmap = TQImage(pth);
233 233
    if (!pth || pixmap.isNull())
@@ -239,7 +239,7 @@ void starter::reloadImages()
239 239
    if (_VALID_(HoverURL))
240 240
       pth = configDialog->HoverURL->url();
241 241
    else
242
-      pth = iLoader->iconPath("bStarter_hover", KIcon::Small, true);
242
+      pth = iLoader->iconPath("bStarter_hover", TDEIcon::Small, true);
243 243
    if (pth)
244 244
       hoverPixmap = TQImage(pth);
245 245
    if (!pth || hoverPixmap.isNull())
@@ -251,7 +251,7 @@ void starter::reloadImages()
251 251
    if (_VALID_(DownURL))
252 252
       pth = configDialog->DownURL->url();
253 253
    else
254
-      pth = iLoader->iconPath("bStarter_down", KIcon::Small, true);
254
+      pth = iLoader->iconPath("bStarter_down", TDEIcon::Small, true);
255 255
    if (pth)
256 256
       downPixmap = TQImage(pth);
257 257
    if (!pth || downPixmap.isNull())
@@ -281,12 +281,12 @@ void starter::resizeEvent ( TQResizeEvent *rev )
281 281
 
282 282
 void starter::configureMenu()
283 283
 {
284
-   KApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true);
284
+   TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true);
285 285
 }
286 286