Browse Source

Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
master
Slávek Banko 3 years ago
parent
commit
8f61d29f9c

+ 1
- 1
ChangeLog View File

@@ -8,7 +8,7 @@
8 8
 * respects Gwenview's / Kicker's taskbar applet / Konversation's own mousewheel handling for scrollviews
9 9
 * clipped popup menu edges, for a better look with KWin's shadows (Beryl seems not to support it).
10 10
 * fixes pixmaps on PowerPC architecture
11
-* fixes functionality of some popup QToolButtons and adapts their look and behavior to KToolBarButtons
11
+* fixes functionality of some popup QToolButtons and adapts their look and behavior to TDEToolBarButtons
12 12
 * the content of popup menus with a side pixmap is visible again (Amarok, Digikam)
13 13
 * adapts KMenu's section header style
14 14
 * fixes Kickoff's tab icon alignment

+ 6
- 6
client/Makefile.am View File

@@ -1,16 +1,16 @@
1 1
 
2
-INCLUDES = $(all_includes) -I$(kde_includes)/kwin
2
+INCLUDES = $(all_includes) -I$(kde_includes)/twin
3 3
 
4 4
 SUBDIRS = . config
5 5
 
6
-kde_module_LTLIBRARIES = kwin3_domino.la
6
+kde_module_LTLIBRARIES = twin3_domino.la
7 7
 
8
-kwin3_domino_la_SOURCES = dominoclient.cpp
9
-kwin3_domino_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -L/usr/X11R6/lib 
10
-kwin3_domino_la_LIBADD  = $(LIB_KDECORE) $(kde_libraries)/libkdecorations.la -lXext -lX11 $(LIB_QT)
8
+twin3_domino_la_SOURCES = dominoclient.cpp
9
+twin3_domino_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -L/usr/X11R6/lib 
10
+twin3_domino_la_LIBADD  = $(LIB_TDECORE) $(kde_libraries)/libtdecorations.la -lXext -lX11 $(LIB_QT)
11 11
 
12 12
 METASOURCES = AUTO
13 13
 noinst_HEADERS = dominoclient.h
14 14
 
15
-lnkdir = $(kde_datadir)/kwin
15
+lnkdir = $(kde_datadir)/twin
16 16
 lnk_DATA = domino.desktop

+ 4
- 4
client/config/Makefile.am View File

@@ -1,10 +1,10 @@
1 1
 INCLUDES = $(all_includes)
2 2
 
3
-kde_module_LTLIBRARIES = kwin_domino_config.la
3
+kde_module_LTLIBRARIES = twin_domino_config.la
4 4
 
5
-kwin_domino_config_la_SOURCES = config.cpp
6
-kwin_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
7
-kwin_domino_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
5
+twin_domino_config_la_SOURCES = config.cpp
6
+twin_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
7
+twin_domino_config_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
8 8
 
9 9
 METASOURCES = AUTO
10 10
 noinst_HEADERS = config.h

+ 14
- 14
client/config/config.cpp View File

@@ -21,8 +21,8 @@
21 21
  */
22 22
 
23 23
 #include "config.h"
24
-#include <kglobal.h>
25
-#include <klocale.h>
24
+#include <tdeglobal.h>
25
+#include <tdelocale.h>
26 26
 #include <tqvbox.h>
27 27
 #include <tqlayout.h>
28 28
 #include <tqlabel.h>
@@ -31,24 +31,24 @@
31 31
 
32 32
 extern "C"
33 33
 {
34
-	KDE_EXPORT TQObject* allocate_config( KConfig* config, TQWidget* parent )
34
+	KDE_EXPORT TQObject* allocate_config( TDEConfig* config, TQWidget* parent )
35 35
 	{
36 36
 		return(new DominoConfig(config, parent));
37 37
 	}
38 38
 }
39 39
 
40 40
 // NOTE:
41
-// 'config' is a pointer to the kwindecoration modules open kwin config,
41
+// 'config' is a pointer to the twindecoration modules open twin config,
42 42
 //		  and is by default set to the "Style" group.
43 43
 // 'parent' is the parent of the TQObject, which is a VBox inside the
44
-//		  Configure tab in kwindecoration
44
+//		  Configure tab in twindecoration
45 45
 
46
-DominoConfig::DominoConfig( KConfig* config, TQWidget* parent )
46
+DominoConfig::DominoConfig( TDEConfig* config, TQWidget* parent )
47 47
 	: TQObject( parent )
48 48
 {
49
-	conf = new KConfig("kwindominorc");
49
+	conf = new TDEConfig("twindominorc");
50 50
 	
51
-	KGlobal::locale()->insertCatalogue("kwin_clients");
51
+	TDEGlobal::locale()->insertCatalogue("twin_clients");
52 52
 	
53 53
 	vBox = new TQVBox( parent );
54 54
 
@@ -162,7 +162,7 @@ DominoConfig::DominoConfig( KConfig* config, TQWidget* parent )
162 162
 	connect(buttonPressedContourColor, SIGNAL(changed(const TQColor&)), this, SLOT(slotSelectionChanged()));
163 163
 	
164 164
 	
165
-	// Make the widgets visible in kwindecoration valueChanged
165
+	// Make the widgets visible in twindecoration valueChanged
166 166
 	vBox->show();
167 167
 }
168 168
 
@@ -180,9 +180,9 @@ void DominoConfig::slotSelectionChanged()
180 180
 }
181 181
 
182 182
 
183
-// Loads the configurable options from the kwinrc config file
184
-// It is passed the open config from kwindecoration to improve efficiency
185
-void DominoConfig::load(KConfig*)
183
+// Loads the configurable options from the twinrc config file
184
+// It is passed the open config from twindecoration to improve efficiency
185
+void DominoConfig::load(TDEConfig*)
186 186
 {
187 187
 	conf->setGroup("General");
188 188
 	
@@ -213,8 +213,8 @@ void DominoConfig::load(KConfig*)
213 213
 }
214 214
 
215 215
 
216
-// Saves the configurable options to the kwinrc config file
217
-void DominoConfig::save(KConfig*)
216
+// Saves the configurable options to the twinrc config file
217
+void DominoConfig::save(TDEConfig*)
218 218
 {
219 219
 	conf->setGroup("General");
220 220
 	

+ 5
- 5
client/config/config.h View File

@@ -24,7 +24,7 @@
24 24
 #define DOMINOCONFIG_H
25 25
 
26 26
 #include <tqcheckbox.h>
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <tqvbox.h>
29 29
 #include <kcolorbutton.h>
30 30
 
@@ -33,7 +33,7 @@ class DominoConfig: public TQObject
33 33
 	Q_OBJECT
34 34
 
35 35
 	public:
36
-		DominoConfig( KConfig* config, TQWidget* parent );
36
+		DominoConfig( TDEConfig* config, TQWidget* parent );
37 37
 		~DominoConfig();
38 38
 
39 39
 	// These public signals/slots work similar to KCM modules
@@ -41,15 +41,15 @@ class DominoConfig: public TQObject
41 41
 		void changed();
42 42
 
43 43
 	public slots:
44
-		void load(KConfig* config);
45
-		void save(KConfig* config);
44
+		void load(TDEConfig* config);
45
+		void save(TDEConfig* config);
46 46
 		void defaults();
47 47
 
48 48
 	protected slots:
49 49
 		void slotSelectionChanged();	// Internal use
50 50
 		void loadButtonContourColors();
51 51
 	private:
52
-		KConfig* conf;
52
+		TDEConfig* conf;
53 53
 		TQVBox* vBox;
54 54
 		TQCheckBox* customBorderColor;
55 55
 		KColorButton* borderColor;

+ 1
- 1
client/domino.desktop View File

@@ -2,4 +2,4 @@
2 2
 Encoding=UTF-8
3 3
 Icon=
4 4
 Name=Domino
5
-X-KDE-Library=kwin3_domino
5
+X-TDE-Library=twin3_domino

+ 3
- 3
client/dominoclient.cpp View File

@@ -23,8 +23,8 @@
23 23
 #include "dominoclient.h"
24 24
 #include "clientData.h"
25 25
 
26
-#include <kconfig.h>
27
-#include <kglobal.h>
26
+#include <tdeconfig.h>
27
+#include <tdeglobal.h>
28 28
 #include <tqlayout.h>
29 29
 #include <tqbitmap.h>
30 30
 #include <tqimage.h>
@@ -156,7 +156,7 @@ bool DominoHandler::reset( unsigned long changed )
156 156
 unsigned long DominoHandler::readConfig( bool update )
157 157
 {
158 158
 	unsigned long changed = 0;
159
-	KConfig conf("kwindominorc");
159
+	TDEConfig conf("twindominorc");
160 160
 	conf.setGroup("General");
161 161
 	
162 162
 	titleHeight = TQMAX(TQFontMetrics(options()->font(true)).height(), 16);

+ 3
- 3
domino/Makefile.am View File

@@ -4,9 +4,9 @@ KDE_CXXFLAGS = -DQT_PLUGIN $(FT2_CFLAGS)
4 4
 
5 5
 INCLUDES = $(all_includes)
6 6
 
7
-stylercdir = $(kde_datadir)/kstyle/themes
7
+stylercdir = $(kde_datadir)/tdestyle/themes
8 8
 stylerc_DATA = domino.themerc
9
-schemedir = $(kde_datadir)/kdisplay/color-schemes
9
+schemedir = $(kde_datadir)/tdedisplay/color-schemes
10 10
 scheme_DATA = Domino.kcsrc
11 11
 
12 12
 noinst_HEADERS = domino.h misc.h data.h
@@ -14,7 +14,7 @@ noinst_HEADERS = domino.h misc.h data.h
14 14
 kde_style_LTLIBRARIES = domino.la
15 15
 domino_la_SOURCES = domino.cpp misc.cpp
16 16
 domino_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(KDE_RPATH)
17
-domino_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_QT) -lkdefx -lXrender -lXft $(LIB_KDECORE)
17
+domino_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIB_QT) -ltdefx -lXrender -lXft $(LIB_TDECORE)
18 18
 domino_la_METASOURCES = AUTO
19 19
 
20 20
 noinst_LTLIBRARIES = libdomino_style.la

+ 103
- 103
domino/domino.cpp View File

@@ -21,7 +21,7 @@
21 21
    Copyright (C) 2000 Daniel M. Duley		<mosfet@kde.org>
22 22
 			 (C) 2000 Dirk Mueller			<mueller@kde.org>
23 23
 			 (C) 2001 Martijn Klingens		<klingens@kde.org>
24
-   Progressbar code based on KStyle,
24
+   Progressbar code based on TDEStyle,
25 25
    Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
26 26
 
27 27
    This library is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@
39 39
  */
40 40
 
41 41
 
42
-#include <kglobalsettings.h>
42
+#include <tdeglobalsettings.h>
43 43
 #include <tqpainter.h>
44 44
 #include <tqtabbar.h>
45 45
 #include <tqprogressbar.h>
@@ -49,7 +49,7 @@
49 49
 #include <tqstyleplugin.h>
50 50
 #include <tqpushbutton.h>
51 51
 #include <tqtoolbutton.h>
52
-#include <kpopupmenu.h>
52
+#include <tdepopupmenu.h>
53 53
 #include <tqradiobutton.h>
54 54
 #include <tqslider.h>
55 55
 #include <tqsettings.h>
@@ -59,26 +59,26 @@
59 59
 #include <tqdockarea.h>
60 60
 #include <tqobjectlist.h>
61 61
 #include <tqheader.h>
62
-#include <klistview.h>
62
+#include <tdelistview.h>
63 63
 #include <tqstatusbar.h>
64 64
 #include <tqcombobox.h>
65 65
 #include <tqtabwidget.h>
66
-#include <ktoolbar.h>
66
+#include <tdetoolbar.h>
67 67
 #include <tqlabel.h>
68 68
 #include <tqsimplerichtext.h>
69 69
 #include <tqiconview.h>
70
-#include <kconfig.h>
70
+#include <tdeconfig.h>
71 71
 #include <tqapplication.h>
72 72
 #include <tqtoolbox.h>
73 73
 #include <tqstylesheet.h>
74 74
 // #include <tqsplitter.h>
75 75
 #include <tqwidgetstack.h>
76 76
 #include <tqtimer.h>
77
-#include <kmultitabbar.h>
77
+#include <tdemultitabbar.h>
78 78
 #include <tqspinbox.h>
79 79
 #include <tqcursor.h>
80 80
 #include <tqtextedit.h>
81
-#include <kdeversion.h>
81
+#include <tdeversion.h>
82 82
 #include <kimageeffect.h>
83 83
 
84 84
 #include <X11/Xlib.h>
@@ -266,7 +266,7 @@ class DominoStylePlugin : public TQStylePlugin
266 266
 KDE_Q_EXPORT_PLUGIN( DominoStylePlugin )
267 267
 // -- end --
268 268
 
269
-	DominoStyle::DominoStyle() : KStyle( KStyle::Default /*AllowMenuTransparency*/, ThreeButtonScrollBar )
269
+	DominoStyle::DominoStyle() : TDEStyle( TDEStyle::Default /*AllowMenuTransparency*/, ThreeButtonScrollBar )
270 270
 {
271 271
 	konsoleMode = false;
272 272
 	kickerMode = false;
@@ -276,7 +276,7 @@ KDE_Q_EXPORT_PLUGIN( DominoStylePlugin )
276 276
 	oldRubberRect = TQRect();
277 277
 	rubber = 0;
278 278
 	ignoreNextFocusRect = false;
279
-#if KDE_VERSION < 0x30506
279
+#if TDE_VERSION < 0x30506
280 280
 	compositeManagerRunning = true;
281 281
 #endif
282 282
 	configMode = "0"; // temporaly to avoid cache problems between the configs previewStyle and this style
@@ -530,22 +530,22 @@ KDE_Q_EXPORT_PLUGIN( DominoStylePlugin )
530 530
 	settings.endGroup();
531 531
 	
532 532
 	if(!strcmp(tqApp->argv()[0], "konqueror")) {
533
-		KGlobal::config()->setGroup("General");
534
-		minTabLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3);
533
+		TDEGlobal::config()->setGroup("General");
534
+		minTabLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3);
535 535
 	}
536 536
 	else
537 537
 		minTabLength = 0;
538 538
 	
539
-	if(!strcmp(tqApp->className(), "KApplication")) {
540
-		TQString oldgroup = KGlobal::config()->group();
541
-		KGlobal::config()->setGroup("KDE");
542
-		macStyleBar = KGlobal::config()->readBoolEntry("macStyle", false);
543
-		KGlobal::config()->setGroup(oldgroup); // reset the group, do not interfere with the application
544
-		KApplicationMode = true;
539
+	if(!strcmp(tqApp->className(), "TDEApplication")) {
540
+		TQString oldgroup = TDEGlobal::config()->group();
541
+		TDEGlobal::config()->setGroup("KDE");
542
+		macStyleBar = TDEGlobal::config()->readBoolEntry("macStyle", false);
543
+		TDEGlobal::config()->setGroup(oldgroup); // reset the group, do not interfere with the application
544
+		TDEApplicationMode = true;
545 545
 	}
546 546
 	else {
547 547
 		macStyleBar = false;
548
-		KApplicationMode = false;
548
+		TDEApplicationMode = false;
549 549
 	}
550 550
 	
551 551
 	
@@ -695,15 +695,15 @@ void DominoStyle::polish(TQPalette &p) {
695 695
 void DominoStyle::polish(TQWidget* widget)
696 696
 {
697 697
 	
698
-	if(!strcmp(widget->name(), "__khtml")) { // is it a khtml widget...?
699
-		khtmlWidgets[widget] = true;
700
-		connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(khtmlWidgetDestroyed(TQObject*)));
698
+	if(!strcmp(widget->name(), "__tdehtml")) { // is it a tdehtml widget...?
699
+		tdehtmlWidgets[widget] = true;
700
+		connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(tdehtmlWidgetDestroyed(TQObject*)));
701 701
 	}
702
-	else if((!strcmp(widget->name(), "kfile button") || (widget->isA("KLineEdit") && widget->parentWidget())) && !strcmp(widget->parentWidget()->name(), "__khtml")) {
702
+	else if((!strcmp(widget->name(), "tdefile button") || (widget->isA("KLineEdit") && widget->parentWidget())) && !strcmp(widget->parentWidget()->name(), "__tdehtml")) {
703 703
 		widget->setBackgroundMode(TQt::NoBackground);
704 704
 		widget->parentWidget()->setBackgroundMode(TQt::NoBackground);
705
-		khtmlWidgets[widget] = true;
706
-		connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(khtmlWidgetDestroyed(TQObject*)));
705
+		tdehtmlWidgets[widget] = true;
706
+		connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(tdehtmlWidgetDestroyed(TQObject*)));
707 707
 	}
708 708
 	
709 709
 	if(dynamic_cast<TQPushButton*>(widget)) {
@@ -714,7 +714,7 @@ void DominoStyle::polish(TQWidget* widget)
714 714
 			widget->setFixedSize(13, 13); // 12x12 pixmap + 1px top and right spacing
715 715
 		else {
716 716
 			((DominoTQWidget*)widget)->setWFlags(TQt::WNoAutoErase);
717
-			if(widget->parentWidget() && widget->parentWidget()->paletteBackgroundPixmap() && !khtmlWidgets.contains(widget)) {
717
+			if(widget->parentWidget() && widget->parentWidget()->paletteBackgroundPixmap() && !tdehtmlWidgets.contains(widget)) {
718 718
 				widget->setBackgroundMode(TQt::PaletteButton);
719 719
 				widget->setBackgroundPixmap(*widget->parentWidget()->paletteBackgroundPixmap());
720 720
 				widget->setBackgroundOrigin(setPixmapOrigin(widget->parentWidget()->backgroundOrigin()));
@@ -727,8 +727,8 @@ void DominoStyle::polish(TQWidget* widget)
727 727
 		((DominoTQWidget*)widget)->setWFlags(TQt::WNoAutoErase);
728 728
 		widget->installEventFilter(this);
729 729
 	}
730
-	else if(dynamic_cast<KToolBarButton*>(widget)) {
731
-		KToolBarButton* tb = static_cast<KToolBarButton*>(widget);
730
+	else if(dynamic_cast<TDEToolBarButton*>(widget)) {
731
+		TDEToolBarButton* tb = static_cast<TDEToolBarButton*>(widget);
732 732
 		//setDominoButtonPalette(widget); // ### changing the palette breaks them!
733 733
 		
734 734
 		if(tb->popupDelay() < 1)
@@ -769,7 +769,7 @@ void DominoStyle::polish(TQWidget* widget)
769 769
 		TQComboBox* cb = static_cast<TQComboBox*>(widget);
770 770
 		
771 771
 		((DominoTQWidget*)widget)->setWFlags(TQt::WNoAutoErase);
772
-		if(widget->parentWidget() && widget->parentWidget()->paletteBackgroundPixmap() && !khtmlWidgets.contains(widget)) {
772
+		if(widget->parentWidget() && widget->parentWidget()->paletteBackgroundPixmap() && !tdehtmlWidgets.contains(widget)) {
773 773
 			widget->setBackgroundMode(TQt::PaletteButton);
774 774
 			widget->setBackgroundOrigin(setPixmapOrigin(widget->parentWidget()->backgroundOrigin()));
775 775
 		}
@@ -894,7 +894,7 @@ void DominoStyle::polish(TQWidget* widget)
894 894
 	}
895 895
 	else if(dynamic_cast<TQScrollView*>(widget)) {
896 896
 		TQFrame* f = dynamic_cast<TQFrame*>(widget);
897
-		if((konquerorMode && widget->isA("KHTMLView")) || f->parentWidget() && !strcmp(f->parentWidget()->name(), "KonqFrame")) { // konqi frames
897
+		if((konquerorMode && widget->isA("TDEHTMLView")) || f->parentWidget() && !strcmp(f->parentWidget()->name(), "KonqFrame")) { // konqi frames
898 898
 			f->setFrameStyle(TQFrame::Box|TQFrame::Plain);
899 899
 			f->setLineWidth(1);
900 900
 			widget->installEventFilter(this);
@@ -908,7 +908,7 @@ void DominoStyle::polish(TQWidget* widget)
908 908
 	else if(dynamic_cast<TQListBox*>(widget)) {
909 909
 		widget->installEventFilter(this);
910 910
 	}
911
-	else if(dynamic_cast<KToolBarSeparator*>(widget) || dynamic_cast<TQToolBar*>(widget)) {
911
+	else if(dynamic_cast<TDEToolBarSeparator*>(widget) || dynamic_cast<TQToolBar*>(widget)) {
912 912
 		widget->setBackgroundMode(TQt::PaletteBackground);
913 913
 	}
914 914
 
@@ -938,7 +938,7 @@ void DominoStyle::polish(TQWidget* widget)
938 938
 // 			animationTimer->start( 50, false );
939 939
 		widget->installEventFilter(this);
940 940
 	}
941
-	else if(dynamic_cast<KPopupTitle*>(widget)) {
941
+	else if(dynamic_cast<TDEPopupTitle*>(widget)) {
942 942
 		widget->installEventFilter(this);
943 943
 	}
944 944
 	else if(dynamic_cast<TQFrame*>(widget)) {
@@ -972,7 +972,7 @@ void DominoStyle::polish(TQWidget* widget)
972 972
 					f->setMargin(0);
973 973
 
974 974
 					TQWidget* w = widget->parentWidget();
975
-					for(int i=0; i<3; i++) { // the third parentcheck is for the tabWidget on kcm khtml_plugins
975
+					for(int i=0; i<3; i++) { // the third parentcheck is for the tabWidget on kcm tdehtml_plugins
976 976
 						if(!w) break;
977 977
 						if(dynamic_cast<TQGroupBox*>(w)) {
978 978
 							widget->setPaletteBackgroundColor(tqApp->palette().active().background());
@@ -1029,8 +1029,8 @@ void DominoStyle::polish(TQWidget* widget)
1029 1029
 void DominoStyle::unPolish(TQWidget* widget)
1030 1030
 {
1031 1031
 	
1032
-	if( !strcmp(widget->name(), "__khtml") || (!strcmp(widget->name(), "kfile button") && !strcmp(widget->parentWidget()->name(), "__khtml"))) { // is it a khtml widget...?
1033
-		khtmlWidgets.remove(widget);
1032
+	if( !strcmp(widget->name(), "__tdehtml") || (!strcmp(widget->name(), "tdefile button") && !strcmp(widget->parentWidget()->name(), "__tdehtml"))) { // is it a tdehtml widget...?
1033
+		tdehtmlWidgets.remove(widget);
1034 1034
 	}
1035 1035
 
1036 1036
 	if (dynamic_cast<TQPushButton*>(widget) || 
@@ -1070,7 +1070,7 @@ void DominoStyle::unPolish(TQWidget* widget)
1070 1070
 		static_cast<TQFrame*>(widget)->setLineWidth(2);
1071 1071
 		widget->clearMask();
1072 1072
 	}
1073
-	else if(dynamic_cast<KToolBarButton*>(widget)) {
1073
+	else if(dynamic_cast<TDEToolBarButton*>(widget)) {
1074 1074
 		widget->removeEventFilter(this);
1075 1075
 		widget->setBackgroundMode(TQt::PaletteBackground);
1076 1076
 	}
@@ -1093,7 +1093,7 @@ void DominoStyle::unPolish(TQWidget* widget)
1093 1093
 	else if(dynamic_cast<TQProgressBar*>(widget) ) {
1094 1094
 		progAnimWidgets.remove(widget);
1095 1095
 	}
1096
-	else if(dynamic_cast<KToolBarSeparator*>(widget) || dynamic_cast<TQToolBar*>(widget) ) {
1096
+	else if(dynamic_cast<TDEToolBarSeparator*>(widget) || dynamic_cast<TQToolBar*>(widget) ) {
1097 1097
 		widget->removeEventFilter(this);
1098 1098
 		widget->setBackgroundMode(TQt::PaletteButton);
1099 1099
 	}
@@ -1119,13 +1119,13 @@ void DominoStyle::unPolish(TQWidget* widget)
1119 1119
 	}
1120 1120
 	else if(dynamic_cast<TQScrollView*>(widget)) {
1121 1121
 		TQFrame* f = dynamic_cast<TQFrame*>(widget);
1122
-		if((konquerorMode && widget->isA("KHTMLView")) || f->parentWidget() && !strcmp(f->parentWidget()->name(), "KonqFrame")) { // konqi frames
1122
+		if((konquerorMode && widget->isA("TDEHTMLView")) || f->parentWidget() && !strcmp(f->parentWidget()->name(), "KonqFrame")) { // konqi frames
1123 1123
 			widget->removeEventFilter(this);
1124 1124
 			f->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
1125 1125
 			f->setLineWidth(0);
1126 1126
 		}
1127 1127
 	}
1128
-	else if(dynamic_cast<KPopupTitle*>(widget)) {
1128
+	else if(dynamic_cast<TDEPopupTitle*>(widget)) {
1129 1129
 		widget->removeEventFilter(this);
1130 1130
 	}
1131 1131
 	else if(dynamic_cast<TQFrame*>(widget)) {
@@ -1156,12 +1156,12 @@ void DominoStyle::unPolish(TQWidget* widget)
1156 1156
 	}
1157 1157
 
1158 1158
 	
1159
-	KStyle::unPolish(widget);
1159
+	TDEStyle::unPolish(widget);
1160 1160
 }
1161 1161
 
1162
-void DominoStyle::khtmlWidgetDestroyed(TQObject* obj)
1162
+void DominoStyle::tdehtmlWidgetDestroyed(TQObject* obj)
1163 1163
 {
1164
-	khtmlWidgets.remove(static_cast<TQWidget*>(obj));
1164
+	tdehtmlWidgets.remove(static_cast<TQWidget*>(obj));
1165 1165
 }
1166 1166
 
1167 1167
 void DominoStyle::groupBoxDestroyed(TQObject* obj)
@@ -1941,14 +1941,14 @@ void DominoStyle::renderButton(TQPainter *p,
1941 1941
 							   bool /*mouseOver*/,
1942 1942
 							   bool horizontal,
1943 1943
 							   bool enabled,
1944
-							   bool khtmlMode) const
1944
+							   bool tdehtmlMode) const
1945 1945
 {
1946 1946
 	
1947 1947
 	uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
1948 1948
 
1949 1949
 	if(!enabled) contourFlags|=Is_Disabled;
1950 1950
 	
1951
-	if(khtmlMode || buttonContour->alphaMode() /* || kickerMode*/) {
1951
+	if(tdehtmlMode || buttonContour->alphaMode() /* || kickerMode*/) {
1952 1952
 		contourFlags|=Draw_AlphaBlend;
1953 1953
 	}
1954 1954
 
@@ -1966,7 +1966,7 @@ void DominoStyle::renderButton(TQPainter *p,
1966 1966
 		}
1967 1967
 	}
1968 1968
 
1969
-// 	TQColor buttonColor = khtmlMode ? g.button() : tqApp->palette().active().background();
1969
+// 	TQColor buttonColor = tdehtmlMode ? g.button() : tqApp->palette().active().background();
1970 1970
 	
1971 1971
 	if (!flatMode) {
1972 1972
 		contourFlags |= Round_UpperLeft|Round_UpperRight|Round_BottomLeft|Round_BottomRight|Is_Button;
@@ -2685,7 +2685,7 @@ void DominoStyle::renderTab(TQPainter *p,
2685 2685
 	}
2686 2686
 }
2687 2687
 
2688
-void DominoStyle::drawKStylePrimitive(KStylePrimitive kpe,
2688
+void DominoStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
2689 2689
 									  TQPainter *p,
2690 2690
 									  const TQWidget* widget,
2691 2691
 									  const TQRect &r,
@@ -2693,7 +2693,7 @@ void DominoStyle::drawKStylePrimitive(KStylePrimitive kpe,
2693 2693
 									  SFlags flags,
2694 2694
 									  const TQStyleOption& opt) const
2695 2695
 {
2696
-	//return KStyle::drawKStylePrimitive(kpe, p, widget, r, cg, flags, opt);
2696
+	//return TDEStyle::drawTDEStylePrimitive(kpe, p, widget, r, cg, flags, opt);
2697 2697
 
2698 2698
 //	SLIDER
2699 2699
 //	------
@@ -2948,7 +2948,7 @@ void DominoStyle::drawKStylePrimitive(KStylePrimitive kpe,
2948 2948
 			break;
2949 2949
 		}
2950 2950
 
2951
-		// copied and slightly modified from KStyle.
2951
+		// copied and slightly modified from TDEStyle.
2952 2952
 		case KPE_ListViewBranch: {
2953 2953
 			if(_drawTriangularExpander) break;
2954 2954
 			// Typical Windows style listview branch element (dotted line).
@@ -3021,7 +3021,7 @@ void DominoStyle::drawKStylePrimitive(KStylePrimitive kpe,
3021 3021
 		}
3022 3022
 		
3023 3023
 		default:
3024
-			KStyle::drawKStylePrimitive(kpe, p, widget, r, cg, flags, opt);
3024
+			TDEStyle::drawTDEStylePrimitive(kpe, p, widget, r, cg, flags, opt);
3025 3025
 	}
3026 3026
 }
3027 3027
 
@@ -3049,7 +3049,7 @@ void DominoStyle::drawPrimitive(PrimitiveElement pe,
3049 3049
 
3050 3050
 
3051 3051
 	
3052
-	//return KStyle::drawPrimitive(pe, p, r, cg, flags, opt);
3052
+	//return TDEStyle::drawPrimitive(pe, p, r, cg, flags, opt);
3053 3053
 	
3054 3054
 	switch(pe) {
3055 3055
 
@@ -3159,7 +3159,7 @@ void DominoStyle::drawPrimitive(PrimitiveElement pe,
3159 3159
 			if(dynamic_cast<TQPixmap*>(p->device())) // more likely a backgroundPixmap than a doublebuffer
3160 3160
 				buttonContour->setAlphaMode();
3161 3161
 			
3162
-			renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlWidgets.contains(opt.widget()) );
3162
+			renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlWidgets.contains(opt.widget()) );
3163 3163
 			buttonContour->reset();
3164 3164
 			break;
3165 3165
 		}
@@ -4353,7 +4353,7 @@ void DominoStyle::drawPrimitive(PrimitiveElement pe,
4353 4353
 		
4354 4354
 		case PE_RubberBand: {
4355 4355
 			
4356
-#if KDE_VERSION >= 0x30506
4356
+#if TDE_VERSION >= 0x30506
4357 4357
 			if(rubberBandType != ArgbRubber || !compositeManagerRunning) {
4358 4358
 #else
4359 4359
 			if(rubberBandType != ArgbRubber) {
@@ -4365,7 +4365,7 @@ void DominoStyle::drawPrimitive(PrimitiveElement pe,
4365 4365
 					p->restore();
4366 4366
 				}
4367 4367
 				else {
4368
-					KStyle::drawPrimitive(pe, p, r, cg, flags, opt);
4368
+					TDEStyle::drawPrimitive(pe, p, r, cg, flags, opt);
4369 4369
 				}
4370 4370
 				break;
4371 4371
 			}
@@ -4642,7 +4642,7 @@ void DominoStyle::drawPrimitive(PrimitiveElement pe,
4642 4642
 		}
4643 4643
 		
4644 4644
 		default: {
4645
-			return KStyle::drawPrimitive(pe, p, r, cg, flags, opt);
4645
+			return TDEStyle::drawPrimitive(pe, p, r, cg, flags, opt);
4646 4646
 		}
4647 4647
 	}
4648 4648
 }
@@ -4658,13 +4658,13 @@ void DominoStyle::drawControl(ControlElement element,
4658 4658
 	
4659 4659
 	const bool enabled = (flags & Style_Enabled);
4660 4660
 
4661
-	//return KStyle::drawControl(element, p, widget, r, cg, flags, opt);
4661
+	//return TDEStyle::drawControl(element, p, widget, r, cg, flags, opt);
4662 4662
 	
4663 4663
 	switch (element) {
4664 4664
 
4665 4665
 		case CE_ToolButtonLabel: {
4666 4666
 			
4667
-			if(widget->isA("KToolBarButton")) {
4667
+			if(widget->isA("TDEToolBarButton")) {
4668 4668
 				DominoKToolBarButton* tb= (DominoKToolBarButton *) widget;
4669 4669
 	
4670 4670
 				TQStyle::SFlags flags   = TQStyle::Style_Default;
@@ -4680,14 +4680,14 @@ void DominoStyle::drawControl(ControlElement element,
4680 4680
 				if (tb->hasFocus())	flags |= TQStyle::Style_HasFocus;
4681 4681
 				
4682 4682
 				int dx, dy;
4683
-				TQFont tmp_font(KGlobalSettings::toolBarFont());
4683
+				TQFont tmp_font(TDEGlobalSettings::toolBarFont());
4684 4684
 				TQFontMetrics fm(tmp_font);
4685 4685
 				TQRect textRect;
4686 4686
 				int textFlags = 0;
4687 4687
 				
4688 4688
 				
4689 4689
 				TQPixmap pixmap;
4690
-				if (tb->iconTextMode() != KToolBar::TextOnly) {
4690
+				if (tb->iconTextMode() != TDEToolBar::TextOnly) {
4691 4691
 					pixmap =tb->iconSet().pixmap( TQIconSet::Automatic,
4692 4692
 						tb->isEnabled() ? (tb->isActive() ? TQIconSet::Active : TQIconSet::Normal) :
4693 4693
 								TQIconSet::Disabled,
@@ -4710,7 +4710,7 @@ void DominoStyle::drawControl(ControlElement element,
4710 4710
 					drawOutlinePixmap = true;
4711 4711
 				}
4712 4712
 				
4713
-				if (tb->iconTextMode() == KToolBar::IconOnly) // icon only
4713
+				if (tb->iconTextMode() == TDEToolBar::IconOnly) // icon only
4714 4714
 				{
4715 4715
 					if( !pixmap.isNull())
4716 4716
 					{
@@ -4726,7 +4726,7 @@ void DominoStyle::drawControl(ControlElement element,
4726 4726
 					}
4727 4727
 				}
4728 4728
 				
4729
-				else if (tb->iconTextMode() == KToolBar::IconTextRight) // icon and text (if any)
4729
+				else if (tb->iconTextMode() == TDEToolBar::IconTextRight) // icon and text (if any)
4730 4730
 				{
4731 4731
 					if( !pixmap.isNull())
4732 4732
 					{
@@ -4751,7 +4751,7 @@ void DominoStyle::drawControl(ControlElement element,
4751 4751
 						textRect = TQRect(dx, dy, tb->width()-dx, tb->height()-1);
4752 4752
 					}
4753 4753
 				}
4754
-				else if (tb->iconTextMode() == KToolBar::TextOnly)
4754
+				else if (tb->iconTextMode() == TDEToolBar::TextOnly)
4755 4755
 				{
4756 4756
 					if (!tb->textLabel().isNull())
4757 4757
 					{
@@ -4762,7 +4762,7 @@ void DominoStyle::drawControl(ControlElement element,
4762 4762
 						textRect = TQRect( dx, dy, fm.width(tb->textLabel()), fm.lineSpacing() );
4763 4763
 					}
4764 4764
 				}
4765
-				else if (tb->iconTextMode() == KToolBar::IconTextBottom)
4765
+				else if (tb->iconTextMode() == TDEToolBar::IconTextBottom)
4766 4766
 				{
4767 4767
 					if( !pixmap.isNull())
4768 4768
 					{
@@ -4787,13 +4787,13 @@ void DominoStyle::drawControl(ControlElement element,
4787 4787
 				}
4788 4788
 				if (!tb->textLabel().isNull() && !textRect.isNull())
4789 4789
 				{
4790
-					p->setFont(KGlobalSettings::toolBarFont());
4790
+					p->setFont(TDEGlobalSettings::toolBarFont());
4791 4791
 					TQColor pencolor;
4792 4792
 					if (!tb->isEnabled())
4793 4793
 						pencolor = tb->palette().disabled().dark();
4794 4794
 					// replaced through icon highlights
4795 4795
 // 					else if(tb->isRaised())
4796
-// 						pencolor = KGlobalSettings::toolBarHighlightColor();
4796
+// 						pencolor = TDEGlobalSettings::toolBarHighlightColor();
4797 4797
 					else
4798 4798
 						pencolor =  tb->colorGroup().buttonText();
4799 4799
 					
@@ -5087,7 +5087,7 @@ void DominoStyle::drawControl(ControlElement element,
5087 5087
 		case CE_CheckBox: {
5088 5088
 			
5089 5089
 			TQColorGroup g = cg;
5090
-			if(!khtmlWidgets.contains(widget))
5090
+			if(!tdehtmlWidgets.contains(widget))
5091 5091
 				g.setColor(TQColorGroup::Button, tqApp->palette().active().background());
5092 5092
 			
5093 5093
 			TQPixmap insidePix = qembed_findImage("checkbox2inside");
@@ -5139,7 +5139,7 @@ void DominoStyle::drawControl(ControlElement element,
5139 5139
 	// ------------
5140 5140
 		case CE_RadioButton: {
5141 5141
 			TQColorGroup g = cg;
5142
-			if(!khtmlWidgets.contains(widget))
5142
+			if(!tdehtmlWidgets.contains(widget))
5143 5143
 				g.setColor(TQColorGroup::Button, tqApp->palette().active().background());
5144 5144
 			
5145 5145
 			TQString down = flags& Style_Down ? "1" : "0";
@@ -5243,7 +5243,7 @@ void DominoStyle::drawControl(ControlElement element,
5243 5243
 					renderTab(p, r, cg, (flags & Style_MouseOver), selected, true, pos, false, false, konqTab);
5244 5244
 					break;
5245 5245
 				default:
5246
-					KStyle::drawControl(element, p, widget, r, cg, flags, opt);
5246
+					TDEStyle::drawControl(element, p, widget, r, cg, flags, opt);
5247 5247
 			}
5248 5248
 			
5249 5249
 			// TQt3 uses this painter to draw the iconSet between CE_TabBarTab and CE_TabBarLabel. If we clip the painter here
@@ -5256,7 +5256,7 @@ void DominoStyle::drawControl(ControlElement element,
5256 5256
 		case CE_PushButton: {
5257 5257
 			
5258 5258
 			TQPushButton *button = (TQPushButton *)widget;
5259
-			bool khtmlMode = khtmlWidgets.contains(button);
5259
+			bool tdehtmlMode = tdehtmlWidgets.contains(button);
5260 5260
 			bool isDefault = enabled && button->isDefault();
5261 5261
 			bool isHoverWidget = enabled && button == hoverWidget;
5262 5262
 			bool isSunken = flags & Style_On || flags & Style_Down;
@@ -5266,7 +5266,7 @@ void DominoStyle::drawControl(ControlElement element,
5266 5266
 			flatMode = button->isFlat();
5267 5267
 			
5268 5268
 			TQColor bg;
5269
-			if(!khtmlMode && !button->paletteBackgroundPixmap()) {
5269
+			if(!tdehtmlMode && !button->paletteBackgroundPixmap()) {
5270 5270
 				
5271 5271
 				if(dynamic_cast<TQGroupBox*>(button->parentWidget())) {
5272 5272
 					bg = button->parentWidget()->paletteBackgroundColor();
@@ -5284,7 +5284,7 @@ void DominoStyle::drawControl(ControlElement element,
5284 5284
 				buttonContour->setAlphaMode();
5285 5285
 				contourFlags|=Draw_AlphaBlend;
5286 5286
 			}
5287
-			if(khtmlMode) contourFlags|=Draw_AlphaBlend;
5287
+			if(tdehtmlMode) contourFlags|=Draw_AlphaBlend;
5288 5288
 			if(!enabled) {
5289 5289
 				contourFlags|=Is_Disabled;
5290 5290
 				surfaceFlags|=Is_Disabled;
@@ -5516,7 +5516,7 @@ void DominoStyle::drawControl(ControlElement element,
5516 5516
 				bool enabled = t->isEnabled() && tb->isEnabled();
5517 5517
 				TQPixmap pixmap;
5518 5518
 				
5519
-				if(!KApplicationMode) {
5519
+				if(!TDEApplicationMode) {
5520 5520
 					TQIconSet::Mode mode = (t->identifier() && tb->keyboardFocusTab()) ? TQIconSet::Active : TQIconSet::Normal;
5521 5521
 					pixmap = t->iconSet()->pixmap( TQIconSet::Small, mode );
5522 5522
 					if(!enabled)
@@ -5690,7 +5690,7 @@ void DominoStyle::drawControl(ControlElement element,
5690 5690
 
5691 5691
 				// Select the correct icon from the iconset
5692 5692
 				TQPixmap pixmap;
5693
-				if(KApplicationMode) {
5693
+				if(TDEApplicationMode) {
5694 5694
 					if (active)
5695 5695
 						mode = enabled ? TQIconSet::Active : TQIconSet::Disabled;
5696 5696
 					else
@@ -5873,7 +5873,7 @@ void DominoStyle::drawControl(ControlElement element,
5873 5873
 			break;
5874 5874
 		}
5875 5875
 		default:
5876
-		  KStyle::drawControl(element, p, widget, r, cg, flags, opt);
5876
+		  TDEStyle::drawControl(element, p, widget, r, cg, flags, opt);
5877 5877
 	}
5878 5878
 }
5879 5879
 
@@ -5898,7 +5898,7 @@ void DominoStyle::drawControlMask(ControlElement element,
5898 5898
 		}
5899 5899
 		default: {
5900 5900
 			break;
5901
-			//KStyle::drawControlMask (element, p, w, r, opt);
5901
+			//TDEStyle::drawControlMask (element, p, w, r, opt);
5902 5902
 		}
5903 5903
 	}
5904 5904
 }
@@ -5917,7 +5917,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
5917 5917
 
5918 5918
 	const bool enabled = (flags & Style_Enabled);
5919 5919
 
5920
-	//return KStyle::drawComplexControl(control, p, widget, r, cg, flags, controls, active, opt);
5920
+	//return TDEStyle::drawComplexControl(control, p, widget, r, cg, flags, controls, active, opt);
5921 5921
 	
5922 5922
 	switch(control) {
5923 5923
 
@@ -5934,7 +5934,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
5934 5934
 			const TQColor bg = (cb && cb->parentWidget()) ?  cb->parentWidget()->paletteBackgroundColor() : cg.background();
5935 5935
 			bool hasPixmap = cb && cb->count() > 0 && cb->pixmap(cb->currentItem());
5936 5936
 			uint contourFlags = 0;
5937
-			bool isKhtmlWidget = khtmlWidgets.contains(cb);
5937
+			bool isKhtmlWidget = tdehtmlWidgets.contains(cb);
5938 5938
 			
5939 5939
 			if(isKhtmlWidget || (cb && cb->parentWidget() && cb->parentWidget()->paletteBackgroundPixmap())) {
5940 5940
 				contourFlags |= Draw_AlphaBlend;
@@ -6059,14 +6059,14 @@ void DominoStyle::drawComplexControl(ComplexControl control,
6059 6059
 			
6060 6060
 			TQToolButton *tb = (TQToolButton *) widget;
6061 6061
 			
6062
-			if(_toolBtnAsBtn && ::tqt_cast<KToolBarButton*>(tb)) {
6062
+			if(_toolBtnAsBtn && ::tqt_cast<TDEToolBarButton*>(tb)) {
6063 6063
 				
6064 6064
 				const bool reverse = TQApplication::reverseLayout();
6065
-				KToolBar *bar = dynamic_cast<KToolBar*>(tb->parentWidget());
6065
+				TDEToolBar *bar = dynamic_cast<TDEToolBar*>(tb->parentWidget());
6066 6066
 				if(!bar) break;
6067
-				KToolBarButton* btn = ::tqt_cast<KToolBarButton*>(tb);
6068
-				KToolBarButton* prevBtn = 0;
6069
-				KToolBarButton* nextBtn = 0;
6067
+				TDEToolBarButton* btn = ::tqt_cast<TDEToolBarButton*>(tb);
6068
+				TDEToolBarButton* prevBtn = 0;
6069
+				TDEToolBarButton* nextBtn = 0;
6070 6070
 				bool prevBtnIsOn = false;
6071 6071
 				bool nextBtnIsOn = false;
6072 6072
 				bool isOn = flags &Style_On || flags &Style_Down;
@@ -6382,7 +6382,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
6382 6382
 				btn->erase();
6383 6383
 				
6384 6384
 			}
6385
-			else if(_toolBtnAsBtn) { // not a KToolBarButton
6385
+			else if(_toolBtnAsBtn) { // not a TDEToolBarButton
6386 6386
 				
6387 6387
 				if(kickerMode && !(flags&(Style_Raised)))
6388 6388
 					break;
@@ -6417,7 +6417,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
6417 6417
 				else if(flags & Style_Default)
6418 6418
 					buttonContour->setState(Contour_DefaultButton);
6419 6419
 				
6420
-				renderButton(p, br, g, (flags & Style_On || flags & Style_Down), flags & Style_MouseOver, true, enabled, khtmlWidgets.contains(opt.widget()) );
6420
+				renderButton(p, br, g, (flags & Style_On || flags & Style_Down), flags & Style_MouseOver, true, enabled, tdehtmlWidgets.contains(opt.widget()) );
6421 6421
 				buttonContour->reset();
6422 6422
 				
6423 6423
 				
@@ -6439,7 +6439,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
6439 6439
 			}
6440 6440
 			else {
6441 6441
 				
6442
-				bool isKbtn = ::tqt_cast<KToolBarButton*>(tb);
6442
+				bool isKbtn = ::tqt_cast<TDEToolBarButton*>(tb);
6443 6443
 				TQPixmap buffer(tb->size());
6444 6444
 				TQPainter painter(&buffer);
6445 6445
 				
@@ -6773,7 +6773,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
6773 6773
 			break;
6774 6774
 		}
6775 6775
 		default:
6776
-			KStyle::drawComplexControl(control, p, widget,
6776
+			TDEStyle::drawComplexControl(control, p, widget,
6777 6777
 										r, cg, flags, controls,
6778 6778
 										active, opt);
6779 6779
 			break;
@@ -6816,7 +6816,7 @@ TQRect DominoStyle::subRect(SubRect r, const TQWidget *widget) const
6816 6816
 		case SR_CheckBoxFocusRect:
6817 6817
 		{
6818 6818
 			TQRect cr = subRect(SR_CheckBoxContents, widget);
6819
-	    		TQRect fr = KStyle::subRect(r, widget);
6819
+	    		TQRect fr = TDEStyle::subRect(r, widget);
6820 6820
 			if(cr.width() <= 0) // no text
6821 6821
 				fr.setHeight(fr.height()+2);
6822 6822
 			else
@@ -6826,7 +6826,7 @@ TQRect DominoStyle::subRect(SubRect r, const TQWidget *widget) const
6826 6826
 		case SR_RadioButtonFocusRect:
6827 6827
 		{
6828 6828
 			TQRect cr = subRect(SR_CheckBoxContents, widget);
6829
-			TQRect fr = KStyle::subRect(r, widget);
6829
+			TQRect fr = TDEStyle::subRect(r, widget);
6830 6830
 			if(cr.width() <= 0) // no text
6831 6831
 				fr.setHeight(fr.height()+2);
6832 6832
 			else
@@ -6846,7 +6846,7 @@ TQRect DominoStyle::subRect(SubRect r, const TQWidget *widget) const
6846 6846
 			return TQRect(rw.left()+18, rw.top(), rw.width()-18, rw.height());
6847 6847
 		}
6848 6848
 		default: {
6849
-			return KStyle::subRect(r, widget);
6849
+			return TDEStyle::subRect(r, widget);
6850 6850
 		}
6851 6851
 	}
6852 6852
 }
@@ -6868,7 +6868,7 @@ TQRect DominoStyle::querySubControlMetrics(ComplexControl control,
6868 6868
 			switch (subcontrol) {
6869 6869
 				case SC_ComboBoxEditField: {
6870 6870
 					const TQComboBox* cb = dynamic_cast<const TQComboBox *>(widget);
6871
-					if(!cb) // maybe kdevelop's KComboView
6871
+					if(!cb) // maybe tdevelop's KComboView
6872 6872
 						return TQRect(r.left()+4, r.top()+3, r.width()-4-15-3, r.height()-7);
6873 6873
 					if(!cb->editable())
6874 6874
 						return TQRect(r.left()+3, r.top()+3, r.width()-4-15-2, r.height()-6);
@@ -6876,7 +6876,7 @@ TQRect DominoStyle::querySubControlMetrics(ComplexControl control,
6876 6876
 					return TQRect(r.left()+3, r.top()+3, r.width()-4-15-2, r.height()-7);
6877 6877
 				}
6878 6878
 				default: {
6879
-					return KStyle::querySubControlMetrics(control, widget, subcontrol, opt);
6879
+					return TDEStyle::querySubControlMetrics(control, widget, subcontrol, opt);
6880 6880
 				}
6881 6881
 			}
6882 6882
 			break;
@@ -6908,7 +6908,7 @@ TQRect DominoStyle::querySubControlMetrics(ComplexControl control,
6908 6908
 					return TQRect(buttonsLeft, r.top()+2, buttonsWidth, r.height()-5);
6909 6909
 				}
6910 6910
 				default: {
6911
-					return KStyle::querySubControlMetrics(control, widget, subcontrol, opt);
6911
+					return TDEStyle::querySubControlMetrics(control, widget, subcontrol, opt);
6912 6912
 				}
6913 6913
 			}
6914 6914
 			break;
@@ -6973,14 +6973,14 @@ TQRect DominoStyle::querySubControlMetrics(ComplexControl control,
6973 6973
 			}
6974 6974
 		}
6975 6975
 		default: {
6976
-			return KStyle::querySubControlMetrics(control, widget, subcontrol, opt);
6976
+			return TDEStyle::querySubControlMetrics(control, widget, subcontrol, opt);
6977 6977
 		}
6978 6978
 	}
6979 6979
 }
6980 6980
 
6981 6981
 int DominoStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
6982 6982
 {
6983
-	//return KStyle::pixelMetric(m, widget);
6983
+	//return TDEStyle::pixelMetric(m, widget);
6984 6984
 	
6985 6985
 	switch(m) {
6986 6986
 	// FRAMES
@@ -7123,7 +7123,7 @@ int DominoStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
7123 7123
 // 		case PM_PopupMenuFrameHorizontalExtra:
7124 7124
 // 			return 1;
7125 7125
 		default:
7126
-			return KStyle::pixelMetric(m, widget);
7126
+			return TDEStyle::pixelMetric(m, widget);
7127 7127
 	}
7128 7128
 }
7129 7129
 
@@ -7133,7 +7133,7 @@ TQSize DominoStyle::sizeFromContents(ContentsType t,
7133 7133
 									const TQSize &s,
7134 7134
 									const TQStyleOption &opt) const
7135 7135
 {
7136
-	//return KStyle::sizeFromContents (t, widget, s, opt);
7136
+	//return TDEStyle::sizeFromContents (t, widget, s, opt);
7137 7137
 	
7138 7138
 	switch (t) {
7139 7139
 
@@ -7189,7 +7189,7 @@ TQSize DominoStyle::sizeFromContents(ContentsType t,
7189 7189
 				if((dots*minTabLength+44)*count >= tb->width())  //  44 = frame+iconwidth
7190 7190
 					return TQSize(s.width(), s.height());
7191 7191
 
7192
-				TQSize sz = KStyle::sizeFromContents( t, widget, s, opt );
7192
+				TQSize sz = TDEStyle::sizeFromContents( t, widget, s, opt );
7193 7193
 	
7194 7194
 				TQString str;
7195 7195
 				str.fill(' ', minTabLength);
@@ -7217,16 +7217,16 @@ TQSize DominoStyle::sizeFromContents(ContentsType t,
7217 7217
 					return TQSize( s.width()+9, s.height()+7 );
7218 7218
 				return TQSize( s.width()+11, s.height()+7 );
7219 7219
 			}
7220
-			return KStyle::sizeFromContents (t, widget, s, opt); // KMultiTabBar buttons
7220
+			return TDEStyle::sizeFromContents (t, widget, s, opt); // KMultiTabBar buttons
7221 7221
 		}
7222 7222
 		case CT_SpinBox: {
7223
-			TQSize sz = KStyle::sizeFromContents( t, widget, s, opt );
7223
+			TQSize sz = TDEStyle::sizeFromContents( t, widget, s, opt );
7224 7224
 			int h = sz.height()%2 != 0 ? sz.height()+1 : sz.height();
7225 7225
 			return ( TQSize( sz.width(), h < 24 ? 24 : h) );
7226 7226
 		}
7227 7227
 		
7228 7228
 		case CT_Header: {
7229
-			TQSize sz = KStyle::sizeFromContents( t, widget, s, opt );
7229
+			TQSize sz = TDEStyle::sizeFromContents( t, widget, s, opt );
7230 7230
 			return TQSize(sz.width(), sz.height()-2);
7231 7231
 		}
7232 7232
 		
@@ -7292,10 +7292,10 @@ TQSize DominoStyle::sizeFromContents(ContentsType t,
7292 7292
 			return TQSize(w, h);
7293 7293
 		}
7294 7294
 		default:
7295
-			return KStyle::sizeFromContents (t, widget, s, opt);
7295
+			return TDEStyle::sizeFromContents (t, widget, s, opt);
7296 7296
 	}
7297 7297
 
7298
-	return KStyle::sizeFromContents (t, widget, s, opt);
7298
+	return TDEStyle::sizeFromContents (t, widget, s, opt);
7299 7299
 }
7300 7300
 
7301 7301
 int DominoStyle::styleHint( StyleHint stylehint,
@@ -7335,7 +7335,7 @@ int DominoStyle::styleHint( StyleHint stylehint,
7335 7335
 			return '*';
7336 7336
 		}
7337 7337
 		default:
7338
-			return KStyle::styleHint(stylehint, widget, option, returnData);
7338
+			return TDEStyle::styleHint(stylehint, widget, option, returnData);
7339 7339
 	}
7340 7340
 }
7341 7341
 
@@ -7352,7 +7352,7 @@ TQPixmap DominoStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widge
7352 7352
 		case SP_TitleBarNormalButton:
7353 7353
 			return TQPixmap(qembed_findImage("ToDesktopButton").copy(0,0,12,12));
7354 7354
 		default:
7355
-			return KStyle::stylePixmap(stylepixmap, widget, opt);
7355
+			return TDEStyle::stylePixmap(stylepixmap, widget, opt);
7356 7356
 	}
7357 7357
 }
7358 7358
 

+ 12
- 12
domino/domino.h View File

@@ -21,7 +21,7 @@
21 21
    Copyright (C) 2000 Daniel M. Duley		<mosfet@kde.org>
22 22
 		 (C) 2000 Dirk Mueller			<mueller@kde.org>
23 23
 		 (C) 2001 Martijn Klingens		<klingens@kde.org>
24
-   Progressbar code based on KStyle,
24
+   Progressbar code based on TDEStyle,
25 25
    Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
26 26
 
27 27
    This library is free software; you can redistribute it and/or
@@ -41,9 +41,9 @@
41 41
 #ifndef __DOMINO_H
42 42
 #define __DOMINO_H
43 43
 
44
-#include <kstyle.h>
44
+#include <tdestyle.h>
45 45
 #include <tqintcache.h>
46
-#include <ktoolbarbutton.h>
46
+#include <tdetoolbarbutton.h>
47 47
 #include "misc.h"
48 48
 #include "data.h"
49 49
 #include <tqpixmapcache.h>
@@ -92,7 +92,7 @@ class Rubber;
92 92
 	};
93 93
 
94 94
 
95
-class DominoStyle : public KStyle
95
+class DominoStyle : public TDEStyle
96 96
 {
97 97
 	Q_OBJECT
98 98
 	
@@ -113,7 +113,7 @@ public:
113 113
 	void polish( TQPalette &p );
114 114
 	void unPolish(TQWidget* widget );
115 115
 	
116
-	void drawKStylePrimitive(KStylePrimitive kpe,
116
+	void drawTDEStylePrimitive(TDEStylePrimitive kpe,
117 117
 				TQPainter* p,
118 118
 				const TQWidget* widget,
119 119
 				const TQRect &r,
@@ -334,7 +334,7 @@ protected:
334 334
 			  bool mouseOver = false,
335 335
 			  bool horizontal = true,
336 336
 			  bool enabled = true,
337
-			  bool khtmlMode = false) const;
337
+			  bool tdehtmlMode = false) const;
338 338
 
339 339
 	void renderHeader(TQPainter *p,
340 340
 			  const TQRect &r,
@@ -397,7 +397,7 @@ protected:
397 397
 	TQPixmap* popupFrame;
398 398
 	TQPixmap* border1;
399 399
 	mutable bool alphaButtonMode;
400
-	bool KApplicationMode;
400
+	bool TDEApplicationMode;
401 401
 	TQColor _checkMarkColor;
402 402
 	
403 403
 	TQMap<const TQGroupBox*, const TQPixmap*> groupBoxPixmaps;
@@ -407,7 +407,7 @@ protected:
407 407
 	TQPoint popupMousePressPos;
408 408
 
409 409
 protected slots:
410
-	void khtmlWidgetDestroyed(TQObject* w);
410
+	void tdehtmlWidgetDestroyed(TQObject* w);
411 411
 	void groupBoxDestroyed(TQObject* w);
412 412
 	
413 413
 	//Animation slots.
@@ -470,8 +470,8 @@ private:
470 470
 	
471 471
 	bool hoveredToolBoxTab;
472 472
 	
473
-	// track khtml widgets.
474
-	TQMap<const TQWidget*,bool> khtmlWidgets;
473
+	// track tdehtml widgets.
474
+	TQMap<const TQWidget*,bool> tdehtmlWidgets;
475 475
 	
476 476
 	//Animation support.
477 477
 	TQMap<TQWidget*, int> progAnimWidgets;
@@ -817,11 +817,11 @@ class DominoTQWhatsThat : public TQWidget
817 817
 		TQString text;
818 818
 };
819 819
 
820
-class DominoKToolBarButton : public KToolBarButton
820
+class DominoKToolBarButton : public TDEToolBarButton
821 821
 {
822 822
 	friend class DominoStyle;
823 823
 	public:
824
-		DominoKToolBarButton(): KToolBarButton() {}
824
+		DominoKToolBarButton(): TDEToolBarButton() {}
825 825
 };
826 826
 
827 827
 class DominoTQListBoxItem : public TQListBoxItem

+ 1
- 1
domino/domino.themerc View File

@@ -2,6 +2,6 @@
2 2
 Name=Domino
3 3
 Comment=A style with customizable color gradients
4 4
 Comment[de]=Ein Stil mit anpassbaren Farbverläufen
5
-ConfigPage=kstyle_domino_config
5
+ConfigPage=tdestyle_domino_config
6 6
 [KDE]
7 7
 WidgetStyle=Domino

+ 37
- 37
domino/eventfilter.cpp View File

@@ -27,12 +27,12 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
27 27
 			case TQEvent::Paint: {
28 28
 				
29 29
 				TQComboBox* cb = dynamic_cast<TQComboBox*>(obj);
30
-				bool khtmlWidget = khtmlWidgets.contains(cb);
30
+				bool tdehtmlWidget = tdehtmlWidgets.contains(cb);
31 31
 				const TQColorGroup & g = cb->colorGroup();
32 32
 				
33 33
 				TQPixmap buffer;
34 34
 				TQPainter p;
35
-				if(khtmlWidget)
35
+				if(tdehtmlWidget)
36 36
 					p.begin(cb);
37 37
 				else {
38 38
 					buffer.resize(cb->width(), cb->height());
@@ -42,7 +42,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
42 42
 				p.setFont(cb->font());
43 43
 				
44 44
 				
45
-				if(!khtmlWidget && cb->parentWidget() && cb->parentWidget()->backgroundPixmap()){
45
+				if(!tdehtmlWidget && cb->parentWidget() && cb->parentWidget()->backgroundPixmap()){
46 46
 					
47 47
 					TQPoint point = cb->backgroundOffset();
48 48
 					p.drawTiledPixmap( 0, 0, cb->width(), cb->height(),
@@ -154,7 +154,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
154 154
 					}
155 155
 				}
156 156
 				p.end();
157
-				if(!khtmlWidget) {
157
+				if(!tdehtmlWidget) {
158 158
 					p.begin(cb);
159 159
 					p.drawPixmap(0, 0, buffer);
160 160
 				}
@@ -187,7 +187,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
187 187
 				return false;
188 188
 			}
189 189
 			case TQEvent::ApplicationPaletteChange: {
190
-				if(!khtmlWidgets.contains(static_cast<TQWidget*>(obj)))
190
+				if(!tdehtmlWidgets.contains(static_cast<TQWidget*>(obj)))
191 191
 					setDominoButtonPalette(static_cast<TQWidget*>(obj), Palette_Application);
192 192
 				return true;
193 193
 			}
@@ -219,11 +219,11 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
219 219
 	if (dynamic_cast<TQLineEdit*>(obj) || (dynamic_cast<TQFrame*>(obj) && dynamic_cast<TQFrame*>(obj)->frameShape() == TQFrame::LineEditPanel) || obj->isA("TQDateTimeEditor")) {
220 220
 		
221 221
 		TQWidget* lineEdit = dynamic_cast<TQWidget*>(obj);
222
-		bool khtmlMode = khtmlWidgets.contains(lineEdit);
222
+		bool tdehtmlMode = tdehtmlWidgets.contains(lineEdit);
223 223
 		bool isLineEdit = dynamic_cast<TQLineEdit*>(obj);
224 224
 		bool isReadOnly = isLineEdit && dynamic_cast<TQLineEdit*>(obj)->isReadOnly();
225 225
 		TQFrame* frame = dynamic_cast<TQFrame*>(obj);
226
-		if((isReadOnly || khtmlMode) && frame->frameWidth() <= 0) {
226
+		if((isReadOnly || tdehtmlMode) && frame->frameWidth() <= 0) {
227 227
 			return false;
228 228
 		}
229 229
 		
@@ -256,7 +256,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
256 256
 
257 257
 		switch(ev->type()) {
258 258
 			case TQEvent::Show:
259
-				if(khtmlMode)
259
+				if(tdehtmlMode)
260 260
 					return true;
261 261
 			case TQEvent::Resize: {
262 262
 				if(noFrame) return false;
@@ -335,8 +335,8 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
335 335
 				// normal lineEdit
336 336
 				const TQPixmap* parentBgPix = lineEdit->parentWidget() ? lineEdit->parentWidget()->paletteBackgroundPixmap() : 0;
337 337
 				TQPixmap* lineEditEdges = 0;
338
-				if(khtmlMode || parentBgPix || !(lineEditEdges = TQPixmapCache::find(TQString::number(bg.pixel(), 16)+TQString::number(cg.background().pixel(), 16)+"lEditEdges"))) {
339
-					if(khtmlMode) {
338
+				if(tdehtmlMode || parentBgPix || !(lineEditEdges = TQPixmapCache::find(TQString::number(bg.pixel(), 16)+TQString::number(cg.background().pixel(), 16)+"lEditEdges"))) {
339
+					if(tdehtmlMode) {
340 340
 						
341 341
 						TQPixmap insidePix = tintImage(qembed_findImage("lineedit4inside"), bg);
342 342
 						bitBlt(lineEdit, x, y, &insidePix, 0, 0, 4, 4);
@@ -379,7 +379,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
379 379
 				
380 380
 				TQPixmap* lineEditPix = 0;
381 381
 				
382
-				if(khtmlMode)
382
+				if(tdehtmlMode)
383 383
 					p.begin(lineEdit);
384 384
 				else {
385 385
 					lineEditPix = new TQPixmap(w, h);
@@ -422,7 +422,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
422 422
 				p.end();
423 423
 				
424 424
 				
425
-				if(!khtmlMode) {
425
+				if(!tdehtmlMode) {
426 426
 					
427 427
 					if(isLineEdit) {
428 428
 						// simply drawing the pixmap would be faster, but the problem with the base color as erase color for disabled lineEdits would remain.
@@ -443,24 +443,24 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
443 443
 			case TQEvent::MouseButtonPress:
444 444
 			case 6/*TQEvent::KeyPress*/: {
445 445
 				// it will be reseted in TQLineEdit::mouseMoveEvent()
446
-				if(isLineEdit && !khtmlMode && isEnabled && !isReadOnly && !isDateTimeEditor)
446
+				if(isLineEdit && !tdehtmlMode && isEnabled && !isReadOnly && !isDateTimeEditor)
447 447
 					static_cast<TQWidget*>(obj)->setCursor(TQt::blankCursor);
448 448
 				return false;
449 449
 			}
450 450
 			case TQEvent::ApplicationPaletteChange:
451
-				if(!khtmlMode) {
451
+				if(!tdehtmlMode) {
452 452
 					lineEdit->setBackgroundMode(TQWidget::PaletteBase);
453 453
 					lineEdit->setPalette(tqApp->palette());
454 454
 				}
455 455
 				return true;
456 456
 			case TQEvent::ParentPaletteChange:
457
-				if(!khtmlMode) {
457
+				if(!tdehtmlMode) {
458 458
 					lineEdit->setBackgroundMode(TQWidget::PaletteBase);
459 459
 					lineEdit->setPalette(lineEdit->parentWidget()->palette());
460 460
 				}
461 461
 				return true;
462 462
 			case TQEvent::PaletteChange:
463
-				if(!khtmlMode) {
463
+				if(!tdehtmlMode) {
464 464
 					lineEdit->setBackgroundMode(TQWidget::PaletteBase);
465 465
 					lineEdit->setPalette(lineEdit->palette());
466 466
 				}
@@ -507,7 +507,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
507 507
 					rubber->destroy();
508 508
 				}
509 509
 				
510
-#if KDE_VERSION >= 0x30506
510
+#if TDE_VERSION >= 0x30506
511 511
 			case TQEvent::Show: {
512 512
 				char selectionName[64];
513 513
 				snprintf(selectionName, 64, "_NET_WM_CM_S%d", DefaultScreen(tqt_xdisplay()));
@@ -1017,18 +1017,18 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1017 1017
 		}
1018 1018
 		return false;
1019 1019
  	}
1020
-	if(::tqt_cast<KToolBarButton*>(obj)) {
1020
+	if(::tqt_cast<TDEToolBarButton*>(obj)) {
1021 1021
 		switch(ev->type()) {
1022 1022
 			case TQEvent::Paint: {
1023
-				KToolBar *bar = dynamic_cast<KToolBar*>(obj->parent());
1023
+				TDEToolBar *bar = dynamic_cast<TDEToolBar*>(obj->parent());
1024 1024
 				if(!bar) return false;  // KMyMoney2
1025
-				KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1025
+				TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1026 1026
 				int index = bar->itemIndex(btn->id());
1027 1027
 				
1028 1028
 				
1029 1029
 				if(_toolBtnAsBtn && sideRepaint == false) {
1030 1030
 					sideRepaint = true;
1031
-					KToolBarButton* sideBtn;
1031
+					TDEToolBarButton* sideBtn;
1032 1032
 					if((sideBtn = bar->getButton(bar->idAt(index-1)))) {
1033 1033
 						sideBtn->repaint(false);
1034 1034
 					}
@@ -1065,7 +1065,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1065 1065
 			case TQEvent::MouseButtonPress: {
1066 1066
 				if(((TQMouseEvent*)ev)->button() == TQt::RightButton)
1067 1067
 					return false;
1068
-				KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1068
+				TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1069 1069
 				btn->setUpdatesEnabled(false);
1070 1070
 				if(!btn->isOn()) btn->setOn(true);
1071 1071
 				btn->setUpdatesEnabled(true);
@@ -1075,7 +1075,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1075 1075
 			case TQEvent::MouseButtonRelease: {
1076 1076
 				if(((TQMouseEvent*)ev)->button() == TQt::RightButton)
1077 1077
 					return false;
1078
-				KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1078
+				TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1079 1079
 				btn->setUpdatesEnabled(false);
1080 1080
 				if(btn->isOn())  btn->setOn(false);
1081 1081
 				btn->setUpdatesEnabled(true);
@@ -1086,13 +1086,13 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1086 1086
 			case TQEvent::MouseButtonDblClick: {
1087 1087
 				if(((TQMouseEvent*)ev)->button() == TQt::RightButton)
1088 1088
 					return false;
1089
-				KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1089
+				TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1090 1090
 				if(!btn->isOn()) btn->setOn(true);
1091 1091
 				hoverWidget = 0;
1092 1092
 				return false;
1093 1093
 			}
1094 1094
 			case TQEvent::Enter: {
1095
-				KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1095
+				TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1096 1096
 				if(btn->isEnabled()) {
1097 1097
 					hoverWidget = btn;
1098 1098
 					btn->repaint(false);
@@ -1100,7 +1100,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1100 1100
 				return false;
1101 1101
 			}
1102 1102
 			case TQEvent::Leave: {
1103
-				KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1103
+				TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1104 1104
 				if(btn == hoverWidget) {
1105 1105
 					hoverWidget = 0;
1106 1106
 					btn->repaint(false);
@@ -1109,7 +1109,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1109 1109
 			}
1110 1110
 			case TQEvent::Move: {
1111 1111
 				if(_toolBtnAsBtn) {
1112
-					KToolBarButton* btn = dynamic_cast<KToolBarButton*>(obj);
1112
+					TDEToolBarButton* btn = dynamic_cast<TDEToolBarButton*>(obj);
1113 1113
 					btn->repaint(false);
1114 1114
 				}
1115 1115
 				return false;
@@ -1149,7 +1149,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1149 1149
 			drawControl(CE_RadioButton, &p, rb, TQRect(0,0,17,17), rb->palette().active(), flags);
1150 1150
 			return true;
1151 1151
 		}
1152
-		if (ev->type() == TQEvent::Show && !strcmp(obj->name(), "__khtml")) {
1152
+		if (ev->type() == TQEvent::Show && !strcmp(obj->name(), "__tdehtml")) {
1153 1153
 			TQRadioButton* rb = static_cast<TQRadioButton*>(obj);
1154 1154
 			TQBitmap bm(rb->size());
1155 1155
 			bm.fill(color0);
@@ -1192,9 +1192,9 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1192 1192
 		if (ev->type() == TQEvent::Paint) {
1193 1193
 			TQCheckBox* cb = static_cast<TQCheckBox*>(obj);
1194 1194
 			
1195
-			bool khtmlWidget = !strcmp(obj->name(), "__khtml");
1196
-			if(khtmlWidget || cb->paletteBackgroundPixmap()) {
1197
-				if(khtmlWidget) {
1195
+			bool tdehtmlWidget = !strcmp(obj->name(), "__tdehtml");
1196
+			if(tdehtmlWidget || cb->paletteBackgroundPixmap()) {
1197
+				if(tdehtmlWidget) {
1198 1198
 					// this prevents the checkbox been erased before the rest of the html page
1199 1199
 					TQBitmap bm(cb->size());
1200 1200
 					bm.fill(color0);
@@ -1287,14 +1287,14 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1287 1287
 			}
1288 1288
 			case TQEvent::MouseMove: {
1289 1289
 				TQMouseEvent* e = (TQMouseEvent*)ev;
1290
-				if(dynamic_cast<TQToolButton*>(obj) && popupTimer->isActive() && ((e->pos()-popupMousePressPos).manhattanLength() > 4 /*KGlobalSettings::dndEventDelay()*/))
1290
+				if(dynamic_cast<TQToolButton*>(obj) && popupTimer->isActive() && ((e->pos()-popupMousePressPos).manhattanLength() > 4 /*TDEGlobalSettings::dndEventDelay()*/))
1291 1291
 					popupToolMenu();
1292 1292
 				return false;
1293 1293
 			}
1294 1294
 			case TQEvent::ParentPaletteChange: {
1295 1295
 				if(obj->isA("TQToolButton")) {
1296 1296
 					
1297
-					if(w->parentWidget() && !khtmlWidgets.contains(w)) {
1297
+					if(w->parentWidget() && !tdehtmlWidgets.contains(w)) {
1298 1298
 						w->setUpdatesEnabled(false);
1299 1299
 						if(w->parentWidget()->paletteBackgroundPixmap()) {
1300 1300
 							w->setBackgroundOrigin(setPixmapOrigin(w->parentWidget()->backgroundOrigin()));
@@ -1364,12 +1364,12 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1364 1364
 		return false;
1365 1365
 	}
1366 1366
 	
1367
-	if(dynamic_cast<KPopupTitle*>(obj)) {
1367
+	if(dynamic_cast<TDEPopupTitle*>(obj)) {
1368 1368
 		
1369 1369
 		switch(ev->type()) {
1370 1370
 			case TQEvent::Paint: {
1371 1371
 				
1372
-				KPopupTitle* pt = static_cast<KPopupTitle*>(obj);
1372
+				TDEPopupTitle* pt = static_cast<TDEPopupTitle*>(obj);
1373 1373
 				TQRect r = pt->rect();
1374 1374
 				TQPainter p(pt);
1375 1375
 				
@@ -1770,7 +1770,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1770 1770
 						p.fillRect(r.width()-16, r.height()-16, 15, 15, tqApp->palette().active().background()); // 15x15 scrollview cornerwidget gap
1771 1771
 						return true;
1772 1772
 					}
1773
-					else if(konquerorMode && f->isA("KHTMLView")) {
1773
+					else if(konquerorMode && f->isA("TDEHTMLView")) {
1774 1774
 						TQPainter p(f);
1775 1775
 						p.setPen(tqApp->palette().active().background().dark(120));
1776 1776
 						p.drawRect(f->rect());
@@ -1796,7 +1796,7 @@ bool DominoStyle::eventFilter(TQObject *obj, TQEvent *ev)
1796 1796
 							f->setMargin(0);
1797 1797
 						
1798 1798
 						TQWidget* w = f->parentWidget();
1799
-						for(int i=0; i<3; i++) { // the third parentcheck is for the tabWidget on kcm khtml_plugins
1799
+						for(int i=0; i<3; i++) { // the third parentcheck is for the tabWidget on kcm tdehtml_plugins
1800 1800
 							if(!w) break;
1801 1801
 							if(dynamic_cast<TQGroupBox*>(w)) {
1802 1802
 								f->setPaletteBackgroundColor(tqApp->palette().active().background());

+ 5
- 5
dominoConfig/Makefile.am View File

@@ -1,8 +1,8 @@
1 1
 INCLUDES = $(all_includes) $(FT2_CFLAGS)
2 2
 
3 3
 noinst_HEADERS = dominoconf.h
4
-kde_module_LTLIBRARIES = kstyle_domino_config.la
5
-kstyle_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
6
-kstyle_domino_config_la_LIBADD  = $(LIB_KDEUI) ../domino/libdomino_style.la $(LIB_QT) $(LIB_KDECORE) -lkdefx $(LIB_KIO)
7
-kstyle_domino_config_la_SOURCES = dominoconf.cpp
8
-kstyle_domino_config_la_METASOURCES = AUTO
4
+kde_module_LTLIBRARIES = tdestyle_domino_config.la
5
+tdestyle_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
6
+tdestyle_domino_config_la_LIBADD  = $(LIB_TDEUI) ../domino/libdomino_style.la $(LIB_QT) $(LIB_TDECORE) -ltdefx $(LIB_TDEIO)
7
+tdestyle_domino_config_la_SOURCES = dominoconf.cpp
8
+tdestyle_domino_config_la_METASOURCES = AUTO

+ 10
- 10
dominoConfig/dominoconf.cpp View File

@@ -31,8 +31,8 @@ DEALINGS IN THE SOFTWARE.
31 31
 #include <tqlayout.h>
32 32
 #include <tqhbox.h>
33 33
 #include <tqsettings.h>
34
-#include <kglobal.h>
35
-#include <klocale.h>
34
+#include <tdeglobal.h>
35
+#include <tdelocale.h>
36 36
 #include <tqpushbutton.h>
37 37
 #include <tqwidget.h>
38 38
 #include <tqgroupbox.h>
@@ -57,12 +57,12 @@ DEALINGS IN THE SOFTWARE.
57 57
 #include <kstandarddirs.h>
58 58
 #include <tqdir.h>
59 59
 #include <tqbuttongroup.h>
60
-#include <kmessagebox.h>
60
+#include <tdemessagebox.h>
61 61
 #include <tqtabbar.h>
62 62
 #include <ktabwidget.h>
63 63
 #include <tqslider.h>
64
-#include <kfiledialog.h>
65
-#include <kio/netaccess.h>
64
+#include <tdefiledialog.h>
65
+#include <tdeio/netaccess.h>
66 66
 #include <tqvbuttongroup.h>
67 67
 
68 68
 #include <X11/Xft/Xft.h>
@@ -77,9 +77,9 @@ DEALINGS IN THE SOFTWARE.
77 77
 
78 78
 extern "C"
79 79
 {
80
-	KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
80
+	KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
81 81
 	{
82
-		KGlobal::locale()->insertCatalogue("kstyle_domino_config");
82
+		TDEGlobal::locale()->insertCatalogue("tdestyle_domino_config");
83 83
 		return new DominoStyleConfig(parent);
84 84
 	}
85 85
 }
@@ -98,7 +98,7 @@ DominoStyleConfig::DominoStyleConfig(TQWidget* parent): TQWidget(parent)
98 98
 	
99 99
 	//Should have no margins here, the dialog provides them
100 100
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 1);
101
-	KGlobal::locale()->insertCatalogue("kstyle_domino_config");
101
+	TDEGlobal::locale()->insertCatalogue("tdestyle_domino_config");
102 102
 
103 103
 	DominoKTabWidget *tabWidget = new DominoKTabWidget(this);
104 104
 	layout->addWidget(tabWidget);
@@ -3916,9 +3916,9 @@ void DominoStyleConfig::slotImport() {
3916 3916
 	}
3917 3917
 	
3918 3918
 	TQString saveDir = TQDir::homeDirPath() + "/.qt/";
3919
-	if (!KIO::NetAccess::file_copy(file, KURL( saveDir+fName ), -1, true ) )
3919
+	if (!TDEIO::NetAccess::file_copy(file, KURL( saveDir+fName ), -1, true ) )
3920 3920
 	{
3921
-		KMessageBox::error(this, KIO::NetAccess::lastErrorString(),i18n("Import failed."));
3921
+		KMessageBox::error(this, TDEIO::NetAccess::lastErrorString(),i18n("Import failed."));
3922 3922
 		return;
3923 3923
 	}
3924 3924
 }

Loading…
Cancel
Save