Browse Source

TQt conversion


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1158446 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8 years ago
parent
commit
eba47f8f06
100 changed files with 1824 additions and 1824 deletions
  1. 46
    46
      kamera/kcontrol/kamera.cpp
  2. 18
    18
      kamera/kcontrol/kamera.h
  3. 50
    50
      kamera/kcontrol/kameraconfigdialog.cpp
  4. 6
    6
      kamera/kcontrol/kameraconfigdialog.h
  5. 61
    61
      kamera/kcontrol/kameradevice.cpp
  6. 36
    36
      kamera/kcontrol/kameradevice.h
  7. 28
    28
      kamera/kioslave/kamera.cpp
  8. 10
    10
      kamera/kioslave/kamera.h
  9. 3
    3
      kcoloredit/color.cpp
  10. 4
    4
      kcoloredit/color.h
  11. 35
    35
      kcoloredit/colorselector.cpp
  12. 8
    8
      kcoloredit/colorselector.h
  13. 26
    26
      kcoloredit/gradientselection.cpp
  14. 9
    9
      kcoloredit/gradientselection.h
  15. 1
    1
      kcoloredit/imageselection.cpp
  16. 3
    3
      kcoloredit/imageselection.h
  17. 2
    2
      kcoloredit/kcolorchooser.cpp
  18. 32
    32
      kcoloredit/kcoloredit.cpp
  19. 3
    3
      kcoloredit/kcoloredit.h
  20. 21
    21
      kcoloredit/kcoloreditdoc.cpp
  21. 16
    16
      kcoloredit/kcoloreditdoc.h
  22. 55
    55
      kcoloredit/kcoloreditview.cpp
  23. 18
    18
      kcoloredit/kcoloreditview.h
  24. 18
    18
      kcoloredit/kxycolorselector.cpp
  25. 9
    9
      kcoloredit/kxycolorselector.h
  26. 15
    15
      kcoloredit/kzcolorselector.cpp
  27. 10
    10
      kcoloredit/kzcolorselector.h
  28. 21
    21
      kcoloredit/loadpalettedlg.cpp
  29. 7
    7
      kcoloredit/loadpalettedlg.h
  30. 5
    5
      kcoloredit/main.h
  31. 31
    31
      kcoloredit/palette.cpp
  32. 14
    14
      kcoloredit/palette.h
  33. 12
    12
      kcoloredit/paletteview.cpp
  34. 6
    6
      kcoloredit/paletteview.h
  35. 37
    37
      kcoloredit/paletteviewscrolledarea.cpp
  36. 17
    17
      kcoloredit/paletteviewscrolledarea.h
  37. 40
    40
      kcoloredit/texteditselection.cpp
  38. 9
    9
      kcoloredit/texteditselection.h
  39. 1
    1
      kcoloredit/textselection.cpp
  40. 3
    3
      kdvi/TeXFont.h
  41. 12
    12
      kdvi/TeXFontDefinition.cpp
  42. 15
    15
      kdvi/TeXFontDefinition.h
  43. 14
    14
      kdvi/TeXFont_PFB.cpp
  44. 1
    1
      kdvi/TeXFont_PFB.h
  45. 14
    14
      kdvi/TeXFont_PK.cpp
  46. 1
    1
      kdvi/TeXFont_PK.h
  47. 5
    5
      kdvi/TeXFont_TFM.cpp
  48. 1
    1
      kdvi/TeXFont_TFM.h
  49. 1
    1
      kdvi/bigEndianByteReader.h
  50. 17
    17
      kdvi/dviFile.cpp
  51. 18
    18
      kdvi/dviFile.h
  52. 79
    79
      kdvi/dviRenderer.cpp
  53. 51
    51
      kdvi/dviRenderer.h
  54. 10
    10
      kdvi/dviRenderer_draw.cpp
  55. 42
    42
      kdvi/dviRenderer_export.cpp
  56. 62
    62
      kdvi/dviRenderer_prescan.cpp
  57. 5
    5
      kdvi/dviWidget.cpp
  58. 7
    7
      kdvi/dviWidget.h
  59. 7
    7
      kdvi/dvisourcesplitter.cpp
  60. 6
    6
      kdvi/dvisourcesplitter.h
  61. 12
    12
      kdvi/fontEncoding.cpp
  62. 4
    4
      kdvi/fontEncoding.h
  63. 1
    1
      kdvi/fontEncodingPool.cpp
  64. 4
    4
      kdvi/fontEncodingPool.h
  65. 24
    24
      kdvi/fontMap.cpp
  66. 13
    13
      kdvi/fontMap.h
  67. 50
    50
      kdvi/fontpool.cpp
  68. 16
    16
      kdvi/fontpool.h
  69. 23
    23
      kdvi/fontprogress.cpp
  70. 8
    8
      kdvi/fontprogress.h
  71. 4
    4
      kdvi/glyph.h
  72. 42
    42
      kdvi/infodialog.cpp
  73. 11
    11
      kdvi/infodialog.h
  74. 29
    29
      kdvi/kdvi_multipage.cpp
  75. 4
    4
      kdvi/kdvi_multipage.h
  76. 2
    2
      kdvi/kdvi_multipage_texthandling.cpp
  77. 1
    1
      kdvi/kprinterwrapper.h
  78. 12
    12
      kdvi/main.cpp
  79. 7
    7
      kdvi/optionDialogFontsWidget.cpp
  80. 1
    1
      kdvi/optionDialogFontsWidget.h
  81. 10
    10
      kdvi/optionDialogSpecialWidget.cpp
  82. 6
    6
      kdvi/optionDialogSpecialWidget.h
  83. 2
    2
      kdvi/performanceMeasurement.h
  84. 5
    5
      kdvi/prebookmark.h
  85. 35
    35
      kdvi/psgs.cpp
  86. 23
    23
      kdvi/psgs.h
  87. 2
    2
      kdvi/renderedDviPagePixmap.h
  88. 131
    131
      kdvi/special.cpp
  89. 1
    1
      kdvi/util.cpp
  90. 1
    1
      kdvi/vf.cpp
  91. 11
    11
      kfax/faxinput.cpp
  92. 77
    77
      kfax/kfax.cpp
  93. 21
    21
      kfax/kfax.h
  94. 16
    16
      kfax/kfax_printsettings.cpp
  95. 4
    4
      kfax/kfax_printsettings.h
  96. 52
    52
      kfax/options.cpp
  97. 33
    33
      kfax/options.h
  98. 8
    8
      kfax/viewfax.cpp
  99. 4
    4
      kfaxview/faxmultipage.cpp
  100. 0
    0
      kfaxview/faxmultipage.h

+ 46
- 46
kamera/kcontrol/kamera.cpp View File

@@ -20,8 +20,8 @@
20 20
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21 21
 
22 22
 */
23
-#include <qlabel.h>
24
-#include <qlayout.h>
23
+#include <tqlabel.h>
24
+#include <tqlayout.h>
25 25
 
26 26
 #include <kgenericfactory.h>
27 27
 #include <ksimpleconfig.h>
@@ -41,14 +41,14 @@
41 41
 #include "kamera.h"
42 42
 #include "kamera.moc"
43 43
 
44
-typedef KGenericFactory<KKameraConfig, QWidget> KKameraConfigFactory;
44
+typedef KGenericFactory<KKameraConfig, TQWidget> KKameraConfigFactory;
45 45
 K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) )
46 46
 
47 47
 // --------------- Camera control center module widget ---
48 48
 
49 49
 KKameraConfig *KKameraConfig::m_instance = NULL;
50 50
 
51
-KKameraConfig::KKameraConfig(QWidget *parent, const char *name, const QStringList &)
51
+KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
52 52
 	: KCModule(KKameraConfigFactory::instance(), parent, name)
53 53
 {
54 54
 	m_devicePopup = new KPopupMenu(this);
@@ -88,7 +88,7 @@ void KKameraConfig::defaults()
88 88
 
89 89
 void KKameraConfig::displayGPFailureDialogue(void)
90 90
 {
91
-	new QLabel(i18n("Unable to initialize the gPhoto2 libraries."), this);
91
+	new TQLabel(i18n("Unable to initialize the gPhoto2 libraries."), this);
92 92
 }
93 93
 
94 94
 void KKameraConfig::displayGPSuccessDialogue(void)
@@ -97,7 +97,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
97 97
 	setButtons(Help | Apply | Cancel | Ok);
98 98
 
99 99
 	// create a layout with two vertical boxes
100
-	QVBoxLayout *topLayout = new QVBoxLayout(this, 0, 0);
100
+	TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
101 101
 	topLayout->setAutoAdd(true);
102 102
 	
103 103
 	m_toolbar = new KToolBar(this, "ToolBar");
@@ -106,36 +106,36 @@ void KKameraConfig::displayGPSuccessDialogue(void)
106 106
 	// create list of devices
107 107
 	m_deviceSel = new KIconView(this);
108 108
 
109
-	connect(m_deviceSel, SIGNAL(rightButtonClicked(QIconViewItem *, const QPoint &)),
110
-		SLOT(slot_deviceMenu(QIconViewItem *, const QPoint &)));
111
-	connect(m_deviceSel, SIGNAL(doubleClicked(QIconViewItem *)),
112
-		SLOT(slot_configureCamera()));
113
-	connect(m_deviceSel, SIGNAL(selectionChanged(QIconViewItem *)),
114
-		SLOT(slot_deviceSelected(QIconViewItem *)));
109
+	connect(m_deviceSel, TQT_SIGNAL(rightButtonClicked(TQIconViewItem *, const TQPoint &)),
110
+		TQT_SLOT(slot_deviceMenu(TQIconViewItem *, const TQPoint &)));
111
+	connect(m_deviceSel, TQT_SIGNAL(doubleClicked(TQIconViewItem *)),
112
+		TQT_SLOT(slot_configureCamera()));
113
+	connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
114
+		TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
115 115
 
116
-	m_deviceSel->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
116
+	m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
117 117
 	
118 118
 	// create actions
119 119
 	KAction *act;
120 120
 	
121
-	act = new KAction(i18n("Add"), "camera", 0, this, SLOT(slot_addCamera()), m_actions, "camera_add");
121
+	act = new KAction(i18n("Add"), "camera", 0, this, TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
122 122
 	act->setWhatsThis(i18n("Click this button to add a new camera."));
123 123
 	act->plug(m_toolbar);
124 124
 	m_toolbar->insertLineSeparator();
125
-	act = new KAction(i18n("Test"), "camera_test", 0, this, SLOT(slot_testCamera()), m_actions, "camera_test");
125
+	act = new KAction(i18n("Test"), "camera_test", 0, this, TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
126 126
 	act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
127 127
 	act->plug(m_toolbar);
128
-	act = new KAction(i18n("Remove"), "edittrash", 0, this, SLOT(slot_removeCamera()), m_actions, "camera_remove");
128
+	act = new KAction(i18n("Remove"), "edittrash", 0, this, TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
129 129
 	act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
130 130
 	act->plug(m_toolbar);
131
-	act = new KAction(i18n("Configure..."), "configure", 0, this, SLOT(slot_configureCamera()), m_actions, "camera_configure");
131
+	act = new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
132 132
 	act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
133 133
 	act->plug(m_toolbar);
134
-	act = new KAction(i18n("Information"), "hwinfo", 0, this, SLOT(slot_cameraSummary()), m_actions, "camera_summary");
134
+	act = new KAction(i18n("Information"), "hwinfo", 0, this, TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
135 135
 	act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
136 136
 	act->plug(m_toolbar);
137 137
 	m_toolbar->insertLineSeparator();
138
-	act = new KAction(i18n("Cancel"), "stop", 0, this, SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
138
+	act = new KAction(i18n("Cancel"), "stop", 0, this, TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
139 139
 	act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
140 140
 	act->setEnabled(false);
141 141
 	act->plug(m_toolbar);
@@ -147,7 +147,7 @@ void KKameraConfig::populateDeviceListView(void)
147 147
 	CameraDevicesMap::Iterator it;
148 148
 	for (it = m_devices.begin(); it != m_devices.end(); it++) {
149 149
 		if (it.data()) {
150
-			new QIconViewItem(m_deviceSel, it.key(), DesktopIcon("camera"));
150
+			new TQIconViewItem(m_deviceSel, it.key(), DesktopIcon("camera"));
151 151
 		}
152 152
 	}
153 153
 	slot_deviceSelected(m_deviceSel->currentItem());
@@ -172,8 +172,8 @@ void KKameraConfig::load(void)
172 172
 void KKameraConfig::load(bool useDefaults )
173 173
 {
174 174
 	m_config->setReadDefaults( useDefaults );
175
-	QStringList groupList = m_config->groupList();
176
-	QStringList::Iterator it;
175
+	TQStringList groupList = m_config->groupList();
176
+	TQStringList::Iterator it;
177 177
         int i, count;
178 178
         CameraList *list;
179 179
         CameraAbilitiesList *al;
@@ -188,8 +188,8 @@ void KKameraConfig::load(bool useDefaults )
188 188
 				continue;
189 189
 
190 190
 			kcamera = new KCamera(*it,m_config->readEntry("Path"));
191
-			connect(kcamera, SIGNAL(error(const QString &)), SLOT(slot_error(const QString &)));
192
-			connect(kcamera, SIGNAL(error(const QString &, const QString &)), SLOT(slot_error(const QString &, const QString &)));
191
+			connect(kcamera, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
192
+			connect(kcamera, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
193 193
 			kcamera->load(m_config);
194 194
 			m_devices[*it] = kcamera;
195 195
 		}
@@ -208,7 +208,7 @@ void KKameraConfig::load(bool useDefaults )
208 208
 
209 209
         count = gp_list_count (list);
210 210
 
211
-	QMap<QString,QString>	ports, names;
211
+	TQMap<TQString,TQString>	ports, names;
212 212
 	
213 213
 	for (i = 0 ; i<count ; i++) {
214 214
 		gp_list_get_name  (list, i, &model);
@@ -221,14 +221,14 @@ void KKameraConfig::load(bool useDefaults )
221 221
 	if (ports.contains("usb:") && names[ports["usb:"]]!="usb:")
222 222
 		ports.remove("usb:");
223 223
 
224
-	QMap<QString,QString>::iterator portit;
224
+	TQMap<TQString,TQString>::iterator portit;
225 225
 
226 226
 	for (portit = ports.begin() ; portit != ports.end(); portit++) {
227 227
 		/* kdDebug() << "Adding USB camera: " << portit.data() << " at " << portit.key() << endl; */
228 228
 
229 229
 		kcamera = new KCamera(portit.data(),portit.key());
230
-		connect(kcamera, SIGNAL(error(const QString &)), SLOT(slot_error(const QString &)));
231
-		connect(kcamera, SIGNAL(error(const QString &, const QString &)), SLOT(slot_error(const QString &, const QString &)));
230
+		connect(kcamera, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
231
+		connect(kcamera, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
232 232
 		m_devices[portit.data()] = kcamera;
233 233
 	}
234 234
 	populateDeviceListView();
@@ -265,9 +265,9 @@ void KKameraConfig::afterCameraOperation(void)
265 265
 	slot_deviceSelected(m_deviceSel->currentItem());
266 266
 }
267 267
 
268
-QString KKameraConfig::suggestName(const QString &name)
268
+TQString KKameraConfig::suggestName(const TQString &name)
269 269
 {
270
-	QString new_name = name;
270
+	TQString new_name = name;
271 271
 	new_name.replace("/", ""); // we cannot have a slash in a URI's host
272 272
 
273 273
 	if (!m_devices.contains(new_name)) return new_name;
@@ -275,20 +275,20 @@ QString KKameraConfig::suggestName(const QString &name)
275 275
 	// try new names with a number appended until we find a free one
276 276
 	int i = 1;
277 277
 	while (i++ < 0xffff) {
278
-		new_name = name + " (" + QString::number(i) + ")";
278
+		new_name = name + " (" + TQString::number(i) + ")";
279 279
 		if (!m_devices.contains(new_name)) return new_name;
280 280
 	}
281 281
 
282
-	return QString::null;
282
+	return TQString::null;
283 283
 }
284 284
 
285 285
 void KKameraConfig::slot_addCamera()
286 286
 {
287
-	KCamera *m_device = new KCamera(QString::null,QString::null);
288
-	connect(m_device, SIGNAL(error(const QString &)), SLOT(slot_error(const QString &)));
289
-	connect(m_device, SIGNAL(error(const QString &, const QString &)), SLOT(slot_error(const QString &, const QString &)));
287
+	KCamera *m_device = new KCamera(TQString::null,TQString::null);
288
+	connect(m_device, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &)));
289
+	connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &)));
290 290
 	KameraDeviceSelectDialog dialog(this, m_device);
291
-	if (dialog.exec() == QDialog::Accepted) {
291
+	if (dialog.exec() == TQDialog::Accepted) {
292 292
 		dialog.save();
293 293
 		m_device->setName(suggestName(m_device->model()));
294 294
 		m_devices.insert(m_device->name(), m_device);
@@ -301,7 +301,7 @@ void KKameraConfig::slot_addCamera()
301 301
 
302 302
 void KKameraConfig::slot_removeCamera()
303 303
 {
304
-	QString name = m_deviceSel->currentItem()->text();
304
+	TQString name = m_deviceSel->currentItem()->text();
305 305
 	if (m_devices.contains(name)) {
306 306
 		KCamera *m_device = m_devices[name];
307 307
 		m_devices.remove(name);
@@ -316,7 +316,7 @@ void KKameraConfig::slot_testCamera()
316 316
 {
317 317
 	beforeCameraOperation();
318 318
 
319
-	QString name = m_deviceSel->currentItem()->text();
319
+	TQString name = m_deviceSel->currentItem()->text();
320 320
 	if (m_devices.contains(name)) {
321 321
 		KCamera *m_device = m_devices[name];
322 322
 		if (m_device->test())
@@ -328,7 +328,7 @@ void KKameraConfig::slot_testCamera()
328 328
 
329 329
 void KKameraConfig::slot_configureCamera()
330 330
 {
331
-	QString name = m_deviceSel->currentItem()->text();
331
+	TQString name = m_deviceSel->currentItem()->text();
332 332
 	if (m_devices.contains(name)) {
333 333
 		KCamera *m_device = m_devices[name];
334 334
 		m_device->configure();
@@ -337,8 +337,8 @@ void KKameraConfig::slot_configureCamera()
337 337
 
338 338
 void KKameraConfig::slot_cameraSummary()
339 339
 {
340
-	QString summary;
341
-	QString name = m_deviceSel->currentItem()->text();
340
+	TQString summary;
341
+	TQString name = m_deviceSel->currentItem()->text();
342 342
 	if (m_devices.contains(name)) {
343 343
 		KCamera *m_device = m_devices[name];
344 344
 		summary = m_device->summary();
@@ -357,7 +357,7 @@ void KKameraConfig::slot_cancelOperation()
357 357
 	qApp->setOverrideCursor(Qt::WaitCursor);
358 358
 }
359 359
 
360
-void KKameraConfig::slot_deviceMenu(QIconViewItem *item, const QPoint &point)
360
+void KKameraConfig::slot_deviceMenu(TQIconViewItem *item, const TQPoint &point)
361 361
 {
362 362
 	if (item) {
363 363
 		m_devicePopup->clear();
@@ -369,7 +369,7 @@ void KKameraConfig::slot_deviceMenu(QIconViewItem *item, const QPoint &point)
369 369
 	}
370 370
 }
371 371
 
372
-void KKameraConfig::slot_deviceSelected(QIconViewItem *item)
372
+void KKameraConfig::slot_deviceSelected(TQIconViewItem *item)
373 373
 {
374 374
 	m_actions->action("camera_test")->setEnabled(item);
375 375
 	m_actions->action("camera_remove")->setEnabled(item);
@@ -399,7 +399,7 @@ GPContextFeedback KKameraConfig::cbGPCancel(GPContext * /*context*/, void *data)
399 399
 		return GP_CONTEXT_FEEDBACK_OK;
400 400
 }
401 401
 
402
-QString KKameraConfig::quickHelp() const
402
+TQString KKameraConfig::quickHelp() const
403 403
 {
404 404
 	return i18n("<h1>Digital Camera</h1>\n"
405 405
 	  "This module allows you to configure support for your digital camera.\n"
@@ -411,12 +411,12 @@ QString KKameraConfig::quickHelp() const
411 411
 	  "<a href=\"camera:/\">camera:/</a> in Konqueror and other KDE applications.");
412 412
 }
413 413
 
414
-void KKameraConfig::slot_error(const QString &message)
414
+void KKameraConfig::slot_error(const TQString &message)
415 415
 {
416 416
 	KMessageBox::error(this, message);
417 417
 }
418 418
 
419
-void KKameraConfig::slot_error(const QString &message, const QString &details)
419
+void KKameraConfig::slot_error(const TQString &message, const TQString &details)
420 420
 {
421 421
 	KMessageBox::detailedError(this, message, details);
422 422
 }

+ 18
- 18
kamera/kcontrol/kamera.h View File

@@ -26,15 +26,15 @@
26 26
 #include <kcmodule.h>
27 27
 #include <gphoto2.h>
28 28
 
29
-class QWidget;
30
-class QRadioButton;
31
-class QPushButton;
32
-class QComboBox;
33
-class QVButtonGroup;
34
-class QLineEdit;
35
-class QWidgetStack;
36
-class QCheckBox;
37
-class QIconViewItem;
29
+class TQWidget;
30
+class TQRadioButton;
31
+class TQPushButton;
32
+class TQComboBox;
33
+class TQVButtonGroup;
34
+class TQLineEdit;
35
+class TQWidgetStack;
36
+class TQCheckBox;
37
+class TQIconViewItem;
38 38
 
39 39
 class KCamera;
40 40
 class KameraDeviceSelectDialog;
@@ -50,7 +50,7 @@ class KKameraConfig : public KCModule
50 50
 	friend class KameraDeviceSelectDialog;
51 51
 
52 52
 public:
53
-	KKameraConfig(QWidget *parent, const char *name, const QStringList &);
53
+	KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
54 54
 	virtual ~KKameraConfig();
55 55
 
56 56
 	// KCModule interface methods
@@ -59,22 +59,22 @@ public:
59 59
 	void save();
60 60
 	void defaults();
61 61
 	int buttons();
62
-	QString quickHelp() const;
62
+	TQString quickHelp() const;
63 63
 
64 64
 protected:
65
-	QString suggestName(const QString &name);
65
+	TQString suggestName(const TQString &name);
66 66
 
67 67
 protected slots:
68
-	void slot_deviceMenu(QIconViewItem *item, const QPoint &point);
69
-	void slot_deviceSelected(QIconViewItem *item);
68
+	void slot_deviceMenu(TQIconViewItem *item, const TQPoint &point);
69
+	void slot_deviceSelected(TQIconViewItem *item);
70 70
 	void slot_addCamera();
71 71
 	void slot_removeCamera();
72 72
 	void slot_configureCamera();
73 73
 	void slot_cameraSummary();
74 74
 	void slot_testCamera();
75 75
 	void slot_cancelOperation();
76
-	void slot_error(const QString &message);
77
-	void slot_error(const QString &message, const QString &details);
76
+	void slot_error(const TQString &message);
77
+	void slot_error(const TQString &message, const TQString &details);
78 78
 
79 79
 private:
80 80
 	void displayGPFailureDialogue(void);
@@ -89,7 +89,7 @@ private:
89 89
 	static GPContextFeedback cbGPCancel(GPContext *context, void *data);
90 90
 
91 91
 private:
92
-	typedef QMap<QString, KCamera *> CameraDevicesMap;
92
+	typedef TQMap<TQString, KCamera *> CameraDevicesMap;
93 93
 	
94 94
 	KSimpleConfig *m_config;
95 95
 	CameraDevicesMap m_devices;
@@ -101,7 +101,7 @@ private:
101 101
 	// widgets for the cameras listview
102 102
 	KIconView *m_deviceSel;
103 103
 	KActionCollection *m_actions;
104
-	QPushButton *m_addCamera, *m_removeCamera, *m_testCamera, *m_configureCamera;
104
+	TQPushButton *m_addCamera, *m_removeCamera, *m_testCamera, *m_configureCamera;
105 105
 	KToolBar *m_toolbar;
106 106
 	KPopupMenu *m_devicePopup;
107 107
 

+ 50
- 50
kamera/kcontrol/kameraconfigdialog.cpp View File

@@ -20,20 +20,20 @@
20 20
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21 21
 
22 22
 */
23
-#include <qlayout.h>
24
-#include <qgrid.h>
25
-#include <qlabel.h>
26
-#include <qvgroupbox.h>
27
-#include <qcheckbox.h>
28
-#include <qradiobutton.h>
29
-#include <qlineedit.h>
30
-#include <qcombobox.h>
31
-#include <qslider.h>
32
-#include <qvbuttongroup.h>
33
-#include <qhbuttongroup.h>
34
-#include <qvbox.h>
35
-#include <qtabwidget.h>
36
-#include <qwhatsthis.h>
23
+#include <tqlayout.h>
24
+#include <tqgrid.h>
25
+#include <tqlabel.h>
26
+#include <tqvgroupbox.h>
27
+#include <tqcheckbox.h>
28
+#include <tqradiobutton.h>
29
+#include <tqlineedit.h>
30
+#include <tqcombobox.h>
31
+#include <tqslider.h>
32
+#include <tqvbuttongroup.h>
33
+#include <tqhbuttongroup.h>
34
+#include <tqvbox.h>
35
+#include <tqtabwidget.h>
36
+#include <tqwhatsthis.h>
37 37
 
38 38
 #include <klocale.h>
39 39
 
@@ -42,13 +42,13 @@
42 42
 
43 43
 KameraConfigDialog::KameraConfigDialog(Camera */*camera*/,
44 44
 					CameraWidget *widget,
45
-					QWidget *parent,
45
+					TQWidget *parent,
46 46
 					const char *name) :
47
-KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok ),
47
+KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok ),
48 48
 m_widgetRoot(widget)
49 49
 {
50
-    QFrame *main = makeMainWidget();
51
-	QVBoxLayout *topLayout = new QVBoxLayout(main, 0, spacingHint());
50
+    TQFrame *main = makeMainWidget();
51
+	TQVBoxLayout *topLayout = new TQVBoxLayout(main, 0, spacingHint());
52 52
 	topLayout->setAutoAdd(true);
53 53
 
54 54
 	m_tabWidget = 0;
@@ -56,9 +56,9 @@ m_widgetRoot(widget)
56 56
 	appendWidget(main, widget);
57 57
 }
58 58
 
59
-void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
59
+void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
60 60
 {
61
-	QWidget *newParent = parent;
61
+	TQWidget *newParent = parent;
62 62
 	
63 63
 	CameraWidgetType widget_type;
64 64
 	const char *widget_name;
@@ -72,7 +72,7 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
72 72
 	gp_widget_get_info(widget, &widget_info);
73 73
 	gp_widget_get_name(widget, &widget_name);
74 74
 	
75
-	QString whats_this = QString::fromLocal8Bit(widget_info);	// gphoto2 doesn't seem to have any standard for i18n
75
+	TQString whats_this = TQString::fromLocal8Bit(widget_info);	// gphoto2 doesn't seem to have any standard for i18n
76 76
 
77 77
 	// Add this widget to parent
78 78
 	switch(widget_type) {
@@ -85,13 +85,13 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
85 85
 	case GP_WIDGET_SECTION:
86 86
 		{
87 87
 			if (!m_tabWidget)
88
-				m_tabWidget = new QTabWidget(parent);
89
-			QWidget *tab = new QWidget(m_tabWidget);
88
+				m_tabWidget = new TQTabWidget(parent);
89
+			TQWidget *tab = new TQWidget(m_tabWidget);
90 90
 			// widgets are to be aligned vertically in the tab
91
-			QVBoxLayout *tabLayout = new QVBoxLayout(tab, marginHint(),
91
+			TQVBoxLayout *tabLayout = new TQVBoxLayout(tab, marginHint(),
92 92
 				spacingHint());
93 93
 			m_tabWidget->insertTab(tab, widget_label);
94
-			QVBox *tabContainer = new QVBox(tab);
94
+			TQVBox *tabContainer = new TQVBox(tab);
95 95
 			tabContainer->setSpacing(spacingHint());
96 96
 			tabLayout->addWidget(tabContainer);
97 97
 			newParent = tabContainer;
@@ -104,14 +104,14 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
104 104
 		{
105 105
 			gp_widget_get_value(widget, &widget_value_string);
106 106
 
107
-			QGrid *grid = new QGrid(2, Horizontal, parent);
107
+			TQGrid *grid = new TQGrid(2, Horizontal, parent);
108 108
 			grid->setSpacing(spacingHint());
109
-			new QLabel(QString::fromLocal8Bit( widget_label )+":", grid);
110
-			QLineEdit *lineEdit = new QLineEdit(widget_value_string, grid);
109
+			new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid);
110
+			TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid);
111 111
 			m_wmap.insert(widget, lineEdit);
112 112
 
113 113
 			if (!whats_this.isEmpty())
114
-				QWhatsThis::add(grid, whats_this);
114
+				TQWhatsThis::add(grid, whats_this);
115 115
 
116 116
 			break;
117 117
 		}
@@ -123,18 +123,18 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
123 123
 			gp_widget_get_range(widget, &widget_low, &widget_high, &widget_increment);
124 124
 			gp_widget_get_value(widget, &widget_value_float);
125 125
 	
126
-			QGroupBox *groupBox = new QVGroupBox(widget_label, parent);
127
-			QSlider *slider = new QSlider(
126
+			TQGroupBox *groupBox = new TQVGroupBox(widget_label, parent);
127
+			TQSlider *slider = new TQSlider(
128 128
 				( int )widget_low,
129 129
 				( int )widget_high,
130 130
 				( int )widget_increment,
131 131
 				( int )widget_value_float,
132
-				QSlider::Horizontal,
132
+				TQSlider::Horizontal,
133 133
 				groupBox );
134 134
 			m_wmap.insert(widget, slider);
135 135
 		
136 136
 			if (!whats_this.isEmpty())
137
-				QWhatsThis::add(groupBox, whats_this);
137
+				TQWhatsThis::add(groupBox, whats_this);
138 138
 		
139 139
 			break;
140 140
 		}
@@ -142,12 +142,12 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
142 142
 		{
143 143
 			gp_widget_get_value(widget, &widget_value_int);
144 144
 		
145
-			QCheckBox *checkBox = new QCheckBox(widget_label, parent);
145
+			TQCheckBox *checkBox = new TQCheckBox(widget_label, parent);
146 146
 			checkBox->setChecked(widget_value_int);
147 147
 			m_wmap.insert(widget, checkBox);
148 148
 
149 149
 			if (!whats_this.isEmpty())
150
-				QWhatsThis::add(checkBox, whats_this);
150
+				TQWhatsThis::add(checkBox, whats_this);
151 151
 
152 152
 			break;
153 153
 		}
@@ -158,24 +158,24 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
158 158
 			int count = gp_widget_count_choices(widget);
159 159
 
160 160
 			// for less than 5 options, align them horizontally
161
-			QButtonGroup *buttonGroup;
161
+			TQButtonGroup *buttonGroup;
162 162
 			if (count > 4)
163
-				buttonGroup = new QVButtonGroup(widget_label, parent);
163
+				buttonGroup = new TQVButtonGroup(widget_label, parent);
164 164
 			else
165
-				buttonGroup = new QHButtonGroup(widget_label, parent);
165
+				buttonGroup = new TQHButtonGroup(widget_label, parent);
166 166
 			
167 167
 			for(int i = 0; i < count; ++i) {
168 168
 				const char *widget_choice;
169 169
 				gp_widget_get_choice(widget, i, &widget_choice);
170 170
 
171
-				new QRadioButton(widget_choice, buttonGroup);
171
+				new TQRadioButton(widget_choice, buttonGroup);
172 172
 				if(!strcmp(widget_value_string, widget_choice))
173 173
 					buttonGroup->setButton(i);
174 174
 			}
175 175
 			m_wmap.insert(widget, buttonGroup);
176 176
 
177 177
 			if (!whats_this.isEmpty())
178
-				QWhatsThis::add(buttonGroup, whats_this);
178
+				TQWhatsThis::add(buttonGroup, whats_this);
179 179
 
180 180
 			break;
181 181
 		}
@@ -183,7 +183,7 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
183 183
 		{
184 184
 			gp_widget_get_value(widget, &widget_value_string);
185 185
 	
186
-			QComboBox *comboBox = new QComboBox(FALSE, parent);
186
+			TQComboBox *comboBox = new TQComboBox(FALSE, parent);
187 187
 			comboBox->clear();
188 188
 			for(int i = 0; i < gp_widget_count_choices(widget); ++i) {
189 189
 				const char *widget_choice;
@@ -196,7 +196,7 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
196 196
 			m_wmap.insert(widget, comboBox);
197 197
 
198 198
 			if (!whats_this.isEmpty())
199
-				QWhatsThis::add(comboBox, whats_this);
199
+				TQWhatsThis::add(comboBox, whats_this);
200 200
 
201 201
 			break;
202 202
 		}
@@ -206,14 +206,14 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
206 206
 			// I can't see a way of implementing this. Since there is
207 207
 			// no way of telling which button sent you a signal, we
208 208
 			// can't map to the appropriate widget->callback
209
-			new QLabel(i18n("Button (not supported by KControl)"), parent);
209
+			new TQLabel(i18n("Button (not supported by KControl)"), parent);
210 210
 	
211 211
 			break;
212 212
 		}
213 213
 	case GP_WIDGET_DATE:
214 214
 		{
215 215
 			// TODO
216
-			new QLabel(i18n("Date (not supported by KControl)"), parent);
216
+			new TQLabel(i18n("Date (not supported by KControl)"), parent);
217 217
 
218 218
 			break;
219 219
 		}
@@ -233,7 +233,7 @@ void KameraConfigDialog::appendWidget(QWidget *parent, CameraWidget *widget)
233 233
 	switch (widget_type) {
234 234
 	case GP_WIDGET_SECTION:
235 235
 		{
236
-			tabLayout->addItem( new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding) );
236
+			tabLayout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding) );
237 237
 			break;
238 238
 		}
239 239
 	}
@@ -254,14 +254,14 @@ void KameraConfigDialog::updateWidgetValue(CameraWidget *widget)
254 254
 		break;
255 255
 	case GP_WIDGET_TEXT:
256 256
 		{
257
-			QLineEdit *lineEdit = static_cast<QLineEdit *>(m_wmap[widget]);
257
+			TQLineEdit *lineEdit = static_cast<TQLineEdit *>(m_wmap[widget]);
258 258
 			gp_widget_set_value(widget, (void *)lineEdit->text().local8Bit().data());
259 259
 	
260 260
 			break;
261 261
 		}
262 262
 	case GP_WIDGET_RANGE:
263 263
 		{
264
-			QSlider *slider = static_cast<QSlider *>(m_wmap[widget]);
264
+			TQSlider *slider = static_cast<TQSlider *>(m_wmap[widget]);
265 265
 			float value_float = slider->value();
266 266
 			gp_widget_set_value(widget, (void *)&value_float);
267 267
 			
@@ -269,7 +269,7 @@ void KameraConfigDialog::updateWidgetValue(CameraWidget *widget)
269 269
 		}
270 270
 	case GP_WIDGET_TOGGLE:
271 271
 		{
272
-			QCheckBox *checkBox = static_cast<QCheckBox *>(m_wmap[widget]);
272
+			TQCheckBox *checkBox = static_cast<TQCheckBox *>(m_wmap[widget]);
273 273
 			int value_int = checkBox->isChecked() ? 1 : 0;
274 274
 			gp_widget_set_value(widget, (void *)&value_int);
275 275
 			
@@ -277,14 +277,14 @@ void KameraConfigDialog::updateWidgetValue(CameraWidget *widget)
277 277
 		}
278 278
 	case GP_WIDGET_RADIO:
279 279
 		{
280
-			QButtonGroup *buttonGroup = static_cast<QVButtonGroup *>(m_wmap[widget]);
280
+			TQButtonGroup *buttonGroup = static_cast<TQVButtonGroup *>(m_wmap[widget]);
281 281
 			gp_widget_set_value(widget, (void *)buttonGroup->selected()->text().local8Bit().data());
282 282
 
283 283
 			break;
284 284
 		}
285 285
 	case GP_WIDGET_MENU:
286 286
 		{
287
-			QComboBox *comboBox = static_cast<QComboBox *>(m_wmap[widget]);
287
+			TQComboBox *comboBox = static_cast<TQComboBox *>(m_wmap[widget]);
288 288
 			gp_widget_set_value(widget, (void *)comboBox->currentText().local8Bit().data());
289 289
 	
290 290
 			break;

+ 6
- 6
kamera/kcontrol/kameraconfigdialog.h View File

@@ -23,9 +23,9 @@
23 23
 #ifndef __kameraconfigdialog_h__
24 24
 #define __kameraconfigdialog_h__
25 25
 
26
-#include <qmap.h>
26
+#include <tqmap.h>
27 27
 #include <kdialogbase.h>
28
-#include <qtabwidget.h>
28
+#include <tqtabwidget.h>
29 29
 
30 30
 extern "C" {
31 31
 	#include <gphoto2.h>
@@ -36,18 +36,18 @@ class KameraConfigDialog : public KDialogBase
36 36
 	Q_OBJECT
37 37
 public:
38 38
 	KameraConfigDialog(Camera *camera, CameraWidget *widget,
39
-			   QWidget *parent = 0, const char *name = 0);
39
+			   TQWidget *parent = 0, const char *name = 0);
40 40
 
41 41
 private slots:
42 42
 	void slotOk();
43 43
 
44 44
 private:
45
-	void appendWidget(QWidget *parent, CameraWidget *widget);
45
+	void appendWidget(TQWidget *parent, CameraWidget *widget);
46 46
 	void updateWidgetValue(CameraWidget *widget);
47 47
 	
48
-	QMap<CameraWidget *, QWidget *> m_wmap;
48
+	TQMap<CameraWidget *, TQWidget *> m_wmap;
49 49
 	CameraWidget *m_widgetRoot;
50
-	QTabWidget *m_tabWidget;
50
+	TQTabWidget *m_tabWidget;
51 51
 };
52 52
 
53 53
 #endif

+ 61
- 61
kamera/kcontrol/kameradevice.cpp View File

@@ -20,16 +20,16 @@
20 20
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21 21
 
22 22
 */
23
-#include <qlayout.h>
24
-#include <qwidgetstack.h>
25
-#include <qvbuttongroup.h>
26
-#include <qvgroupbox.h>
27
-#include <qcombobox.h>
28
-#include <qlineedit.h>
29
-#include <qradiobutton.h>
30
-#include <qwhatsthis.h>
31
-#include <qlabel.h>
32
-#include <qgrid.h>
23
+#include <tqlayout.h>
24
+#include <tqwidgetstack.h>
25
+#include <tqvbuttongroup.h>
26
+#include <tqvgroupbox.h>
27
+#include <tqcombobox.h>
28
+#include <tqlineedit.h>
29
+#include <tqradiobutton.h>
30
+#include <tqwhatsthis.h>
31
+#include <tqlabel.h>
32
+#include <tqgrid.h>
33 33
 
34 34
 #include <klocale.h>
35 35
 #include <kconfig.h>
@@ -54,7 +54,7 @@ static const int INDEX_SERIAL = 1;
54 54
 static const int INDEX_USB= 3;
55 55
 static GPContext *glob_context = 0;
56 56
 
57
-KCamera::KCamera(const QString &name, const QString &path)
57
+KCamera::KCamera(const TQString &name, const TQString &path)
58 58
 {
59 59
 	m_name	= name;
60 60
 	m_model	= name;
@@ -143,7 +143,7 @@ Camera* KCamera::camera()
143 143
 	return m_camera;
144 144
 }
145 145
 
146
-QString KCamera::summary()
146
+TQString KCamera::summary()
147 147
 {
148 148
 	int result;
149 149
 	CameraText	summary;
@@ -153,7 +153,7 @@ QString KCamera::summary()
153 153
 	result = gp_camera_get_summary(m_camera, &summary, glob_context);
154 154
 	if (result != GP_OK)
155 155
 		return i18n("No camera summary information is available.\n");
156
-	return QString(summary.text);
156
+	return TQString(summary.text);
157 157
 }
158 158
 
159 159
 bool KCamera::configure()
@@ -207,27 +207,27 @@ void KCamera::save(KConfig *config)
207 207
 	config->writeEntry("Path", m_path);
208 208
 }
209 209
 
210
-QString KCamera::portName()
210
+TQString KCamera::portName()
211 211
 {
212
-	QString port = m_path.left(m_path.find(":")).lower();
212
+	TQString port = m_path.left(m_path.find(":")).lower();
213 213
 	if (port == "serial") return i18n("Serial");
214 214
 	if (port == "usb") return i18n("USB");
215 215
 	return i18n("Unknown port");
216 216
 }
217 217
 
218
-void KCamera::setName(const QString &name)
218
+void KCamera::setName(const TQString &name)
219 219
 {
220 220
 	m_name = name;
221 221
 }
222 222
 
223
-void KCamera::setModel(const QString &model)
223
+void KCamera::setModel(const TQString &model)
224 224
 {
225 225
 	m_model = model;
226 226
 	invalidateCamera();
227 227
 	initInformation();
228 228
 }
229 229
 
230
-void KCamera::setPath(const QString &path)
230
+void KCamera::setPath(const TQString &path)
231 231
 {
232 232
 	m_path = path;
233 233
 	invalidateCamera();
@@ -252,10 +252,10 @@ bool KCamera::isConfigurable()
252 252
 	return m_abilities.operations & GP_OPERATION_CONFIG;
253 253
 }
254 254
 
255
-QStringList KCamera::supportedPorts()
255
+TQStringList KCamera::supportedPorts()
256 256
 {
257 257
 	initInformation();
258
-	QStringList ports;
258
+	TQStringList ports;
259 259
 	if (m_abilities.port & GP_PORT_SERIAL)
260 260
 		ports.append("serial");
261 261
 	if (m_abilities.port & GP_PORT_USB)
@@ -270,70 +270,70 @@ CameraAbilities KCamera::abilities()
270 270
 
271 271
 // ---------- KameraSelectCamera ------------
272 272
 
273
-KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *device)
273
+KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *device)
274 274
 	: KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
275 275
 {
276 276
 	m_device = device;
277
-	connect(m_device, SIGNAL(error(const QString &)),
278
-		SLOT(slot_error(const QString &)));
279
-	connect(m_device, SIGNAL(error(const QString &, const QString &)),
280
-		SLOT(slot_error(const QString &, const QString &)));
277
+	connect(m_device, TQT_SIGNAL(error(const TQString &)),
278
+		TQT_SLOT(slot_error(const TQString &)));
279
+	connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)),
280
+		TQT_SLOT(slot_error(const TQString &, const TQString &)));
281 281
 
282
-	QWidget *page = new QWidget( this );
282
+	TQWidget *page = new TQWidget( this );
283 283
 	setMainWidget(page);
284 284
 
285 285
 	// a layout with vertical boxes
286
-	QHBoxLayout *topLayout = new QHBoxLayout(page, 0, KDialog::spacingHint());
286
+	TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
287 287
 
288 288
 	// the models list
289 289
 	m_modelSel = new KListView(page);
290 290
 	topLayout->addWidget( m_modelSel );
291 291
 	m_modelSel->addColumn(i18n("Supported Cameras"));
292
-	m_modelSel->setColumnWidthMode(0, QListView::Maximum);
293
-	connect(m_modelSel, SIGNAL(selectionChanged(QListViewItem *)),
294
-        SLOT(slot_setModel(QListViewItem *)));
292
+	m_modelSel->setColumnWidthMode(0, TQListView::Maximum);
293
+	connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
294
+        TQT_SLOT(slot_setModel(TQListViewItem *)));
295 295
 	// make sure listview only as wide as it needs to be
296
-	m_modelSel->setSizePolicy(QSizePolicy(QSizePolicy::Maximum,
297
-		QSizePolicy::Preferred));
296
+	m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
297
+		TQSizePolicy::Preferred));
298 298
 
299
-	QVBoxLayout *rightLayout = new QVBoxLayout(0L, 0, KDialog::spacingHint());
299
+	TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint());
300 300
 	topLayout->addLayout( rightLayout );
301 301
 
302
-	m_portSelectGroup = new QVButtonGroup(i18n("Port"), page);
302
+	m_portSelectGroup = new TQVButtonGroup(i18n("Port"), page);
303 303
 	rightLayout->addWidget(m_portSelectGroup);
304
-	m_portSettingsGroup = new QVGroupBox(i18n("Port Settings"), page);
304
+	m_portSettingsGroup = new TQVGroupBox(i18n("Port Settings"), page);
305 305
 	rightLayout->addWidget(m_portSettingsGroup);
306 306
 
307 307
 	// Create port type selection radiobuttons.
308
-	m_serialRB = new QRadioButton(i18n("Serial"), m_portSelectGroup);
308
+	m_serialRB = new TQRadioButton(i18n("Serial"), m_portSelectGroup);
309 309
 	m_portSelectGroup->insert(m_serialRB, INDEX_SERIAL);
310
-	QWhatsThis::add(m_serialRB, i18n("If this option is checked, the camera would have to be connected one of the serial ports (known as COM in Microsoft Windows) in your computer."));
311
-	m_USBRB = new QRadioButton(i18n("USB"), m_portSelectGroup);
310
+	TQWhatsThis::add(m_serialRB, i18n("If this option is checked, the camera would have to be connected one of the serial ports (known as COM in Microsoft Windows) in your computer."));
311
+	m_USBRB = new TQRadioButton(i18n("USB"), m_portSelectGroup);
312 312
 	m_portSelectGroup->insert(m_USBRB, INDEX_USB);
313
-	QWhatsThis::add(m_USBRB, i18n("If this option is checked, the camera would have to be connected to one of the USB slots in your computer or USB hub."));
313
+	TQWhatsThis::add(m_USBRB, i18n("If this option is checked, the camera would have to be connected to one of the USB slots in your computer or USB hub."));
314 314
 	// Create port settings widget stack
315
-	m_settingsStack = new QWidgetStack(m_portSettingsGroup);
316
-	connect(m_portSelectGroup, SIGNAL(clicked(int)),
317
-		m_settingsStack, SLOT(raiseWidget(int)));
315
+	m_settingsStack = new TQWidgetStack(m_portSettingsGroup);
316
+	connect(m_portSelectGroup, TQT_SIGNAL(clicked(int)),
317
+		m_settingsStack, TQT_SLOT(raiseWidget(int)));
318 318
 
319 319
 	// none tab
320
-	m_settingsStack->addWidget(new QLabel(i18n("No port type selected."),
320
+	m_settingsStack->addWidget(new TQLabel(i18n("No port type selected."),
321 321
 		m_settingsStack), INDEX_NONE);
322 322
 
323 323
 	// serial tab
324
-	QGrid *grid = new QGrid(2, m_settingsStack);
324
+	TQGrid *grid = new TQGrid(2, m_settingsStack);
325 325
 	grid->setSpacing(KDialog::spacingHint());
326
-	new QLabel(i18n("Port:"), grid);
327
-	m_serialPortCombo = new QComboBox(TRUE, grid);
328
-	QWhatsThis::add(m_serialPortCombo, i18n("Here you should choose the serial port you connect the camera to."));
326
+	new TQLabel(i18n("Port:"), grid);
327
+	m_serialPortCombo = new TQComboBox(TRUE, grid);
328
+	TQWhatsThis::add(m_serialPortCombo, i18n("Here you should choose the serial port you connect the camera to."));
329 329
 	m_settingsStack->addWidget(grid, INDEX_SERIAL);
330 330
 
331
-	grid = new QGrid(2, m_settingsStack);
331
+	grid = new TQGrid(2, m_settingsStack);
332 332
 	grid->setSpacing(KDialog::spacingHint());
333
-	new QLabel(i18n("Port"), grid);
333
+	new TQLabel(i18n("Port"), grid);
334 334
 
335 335
 	m_settingsStack->addWidget(new
336
-		QLabel(i18n("No further configuration is required for USB."),
336
+		TQLabel(i18n("No further configuration is required for USB."),
337 337
 		m_settingsStack), INDEX_USB);
338 338
 
339 339
 	// query gphoto2 for existing serial ports
@@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *dev
347 347
 	for (int i = 0; i < gphoto_ports; i++) {
348 348
 		if (gp_port_info_list_get_info(list, i, &info) >= 0) {
349 349
 			if (strncmp(info.path, "serial:", 7) == 0)
350
-				m_serialPortCombo->insertItem(QString::fromLatin1(info.path).mid(7));
350
+				m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
351 351
 		}
352 352
 	}
353 353
 	gp_port_info_list_free(list);
@@ -376,7 +376,7 @@ bool KameraDeviceSelectDialog::populateCameraListView()
376 376
 	} else {
377 377
 		for(int x = 0; x < numCams; ++x) {
378 378
 			if(gp_abilities_list_get_abilities(m_device->m_abilitylist, x, &a) == GP_OK) {
379
-				new QListViewItem(m_modelSel, a.model);
379
+				new TQListViewItem(m_modelSel, a.model);
380 380
 			}
381 381
 		}
382 382
 		return true;
@@ -388,7 +388,7 @@ void KameraDeviceSelectDialog::save()
388 388
 	m_device->setModel(m_modelSel->currentItem()->text(0));
389 389
 
390 390
 	if (m_portSelectGroup->selected()) {
391
-		QString type = m_portSelectGroup->selected()->text();
391
+		TQString type = m_portSelectGroup->selected()->text();
392 392
 
393 393
 		if(type == i18n("Serial"))
394 394
 			m_device->setPath("serial:" + m_serialPortCombo->currentText());
@@ -402,13 +402,13 @@ void KameraDeviceSelectDialog::save()
402 402
 
403 403
 void KameraDeviceSelectDialog::load()
404 404
 {
405
-	QString path = m_device->path();
406
-	QString port = path.left(path.find(":")).lower();
405
+	TQString path = m_device->path();
406
+	TQString port = path.left(path.find(":")).lower();
407 407
 
408 408
 	if (port == "serial") setPortType(INDEX_SERIAL);
409 409
 	if (port == "usb") setPortType(INDEX_USB);
410 410
 
411
-	QListViewItem *modelItem = m_modelSel->firstChild();
411
+	TQListViewItem *modelItem = m_modelSel->firstChild();
412 412
 	if( modelItem)
413 413
 	{
414 414
 	do {
@@ -420,13 +420,13 @@ void KameraDeviceSelectDialog::load()
420 420
 	}
421 421
 }
422 422
 
423
-void KameraDeviceSelectDialog::slot_setModel(QListViewItem *item)
423
+void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
424 424
 {
425 425
     enableButtonOK(true);
426 426
     m_portSelectGroup->setEnabled(true);
427 427
     m_portSettingsGroup->setEnabled(true);
428 428
 
429
-    QString model = item->text(0);
429
+    TQString model = item->text(0);
430 430
 
431 431
 	CameraAbilities abilities;
432 432
 	int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
@@ -441,7 +441,7 @@ void KameraDeviceSelectDialog::slot_setModel(QListViewItem *item)
441 441
 		m_USBRB->setEnabled(abilities.port & GP_PORT_USB);
442 442
 
443 443
 		// turn off any selected port
444
-		QButton *selected = m_portSelectGroup->selected();
444
+		TQButton *selected = m_portSelectGroup->selected();
445 445
 		if(selected != NULL)
446 446
 			selected->toggle();
447 447
 
@@ -465,12 +465,12 @@ void KameraDeviceSelectDialog::setPortType(int type)
465 465
 	m_settingsStack->raiseWidget(type);
466 466
 }
467 467
 
468
-void KameraDeviceSelectDialog::slot_error(const QString &message)
468
+void KameraDeviceSelectDialog::slot_error(const TQString &message)
469 469
 {
470 470
 	KMessageBox::error(this, message);
471 471
 }
472 472
 
473
-void KameraDeviceSelectDialog::slot_error(const QString &message, const QString &details)
473
+void KameraDeviceSelectDialog::slot_error(const TQString &message, const TQString &details)
474 474
 {
475 475
 	KMessageBox::detailedError(this, message, details);
476 476
 }

+ 36
- 36
kamera/kcontrol/kameradevice.h View File

@@ -23,52 +23,52 @@
23 23
 #ifndef __kameradevice_h__
24 24
 #define __kameradevice_h__
25 25
 
26
-#include <qmap.h>
26
+#include <tqmap.h>
27 27
 #include <kdialogbase.h>
28 28
 #include <config.h>
29 29
 
30 30
 class KConfig;
31
-class QString;
31
+class TQString;
32 32
 class KListView;
33
-class QWidgetStack;
34
-class QVButtonGroup;
35
-class QVGroupBox;
36
-class QComboBox;
37
-class QLineEdit;
38
-class QRadioButton;
39
-
40
-class KCamera : public QObject {
33
+class TQWidgetStack;
34
+class TQVButtonGroup;
35
+class TQVGroupBox;
36
+class TQComboBox;
37
+class TQLineEdit;
38
+class TQRadioButton;
39
+
40
+class KCamera : public TQObject {
41 41
 	friend class KameraDeviceSelectDialog;
42 42
 	Q_OBJECT
43 43
 public:
44
-	KCamera(const QString &name, const QString &path);
44
+	KCamera(const TQString &name, const TQString &path);
45 45
 	~KCamera();
46 46
 	void invalidateCamera();
47 47
 	bool configure();
48 48
 	void load(KConfig *m_config);
49 49
 	void save(KConfig *m_config);
50 50
 	bool test();
51
-	QStringList supportedPorts();
51
+	TQStringList supportedPorts();
52 52
 
53 53
 	Camera* camera();
54
-	QString name() const { return m_name ; }
55
-	QString model() const { return m_model; }
56
-	QString path() const { return m_path; }
57
-	QString portName();
54
+	TQString name() const { return m_name ; }
55
+	TQString model() const { return m_model; }
56
+	TQString path() const { return m_path; }
57
+	TQString portName();
58 58
 
59
-	QString summary();
59
+	TQString summary();
60 60
 	CameraAbilities abilities();
61 61
 
62
-	void setName(const QString &name);
63
-	void setModel(const QString &model);
64
-	void setPath(const QString &path);
62
+	void setName(const TQString &name);
63
+	void setModel(const TQString &model);
64
+	void setPath(const TQString &path);
65 65
 
66 66
 	bool isTestable() const;
67 67
 	bool isConfigurable();
68 68
 
69 69
 signals:
70
-	void error(const QString &message);
71
-	void error(const QString &message, const QString &details);
70
+	void error(const TQString &message);
71
+	void error(const TQString &message, const TQString &details);
72 72
 	
73 73
 protected:
74 74
 	bool initInformation();
@@ -78,9 +78,9 @@ protected:
78 78
 
79 79
 	Camera *m_camera;
80 80
 //	KConfig *m_config;
81
-	QString m_name; // the camera's real name
82
-	QString m_model;
83
-	QString m_path;
81
+	TQString m_name; // the camera's real name
82
+	TQString m_model;
83
+	TQString m_path;
84 84
 	CameraAbilities m_abilities;
85 85
 	CameraAbilitiesList *m_abilitylist;
86 86
 };
@@ -89,13 +89,13 @@ class KameraDeviceSelectDialog : public KDialogBase
89 89
 {
90 90
 	Q_OBJECT
91 91
 public:
92
-	KameraDeviceSelectDialog(QWidget *parent, KCamera *device);
92
+	KameraDeviceSelectDialog(TQWidget *parent, KCamera *device);
93 93
 	void save();
94 94
 	void load();
95 95
 protected slots:
96
-	void slot_setModel(QListViewItem *item);
97
-	void slot_error(const QString &message);
98
-	void slot_error(const QString &message, const QString &details);
96
+	void slot_setModel(TQListViewItem *item);
97
+	void slot_error(const TQString &message);
98
+	void slot_error(const TQString &message, const TQString &details);
99 99
 protected:
100 100
 	KCamera *m_device;
101 101
 	
@@ -104,14 +104,14 @@ protected:
104 104
 
105 105
 	// port settings widgets
106 106
 	KListView *m_modelSel;
107
-	QLineEdit *m_nameEdit;
108
-	QWidgetStack *m_settingsStack;
109
-	QVButtonGroup *m_portSelectGroup;
110
-	QVGroupBox *m_portSettingsGroup;
111
-	QComboBox *m_serialPortCombo;
107
+	TQLineEdit *m_nameEdit;
108
+	TQWidgetStack *m_settingsStack;
109
+	TQVButtonGroup *m_portSelectGroup;
110
+	TQVGroupBox *m_portSettingsGroup;
111
+	TQComboBox *m_serialPortCombo;
112 112
 	// port selection radio buttons
113
-	QRadioButton *m_serialRB;
114
-	QRadioButton *m_USBRB;
113
+	TQRadioButton *m_serialRB;
114
+	TQRadioButton *m_USBRB;
115 115
 };
116 116
 
117 117
 #endif

+ 28
- 28
kamera/kioslave/kamera.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <signal.h>
30 30
 #include <errno.h>
31 31
 
32
-#include <qfile.h>
33
-#include <qtextstream.h>
32
+#include <tqfile.h>
33
+#include <tqtextstream.h>
34 34
 
35 35
 #include <kdebug.h>
36 36
 #include <kinstance.h>
@@ -79,7 +79,7 @@ int kdemain(int argc, char **argv)
79 79
 	return 0;
80 80
 }
81 81
 
82
-KameraProtocol::KameraProtocol(const QCString &pool, const QCString &app)
82
+KameraProtocol::KameraProtocol(const TQCString &pool, const TQCString &app)
83 83
 : SlaveBase("camera", pool, app),
84 84
 m_camera(NULL)
85 85
 {
@@ -104,7 +104,7 @@ m_camera(NULL)
104 104
 //
105 105
 // The existance of a lockfile is used to signify "please give up camera".
106 106
 //
107
-void KameraProtocol::special(const QByteArray&) {
107
+void KameraProtocol::special(const TQByteArray&) {
108 108
 	kdDebug(7123) << "KameraProtocol::special() at " << getpid() << endl;
109 109
 
110 110
 	if (!actiondone && cameraopen) {
@@ -136,7 +136,7 @@ KameraProtocol::~KameraProtocol()
136 136
 }
137 137
 
138 138
 // initializes the camera for usage - should be done before operations over the wire
139
-bool KameraProtocol::openCamera(QString &str) {
139
+bool KameraProtocol::openCamera(TQString &str) {
140 140
 	idletime = 0;
141 141
 	actiondone = true;
142 142
 	if (!m_camera) {
@@ -188,8 +188,8 @@ void KameraProtocol::closeCamera(void)
188 188
 	return;
189 189
 }
190 190
 
191
-static QString fix_foldername(QString ofolder) {
192
-	QString folder = ofolder;
191
+static TQString fix_foldername(TQString ofolder) {
192
+	TQString folder = ofolder;
193 193
 	if (folder.length() > 1) {
194 194
 		while ((folder.length()>1) && (folder.right(1) == "/"))
195 195
 			folder = folder.left(folder.length()-1);
@@ -227,7 +227,7 @@ void KameraProtocol::get(const KURL &url)
227 227
 			error(KIO::ERR_DOES_NOT_EXIST, url.path());	\
228 228
 			return;						\
229 229
 		}							\
230
-		QByteArray chunkDataBuffer;				\
230
+		TQByteArray chunkDataBuffer;				\
231 231
 		chunkDataBuffer.setRawData(xx.text, strlen(xx.text));	\
232 232
 		data(chunkDataBuffer);					\
233 233
 		processedSize(strlen(xx.text));				\
@@ -329,7 +329,7 @@ void KameraProtocol::get(const KURL &url)
329 329
 	// already.
330 330
 	if ((fileSize > 0)  && (fileSize - m_fileSize)>0) {
331 331
 		unsigned long written = 0;
332
-		QByteArray chunkDataBuffer;
332
+		TQByteArray chunkDataBuffer;
333 333
 
334 334
 		// We need to split it up here. Someone considered it funny
335 335
 		// to discard any data() larger than 16MB.
@@ -518,9 +518,9 @@ void KameraProtocol::listDir(const KURL &url)
518 518
 	if (url.host().isEmpty()) {
519 519
 		KURL xurl;
520 520
 		// List the available cameras
521
-		QStringList groupList = m_config->groupList();
521
+		TQStringList groupList = m_config->groupList();
522 522
 		kdDebug(7123) << "Found cameras: " << groupList.join(", ") << endl;
523
-		QStringList::Iterator it;
523
+		TQStringList::Iterator it;
524 524
 		UDSEntry entry;
525 525
 		UDSAtom atom;
526 526
 
@@ -531,8 +531,8 @@ void KameraProtocol::listDir(const KURL &url)
531 531
 		 * - List all saved and possible offline cameras.
532 532
 		 * - List all autodetected and not yet printed cameras.
533 533
 		 */
534
-		QMap<QString,QString>	ports, names;
535
-		QMap<QString,int>	modelcnt;
534
+		TQMap<TQString,TQString>	ports, names;
535
+		TQMap<TQString,int>	modelcnt;
536 536
 
537 537
 		/* Autodetect USB cameras ... */
538 538
 		GPContext *glob_context = NULL;
@@ -578,7 +578,7 @@ void KameraProtocol::listDir(const KURL &url)
578 578
 			ports.remove("usb:");
579 579
 
580 580
 		for (it = groupList.begin(); it != groupList.end(); it++) {
581
-			QString m_cfgPath;
581
+			TQString m_cfgPath;
582 582
 			if (*it == "<default>")
583 583
 				continue;
584 584
 
@@ -619,7 +619,7 @@ void KameraProtocol::listDir(const KURL &url)
619 619
 			listEntry(entry, false);
620 620
 		}
621 621
 	
622
-		QMap<QString,QString>::iterator portsit;
622
+		TQMap<TQString,TQString>::iterator portsit;
623 623
 
624 624
 		for (portsit = ports.begin(); portsit != ports.end(); portsit++) {
625 625
 			entry.clear();
@@ -699,7 +699,7 @@ void KameraProtocol::listDir(const KURL &url)
699 699
 
700 700
 	for(int i = 0; i < gp_list_count(dirList); ++i) {
701 701
 		gp_list_get_name(dirList, i, &name);
702
-		translateDirectoryToUDS(entry, QString::fromLocal8Bit(name));
702
+		translateDirectoryToUDS(entry, TQString::fromLocal8Bit(name));
703 703
 		listEntry(entry, false);
704 704
 	}
705 705
 
@@ -709,7 +709,7 @@ void KameraProtocol::listDir(const KURL &url)
709 709
 		gp_list_get_name(fileList, i, &name);
710 710
 		// we want to know more info about files (size, type...)
711 711
 		gp_camera_file_get_info(m_camera, tocstr(url.path()), name, &info, m_context);
712
-		translateFileToUDS(entry, info, QString::fromLocal8Bit(name));
712
+		translateFileToUDS(entry, info, TQString::fromLocal8Bit(name));
713 713
 		listEntry(entry, false);
714 714
 	}
715 715
 	if (!url.path().compare("/")) {
@@ -737,7 +737,7 @@ void KameraProtocol::listDir(const KURL &url)
737 737
 	finished();
738 738
 }
739 739
 
740
-void KameraProtocol::setHost(const QString& host, int port, const QString& user, const QString& pass )
740
+void KameraProtocol::setHost(const TQString& host, int port, const TQString& user, const TQString& pass )
741 741
 {
742 742
 	kdDebug(7123) << "KameraProtocol::setHost(" << host << ", " << port << ", " << user << ", " << pass << ")" << endl;
743 743
 	int gpr, idx;
@@ -805,7 +805,7 @@ void KameraProtocol::setHost(const QString& host, int port, const QString& user,
805 805
 		gp_camera_set_port_speed(m_camera, 0); // TODO: the value needs to be configurable
806 806
 		kdDebug(7123) << "Opening camera model " << user << " at " << host << endl;
807 807
 
808
-		QString errstr;
808
+		TQString errstr;
809 809
 		if (!openCamera(errstr)) {
810 810
 			kdDebug(7123) << "Unable to init camera: " << gp_result_as_string(gpr) << endl;
811 811
 			error(KIO::ERR_SERVICE_NOT_AVAILABLE, errstr);
@@ -821,7 +821,7 @@ void KameraProtocol::reparseConfiguration(void)
821 821
 }
822 822
 
823 823
 // translate a simple text to a UDS entry
824
-void KameraProtocol::translateTextToUDS(UDSEntry &udsEntry, const QString &fn,
824
+void KameraProtocol::translateTextToUDS(UDSEntry &udsEntry, const TQString &fn,
825 825
 	const char *text
826 826
 ) {
827 827
 	UDSAtom atom;
@@ -846,7 +846,7 @@ void KameraProtocol::translateTextToUDS(UDSEntry &udsEntry, const QString &fn,
846 846
 }
847 847
 
848 848
 // translate a CameraFileInfo to a UDSEntry which we can return as a directory listing entry
849
-void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo &info, QString name)
849
+void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo &info, TQString name)
850 850
 {
851 851
 	UDSAtom atom;
852 852
 
@@ -858,7 +858,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
858 858
 
859 859
 	atom.m_uds = UDS_NAME;
860 860
 	if (info.file.fields & GP_FILE_INFO_NAME)
861
-		atom.m_str = QString::fromLocal8Bit(info.file.name);
861
+		atom.m_str = TQString::fromLocal8Bit(info.file.name);
862 862
 	else
863 863
 		atom.m_str = name;
864 864
 	udsEntry.append(atom);
@@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
881 881
 
882 882
 	if (info.file.fields & GP_FILE_INFO_TYPE) {
883 883
 		atom.m_uds = UDS_MIME_TYPE;
884
-		atom.m_str = QString::fromLatin1(info.file.type);
884
+		atom.m_str = TQString::fromLatin1(info.file.type);
885 885
 		udsEntry.append(atom);
886 886
 	}
887 887
 
@@ -903,7 +903,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
903 903
 }
904 904
 
905 905
 // translate a directory name to a UDSEntry which we can return as a directory listing entry
906
-void KameraProtocol::translateDirectoryToUDS(UDSEntry &udsEntry, const QString &dirname)
906
+void KameraProtocol::translateDirectoryToUDS(UDSEntry &udsEntry, const TQString &dirname)
907 907
 {
908 908
 	UDSAtom atom;
909 909
 
@@ -942,7 +942,7 @@ bool KameraProtocol::cameraSupportsPreview(void)
942 942
 	return (m_abilities.file_operations & GP_FILE_OPERATION_PREVIEW);
943 943
 }
944 944
 
945
-int KameraProtocol::readCameraFolder(const QString &folder, CameraList *dirList, CameraList *fileList)
945
+int KameraProtocol::readCameraFolder(const TQString &folder, CameraList *dirList, CameraList *fileList)
946 946
 {
947 947
 	kdDebug(7123) << "KameraProtocol::readCameraFolder(" << folder << ")" << endl;
948 948
 
@@ -975,7 +975,7 @@ void frontendProgressUpdate(
975 975
 	if (fileSize > 0) {
976 976
 		// XXX using assign() here causes segfault, prolly because
977 977
 		// gp_file_free is called before chunkData goes out of scope
978
-		QByteArray chunkDataBuffer;
978
+		TQByteArray chunkDataBuffer;
979 979
 		chunkDataBuffer.setRawData(fileData + object->getFileSize(), fileSize - object->getFileSize());
980 980
 		// Note: this will fail with sizes > 16MB ... 
981 981
 		object->data(chunkDataBuffer);
@@ -1021,7 +1021,7 @@ unsigned int frontendProgressStart(
1021 1021
 	vsnprintf(status, 300, format, args);
1022 1022
 #endif
1023 1023
 
1024
-	object->infoMessage(QString::fromLocal8Bit(status));
1024
+	object->infoMessage(TQString::fromLocal8Bit(status));
1025 1025
 	delete [] status;
1026 1026
 	object->totalSize((int)totalsize); // hack: call slot directly
1027 1027
 	return GP_OK;
@@ -1061,6 +1061,6 @@ static void frontendCameraStatus(GPContext * /*context*/, const char *format, va
1061 1061
 	status=new char[300];
1062 1062
 	vsnprintf(status, 300, format, args);
1063 1063
 #endif
1064
-	object->infoMessage(QString::fromLocal8Bit(status));
1064
+	object->infoMessage(TQString::fromLocal8Bit(status));
1065 1065
 	delete [] status;
1066 1066
 }

+ 10
- 10
kamera/kioslave/kamera.h View File

@@ -32,15 +32,15 @@ class KSimpleConfig;
32 32
 class KameraProtocol : public KIO::SlaveBase
33 33
 {
34 34
 public:
35
-	KameraProtocol(const QCString &pool, const QCString &app);
35
+	KameraProtocol(const TQCString &pool, const TQCString &app);
36 36
 	virtual ~KameraProtocol();
37 37
 
38 38
 	virtual void get(const KURL &url);
39 39
 	virtual void stat(const KURL &url);
40 40
 	virtual void del(const KURL &url, bool isFile);
41
-	virtual void setHost(const QString& host, int port, const QString& user, const QString& pass );
41
+	virtual void setHost(const TQString& host, int port, const TQString& user, const TQString& pass );
42 42
 	virtual void listDir(const KURL &url);
43
-	virtual void special(const QByteArray &data);
43
+	virtual void special(const TQByteArray &data);
44 44
 
45 45
 	CameraFile *getFile() { return m_file; }
46 46
 	int getFileSize() { return m_fileSize; }
@@ -54,24 +54,24 @@ private:
54 54
 	GPContext	*m_context;
55 55
 
56 56
 	void reparseConfiguration(void);
57
-	bool openCamera(QString& str);
57
+	bool openCamera(TQString& str);
58 58
 	bool openCamera(void ) {
59
-		QString errstr;
59
+		TQString errstr;
60 60
 		return openCamera(errstr);
61 61
 	}
62 62
 	void closeCamera(void);
63 63
 
64 64
 	void statRoot(void);
65 65
 	void statRegular(const KURL &url);
66
-	void translateTextToUDS(KIO::UDSEntry &udsEntry, const QString &info, const char *txt);
67
-	void translateFileToUDS(KIO::UDSEntry &udsEntry, const CameraFileInfo &info, QString name);
68
-	void translateDirectoryToUDS(KIO::UDSEntry &udsEntry, const QString &dirname);
66
+	void translateTextToUDS(KIO::UDSEntry &udsEntry, const TQString &info, const char *txt);
67
+	void translateFileToUDS(KIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name);
68
+	void translateDirectoryToUDS(KIO::UDSEntry &udsEntry, const TQString &dirname);
69 69
 	bool cameraSupportsPreview(void);
70 70
 	bool cameraSupportsDel(void);
71 71
 	bool cameraSupportsPut(void);
72
-	int readCameraFolder(const QString &folder, CameraList *dirList, CameraList *fileList);
72
+	int readCameraFolder(const TQString &folder, CameraList *dirList, CameraList *fileList);
73 73
 
74
-	QString m_lockfile;
74
+	TQString m_lockfile;
75 75
 	int	idletime;
76 76
 
77 77
 	int m_fileSize;

+ 3
- 3
kcoloredit/color.cpp View File

@@ -21,7 +21,7 @@ Color::Color(){
21 21
 	setComponents(0, 0, 0);
22 22
 	setName("");
23 23
 }
24
-Color::Color(const int red, const int green, const int blue, const QString& name) {
24
+Color::Color(const int red, const int green, const int blue, const TQString& name) {
25 25
 	setComponents(red, green, blue);
26 26
 	setName(name);
27 27
 }
@@ -38,7 +38,7 @@ void Color::setComponents(const int red, const int green, const int blue) {
38 38
 	setComponent(BLUE_INDEX, blue);
39 39
 }
40 40
 
41
-void Color::setName(const QString& name) {
41
+void Color::setName(const TQString& name) {
42 42
 	m_name = name;
43 43
 }
44 44
 
@@ -50,7 +50,7 @@ const int* Color::components() const{
50 50
 	return m_components;
51 51
 }
52 52
 
53
-const QString& Color::name() const {
53
+const TQString& Color::name() const {
54 54
 	return m_name;
55 55
 }
56 56
 

+ 4
- 4
kcoloredit/color.h View File

@@ -39,7 +39,7 @@ class Color {
39 39
 		Color();
40 40
 		/** constructs a color with given components and a name
41 41
 		 */
42
-		Color(const int red, const int green, const int blue, const QString& name);
42
+		Color(const int red, const int green, const int blue, const TQString& name);
43 43
 		~Color();
44 44
 		/** sets a component
45 45
 		 */
@@ -49,7 +49,7 @@ class Color {
49 49
 		void setComponents(const int red, const int green, const int blue);
50 50
 		/** sets a name
51 51
 		 */
52
-		void setName(const QString& name);
52
+		void setName(const TQString& name);
53 53
 		/** @return a component
54 54
 		 */
55 55
 		int component(const int index) const;
@@ -58,7 +58,7 @@ class Color {
58 58
 		const int* components() const;
59 59
 		/** @return a color name
60 60
 		 */
61
-		const QString& name() const;
61
+		const TQString& name() const;
62 62
 		/** @return if is equal to color
63 63
 		 */
64 64
 		bool equals(const Color& color);
@@ -75,7 +75,7 @@ class Color {
75 75
 		int m_components[COMPONENTS_NUM];
76 76
 		/** a color name
77 77
 		 */
78
-		QString m_name;
78
+		TQString m_name;
79 79
 };
80 80
 
81 81
 #endif

+ 35
- 35
kcoloredit/colorselector.cpp View File

@@ -17,11 +17,11 @@
17 17
 
18 18
 #include <math.h>
19 19
 
20
-#include <qlayout.h>
21
-/* #include <qtabwidget.h> */
22
-#include <qradiobutton.h>
23
-#include <qlabel.h>
24
-#include <qslider.h>
20
+#include <tqlayout.h>
21
+/* #include <tqtabwidget.h> */
22
+#include <tqradiobutton.h>
23
+#include <tqlabel.h>
24
+#include <tqslider.h>
25 25
 #include <kseparator.h>
26 26
 #include <klocale.h>
27 27
 
@@ -30,59 +30,59 @@
30 30
 #include "texteditselection.h"
31 31
 #include "colorselector.h"
32 32
 
33
-ColorSelector::ColorSelector(QWidget *parent, const char *name ) : QWidget(parent, name) {
33
+ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(parent, name) {
34 34
 	fComponentsMode = false;
35
-	QVBoxLayout* topLayout = new QVBoxLayout(this, 4);
35
+	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
36 36
 	/*
37
-	QTabWidget* pages = new QTabWidget(this);
37
+	TQTabWidget* pages = new TQTabWidget(this);
38 38
 	 */
39 39
 	gradientSelection = new GradientSelection(this);
40
-	connect(gradientSelection, SIGNAL( valueChanged(Color*) ),
41
-		SLOT( slotGradientSelectionChangeColor(Color*) ));
42
-	connect(gradientSelection, SIGNAL( synchronizeColor() ),
43
-		SLOT( slotGradientSelectionSynchronizeColor() ));
44
-	connect(this, SIGNAL( valueChanged(Color*) ), gradientSelection, SLOT( slotSetValue(Color*) ));
40
+	connect(gradientSelection, TQT_SIGNAL( valueChanged(Color*) ),
41
+		TQT_SLOT( slotGradientSelectionChangeColor(Color*) ));
42
+	connect(gradientSelection, TQT_SIGNAL( synchronizeColor() ),
43
+		TQT_SLOT( slotGradientSelectionSynchronizeColor() ));
44
+	connect(this, TQT_SIGNAL( valueChanged(Color*) ), gradientSelection, TQT_SLOT( slotSetValue(Color*) ));
45 45
 	/*
46 46
 	pages->addTab(gradientSelection, i18n( "Gradient" ));
47 47
 	ImageSelection* imageSelection = new ImageSelection(this);
48
-	connect(imageSelection, SIGNAL( valueChanged(Color*) ), SLOT( slotSetColor(Color*) ));
49
-	connect(this, SIGNAL( valueChanged(Color*) ), imageSelection, SLOT( slotSetValue(Color*) ));
48
+	connect(imageSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) ));
49
+	connect(this, TQT_SIGNAL( valueChanged(Color*) ), imageSelection, TQT_SLOT( slotSetValue(Color*) ));
50 50
 	pages->addTab(imageSelection, i18n( "Image" ));
51 51
 	topLayout->addWidget(pages, 10);
52 52
 	 */
53 53
 	topLayout->addWidget(gradientSelection, 10);
54 54
 	KSeparator* hLine = new KSeparator(KSeparator::HLine, this);
55 55
 	topLayout->addWidget(hLine);
56
-	QHBoxLayout* layout = new QHBoxLayout();
56
+	TQHBoxLayout* layout = new TQHBoxLayout();
57 57
 	TextEditSelection* textEditSelection = new TextEditSelection(this);
58
-	connect(textEditSelection, SIGNAL( valueChanged(Color*) ), SLOT( slotSetColor(Color*) ));
59
-	connect(this, SIGNAL( valueChanged(Color*) ), textEditSelection, SLOT( slotSetValue(Color*) ));
60
-	QVBoxLayout* colorChangeLayout = new QVBoxLayout();
58
+	connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) ));
59
+	connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) ));
60
+	TQVBoxLayout* colorChangeLayout = new TQVBoxLayout();
61 61
 	colorChangeLayout->setMargin(2);
62
-	QRadioButton* replaceButton = new QRadioButton(i18n( "Replace" ), this);
63
-	connect(replaceButton, SIGNAL( clicked() ), SLOT( slotColorReplace() ));
62
+	TQRadioButton* replaceButton = new TQRadioButton(i18n( "Replace" ), this);
63
+	connect(replaceButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotColorReplace() ));
64 64
 	replaceButton->setChecked(true);
65 65
 	colorChangeButtons.insert(replaceButton);
66 66
 	colorChangeLayout->addWidget(replaceButton);
67
-	QRadioButton* changeButton = new QRadioButton(i18n( "Change" ) + ":", this);
68
-	connect(changeButton, SIGNAL( clicked() ), SLOT( slotColorChange() ));
67
+	TQRadioButton* changeButton = new TQRadioButton(i18n( "Change" ) + ":", this);
68
+	connect(changeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotColorChange() ));
69 69
 	colorChangeButtons.insert(changeButton);
70 70
 	colorChangeLayout->addWidget(changeButton);
71 71
 	colorChangeValue = 0;
72
-	colorChangeSliderWidget = new QWidget(this);
73
-	QVBoxLayout* colorChangeSliderLayout = new QVBoxLayout(colorChangeSliderWidget, 1);
72
+	colorChangeSliderWidget = new TQWidget(this);
73
+	TQVBoxLayout* colorChangeSliderLayout = new TQVBoxLayout(colorChangeSliderWidget, 1);
74 74
 	colorChangeSliderLayout->setMargin(0);
75
-	QSlider* colorChangeSlider = new QSlider(0, MAX_COLOR_CHANGE_VALUE,
76
-		MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, QSlider::Horizontal, colorChangeSliderWidget);
75
+	TQSlider* colorChangeSlider = new TQSlider(0, MAX_COLOR_CHANGE_VALUE,
76
+		MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, TQSlider::Horizontal, colorChangeSliderWidget);
77 77
 	colorChangeSlider->setTickInterval(colorChangeSlider->pageStep());
78
-	colorChangeSlider->setTickmarks(QSlider::Above);
79
-	connect(colorChangeSlider, SIGNAL( valueChanged(int) ), SLOT( slotColorChangeValueChanged(int) ));
78
+	colorChangeSlider->setTickmarks(TQSlider::Above);
79
+	connect(colorChangeSlider, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotColorChangeValueChanged(int) ));
80 80
 	colorChangeSliderLayout->addWidget(colorChangeSlider);
81
-	QHBoxLayout* colorChangeSliderLabelsLayout = new QHBoxLayout(0);
82
-	QLabel* subtractLabel = new QLabel(i18n( "0" ), colorChangeSliderWidget);
81
+	TQHBoxLayout* colorChangeSliderLabelsLayout = new TQHBoxLayout(0);
82
+	TQLabel* subtractLabel = new TQLabel(i18n( "0" ), colorChangeSliderWidget);
83 83
 	colorChangeSliderLabelsLayout->addWidget(subtractLabel);
84 84
 	colorChangeSliderLabelsLayout->addStretch(10);
85
-	QLabel* addLabel = new QLabel(" " + i18n( "Replace" ), colorChangeSliderWidget);
85
+	TQLabel* addLabel = new TQLabel(" " + i18n( "Replace" ), colorChangeSliderWidget);
86 86
 	colorChangeSliderLabelsLayout->addWidget(addLabel);
87 87
 	colorChangeSliderLayout->addLayout(colorChangeSliderLabelsLayout);
88 88
 	colorChangeLayout->addStretch(10);
@@ -95,7 +95,7 @@ ColorSelector::ColorSelector(QWidget *parent, const char *name ) : QWidget(paren
95 95
 	layout->addWidget(vLine);
96 96
 	layout->addWidget(textEditSelection, 1);
97 97
 	colorPatch = new KColorPatch(this);
98
-	connect(colorPatch, SIGNAL( colorChanged(const QColor&) ), SLOT( slotSetColor(const QColor&) ));
98
+	connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
99 99
 	colorPatch->setMinimumSize(80, 64);
100 100
 	layout->addWidget(colorPatch, 10);
101 101
 	topLayout->addLayout(layout);
@@ -105,7 +105,7 @@ ColorSelector::~ColorSelector() {
105 105
 
106 106
 void ColorSelector::slotSetColor(Color color) {
107 107
 	m_color = color;
108
-	colorPatch->setColor(QColor( m_color.component(Color::RED_INDEX),
108
+	colorPatch->setColor(TQColor( m_color.component(Color::RED_INDEX),
109 109
 		m_color.component(Color::GREEN_INDEX),
110 110
 		m_color.component(Color::BLUE_INDEX) ));
111 111
 	fComponentsMode = false;
@@ -116,7 +116,7 @@ void ColorSelector::slotSetColor(Color* color) {
116 116
 	slotSetColor(*color);
117 117
 }
118 118
 
119
-void ColorSelector::slotSetColor(const QColor& color) {
119
+void ColorSelector::slotSetColor(const TQColor& color) {
120 120
 	m_color.setComponent(Color::RED_INDEX, color.red());
121 121
 	m_color.setComponent(Color::GREEN_INDEX, color.green());
122 122
 	m_color.setComponent(Color::BLUE_INDEX, color.blue());

+ 8
- 8
kcoloredit/colorselector.h View File

@@ -18,9 +18,9 @@
18 18
 #ifndef COLORSELECTOR_H
19 19
 #define COLORSELECTOR_H
20 20
 
21
-#include <qwidget.h>
22
-#include <qcolor.h>
23
-#include <qbuttongroup.h>
21
+#include <tqwidget.h>
22
+#include <tqcolor.h>
23
+#include <tqbuttongroup.h>
24 24
 #include <kcolordialog.h>
25 25
 
26 26
 #include "color.h"
@@ -29,12 +29,12 @@
29 29
 /** Color selector widget
30 30
  *  @author Artur Rataj
31 31
  */
32
-class ColorSelector : public QWidget  {
32
+class ColorSelector : public TQWidget  {
33 33
 	Q_OBJECT
34 34
 
35 35
 public:
36 36
 	/** constructs a color selector widget */
37
-	ColorSelector(QWidget *parent=0, const char *name=0);
37
+	ColorSelector(TQWidget *parent=0, const char *name=0);
38 38
 	~ColorSelector();
39 39
 	/** @return the selected color */
40 40
 	const Color& color();
@@ -49,7 +49,7 @@ public slots:
49 49
 	/** Called if a color changed */
50 50
 	void slotSetColor(Color* color);
51 51
 	/** called if a color changed in the color patch */
52
-	void slotSetColor(const QColor& color);
52
+	void slotSetColor(const TQColor& color);
53 53
 	/** Called by the gradient selection, to replace or modify a color */
54 54
 	void slotGradientSelectionChangeColor(Color* gradientSelectionColor);
55 55
 	/** Called by the gradient selection, to synchronize its color */
@@ -69,9 +69,9 @@ private:
69 69
 	       MAX_COLOR_CHANGE_VALUE = 16 };
70 70
 	
71 71
 	/** A color change slider widget */
72
-	QWidget* colorChangeSliderWidget;
72
+	TQWidget* colorChangeSliderWidget;
73 73
 	/** Color change buttons button group widget */
74
-	QButtonGroup colorChangeButtons;
74
+	TQButtonGroup colorChangeButtons;
75 75
 	/** A color patch widget */
76 76
 	KColorPatch* colorPatch;
77 77
 	/** A gradient selection widget */

+ 26
- 26
kcoloredit/gradientselection.cpp View File

@@ -15,39 +15,39 @@
15 15
  *                                                                         *
16 16
  ***************************************************************************/
17 17
 
18
-#include <qlayout.h>
19
-#include <qframe.h>
20
-#include <qradiobutton.h>
21
-#include <qcolor.h>
18
+#include <tqlayout.h>
19
+#include <tqframe.h>
20
+#include <tqradiobutton.h>
21
+#include <tqcolor.h>
22 22
 #include <klocale.h>
23 23
 
24 24
 #include "main.h"
25 25
 #include "gradientselection.h"
26 26
 
27
-GradientSelection::GradientSelection(QWidget *parent, const char *name ) : QWidget(parent,name) {
28
-	QGridLayout* topLayout = new QGridLayout(this, 2, 2, 0);
29
-	QHBoxLayout* layout = new QHBoxLayout(0);
27
+GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
28
+	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
29
+	TQHBoxLayout* layout = new TQHBoxLayout(0);
30 30
 	layout->setMargin(3);
31 31
 	xyColorSelector = new KXYColorSelector(this);
32
-	connect(xyColorSelector, SIGNAL( valueChanged(int, int) ),
33
-		SLOT( slotXyColorSelectorPosChanged(int, int) ));
32
+	connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ),
33
+		TQT_SLOT( slotXyColorSelectorPosChanged(int, int) ));
34 34
 	layout->addWidget(xyColorSelector);
35 35
 	topLayout->addLayout(layout, 0, 0);
36 36
 	topLayout->setRowStretch(0, 10);
37 37
 	topLayout->setRowStretch(1, 0);
38
-	QVBoxLayout* xyColorSelectorLayout = new QVBoxLayout();
39
-	QHBoxLayout* checkBoxLayout = new QHBoxLayout();
38
+	TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout();
39
+	TQHBoxLayout* checkBoxLayout = new TQHBoxLayout();
40 40
 	checkBoxLayout->setMargin(0);
41
-	variableCheckBox = new QCheckBox(i18n( "Variable" ), this);
41
+	variableCheckBox = new TQCheckBox(i18n( "Variable" ), this);
42 42
 	variableGlobalComponent = false;
43
-	connect(variableCheckBox, SIGNAL( toggled(bool) ), SLOT( slotSetVariableGlobalComponent(bool) ));
43
+	connect(variableCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotSetVariableGlobalComponent(bool) ));
44 44
 	checkBoxLayout->addSpacing(2);
45 45
 	checkBoxLayout->addWidget(variableCheckBox);
46 46
 	xyColorSelectorLayout->addLayout(checkBoxLayout);
47 47
 	xyColorSelectorLayout->addStretch(10);
48
-	QHBoxLayout* buttonsLayout = new QHBoxLayout();
49
-	synchronizeColorButton = new QPushButton(i18n( "Synchronize" ), this);
50
-	connect(synchronizeColorButton, SIGNAL( clicked() ), SLOT( slotSynchronizeColor() ));
48
+	TQHBoxLayout* buttonsLayout = new TQHBoxLayout();
49
+	synchronizeColorButton = new TQPushButton(i18n( "Synchronize" ), this);
50
+	connect(synchronizeColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSynchronizeColor() ));
51 51
 	buttonsLayout->addSpacing(2);
52 52
 	buttonsLayout->addWidget(synchronizeColorButton);
53 53
 	buttonsLayout->addStretch(10);
@@ -55,19 +55,19 @@ GradientSelection::GradientSelection(QWidget *parent, const char *name ) : QWidg
55 55
 	xyColorSelectorLayout->addSpacing(2);
56 56
 	topLayout->addLayout(xyColorSelectorLayout, 1, 0);
57 57
 	zColorSelector = new KZColorSelector(KZColorSelector::Vertical, this);
58
-	connect(zColorSelector, SIGNAL( valueChanged(int) ),
59
-		SLOT( slotZColorSelectorPosChanged(int) ));
58
+	connect(zColorSelector, TQT_SIGNAL( valueChanged(int) ),
59
+		TQT_SLOT( slotZColorSelectorPosChanged(int) ));
60 60
 	zColorSelector->setFixedWidth(36);
61 61
 	topLayout->addWidget(zColorSelector, 0, 1);
62
-	QVBoxLayout* zColorSelectorLayout = new QVBoxLayout(0);
63
-	connect(&hsvButtons, SIGNAL( clicked(int) ), SLOT( slotSetColorSelectionMode(int) ));
64
-	QRadioButton* hRadioButton = new QRadioButton("H", this);
62
+	TQVBoxLayout* zColorSelectorLayout = new TQVBoxLayout(0);
63
+	connect(&hsvButtons, TQT_SIGNAL( clicked(int) ), TQT_SLOT( slotSetColorSelectionMode(int) ));
64
+	TQRadioButton* hRadioButton = new TQRadioButton("H", this);
65 65
 	hsvButtons.insert(hRadioButton, H_COMPONENT);
66 66
 	zColorSelectorLayout->addWidget(hRadioButton);
67
-	QRadioButton* sRadioButton = new QRadioButton("S", this);
67
+	TQRadioButton* sRadioButton = new TQRadioButton("S", this);
68 68
 	hsvButtons.insert(sRadioButton, S_COMPONENT);
69 69
 	zColorSelectorLayout->addWidget(sRadioButton);
70
-	QRadioButton* vRadioButton = new QRadioButton("V", this);
70
+	TQRadioButton* vRadioButton = new TQRadioButton("V", this);
71 71
 	hsvButtons.insert(vRadioButton, V_COMPONENT);
72 72
 	vRadioButton->toggle();
73 73
 	zColorSelectorLayout->addWidget(vRadioButton);
@@ -88,7 +88,7 @@ void GradientSelection::slotSetValue(Color* color) {
88 88
 		int newHComponent;
89 89
 		int newSComponent;
90 90
 		int newVComponent;
91
-		QColor hsvColor(this->color.component(Color::RED_INDEX),
91
+		TQColor hsvColor(this->color.component(Color::RED_INDEX),
92 92
 			this->color.component(Color::GREEN_INDEX),
93 93
 			this->color.component(Color::BLUE_INDEX));
94 94
 		hsvColor.hsv(&newHComponent, &newSComponent, &newVComponent);
@@ -210,7 +210,7 @@ void GradientSelection::slotXyColorSelectorPosChanged(int x, int y) {
210 210
 			break;
211 211
 	
212 212
 	}
213
-	QColor rgbColor;
213
+	TQColor rgbColor;
214 214
 	rgbColor.setHsv(hComponent, sComponent, vComponent);
215 215
 	color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
216 216
 	updateZColorSelector();
@@ -233,7 +233,7 @@ void GradientSelection::slotZColorSelectorPosChanged(int y) {
233 233
 			break;
234 234
 	
235 235
 	}
236
-	QColor rgbColor;
236
+	TQColor rgbColor;
237 237
 	rgbColor.setHsv(hComponent, sComponent, vComponent);
238 238
 	color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
239 239
 	updateXyColorSelector(false);

+ 9
- 9
kcoloredit/gradientselection.h View File

@@ -18,10 +18,10 @@
18 18
 #ifndef GRADIENTSELECTION_H
19 19
 #define GRADIENTSELECTION_H
20 20
 
21
-#include <qwidget.h>
22
-#include <qcheckbox.h>
23
-#include <qpushbutton.h>
24
-#include <qbuttongroup.h>
21
+#include <tqwidget.h>
22
+#include <tqcheckbox.h>
23
+#include <tqpushbutton.h>
24
+#include <tqbuttongroup.h>
25 25
 
26 26
 #include "kxycolorselector.h"
27 27
 #include "kzcolorselector.h"
@@ -30,12 +30,12 @@
30 30
 /** A widget for selecting colors from gradients
31 31
   * @author Artur Rataj
32 32
   */
33
-class GradientSelection : public QWidget  {
33
+class GradientSelection : public TQWidget  {
34 34
    Q_OBJECT
35 35
 
36 36
 public:
37 37
 	/** Constructs the widget */
38
-	GradientSelection(QWidget *parent=0, const char *name=0);
38
+	GradientSelection(TQWidget *parent=0, const char *name=0);
39 39
 	~GradientSelection();
40 40
 	/** Enables or disables the color synchronize button */
41 41
 	void enableSynchronizeColorButton(bool enable);
@@ -62,11 +62,11 @@ protected:
62 62
 	       V_COMPONENT = KXYColorSelector::TYPE_HS };
63 63
 	
64 64
 	/** Variable global component checkbox */
65
-	QCheckBox* variableCheckBox;
65
+	TQCheckBox* variableCheckBox;
66 66
 	/** Synchronize color button */
67
-	QPushButton* synchronizeColorButton;
67
+	TQPushButton* synchronizeColorButton;
68 68
 	/** HSV buttons button group widget */
69
-	QButtonGroup hsvButtons;
69
+	TQButtonGroup hsvButtons;
70 70
 	/** The two components selector */
71 71
 	KXYColorSelector* xyColorSelector;
72 72
 	/** The gradient selector */

+ 1
- 1
kcoloredit/imageselection.cpp View File

@@ -17,7 +17,7 @@
17 17
 
18 18
 #include "imageselection.h"
19 19
 
20
-ImageSelection::ImageSelection(QWidget *parent, const char *name ) : QWidget(parent,name) {
20
+ImageSelection::ImageSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
21 21
 }
22 22
 ImageSelection::~ImageSelection(){
23 23
 }

+ 3
- 3
kcoloredit/imageselection.h View File

@@ -18,19 +18,19 @@
18 18
 #ifndef IMAGESELECTION_H
19 19
 #define IMAGESELECTION_H
20 20
 
21
-#include <qwidget.h>
21
+#include <tqwidget.h>
22 22
 
23 23
 #include "color.h"
24 24
 
25 25
 /** This is a widget for selecting colors from an image
26 26
   * @author Artur Rataj
27 27
   */
28
-class ImageSelection : public QWidget  {
28
+class ImageSelection : public TQWidget  {
29 29
    Q_OBJECT
30 30
 
31 31
 public:
32 32
 	/** constructs the widget */
33
-	ImageSelection(QWidget *parent=0, const char *name=0);
33
+	ImageSelection(TQWidget *parent=0, const char *name=0);
34 34
 	~ImageSelection();
35 35
 	
36 36
 signals:

+ 2
- 2
kcoloredit/kcolorchooser.cpp View File

@@ -57,13 +57,13 @@ int main(int argc, char *argv[])
57 57
 
58 58
   dlg.setColor(Qt::blue); // Just a color
59 59
 
60
-  app.connect(&dlg, SIGNAL(finished()), SLOT(quit()));
60
+  app.connect(&dlg, TQT_SIGNAL(finished()), TQT_SLOT(quit()));
61 61
 
62 62
   dlg.show();
63 63
   app.exec();
64 64
 
65 65
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
66
-  const  QColor c = dlg.color();
66
+  const  TQColor c = dlg.color();
67 67
   if ( args->isSet("print") && c.isValid() ) {
68 68
       std::cout << c.name().utf8().data() << std::endl;
69 69
   }

+ 32
- 32
kcoloredit/kcoloredit.cpp View File

@@ -16,9 +16,9 @@
16 16
  ***************************************************************************/
17 17
 
18 18
 // include files for QT
19
-#include <qdir.h>
20
-#include <qprinter.h>
21
-#include <qpainter.h>
19
+#include <tqdir.h>
20
+#include <tqprinter.h>
21
+#include <tqpainter.h>
22 22
 
23 23
 // include files for KDE
24 24
 #include <kiconloader.h>
@@ -64,40 +64,40 @@ KColorEditApp::~KColorEditApp() {
64 64
 void KColorEditApp::initActions()
65 65
 {
66 66
   // File actiojns
67
-  KStdAction::openNew( this, SLOT( slotFileNew() ), actionCollection() );
68
-  KStdAction::open( this, SLOT( slotFileOpen() ), actionCollection() );
69
-  KStdAction::saveAs( this, SLOT( slotFileSaveAs() ), actionCollection() );
70
-  KStdAction::close( this, SLOT( slotClose() ), actionCollection() );
71
-  KStdAction::quit( this, SLOT( slotQuit() ), actionCollection() );
72
-  m_actSave = KStdAction::save( this, SLOT( slotFileSave() ),
67
+  KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection() );
68
+  KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() );
69
+  KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection() );
70
+  KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() );
71
+  KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
72
+  m_actSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ),
73 73
           actionCollection() );
74 74
   m_actRecent = KStdAction::openRecent( this,
75
-          SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
75
+          TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
76 76
 
77 77
   ( void ) new KAction( i18n("New &Window"), kapp->miniIcon(), KShortcut(),
78
-          this, SLOT( slotFileNewWindow() ), actionCollection(),
78
+          this, TQT_SLOT( slotFileNewWindow() ), actionCollection(),
79 79
           "file_new_window" );
80 80
 
81 81
   // Edit actions
82
-  m_actCut = KStdAction::cut( this, SLOT( slotEditCut() ),
82
+  m_actCut = KStdAction::cut( this, TQT_SLOT( slotEditCut() ),
83 83
           actionCollection() );
84
-  m_actCopy = KStdAction::copy( this, SLOT( slotEditCopy() ),
84
+  m_actCopy = KStdAction::copy( this, TQT_SLOT( slotEditCopy() ),
85 85
           actionCollection() );
86
-  m_actPaste = KStdAction::paste( this, SLOT( slotEditPaste() ),
86
+  m_actPaste = KStdAction::paste( this, TQT_SLOT( slotEditPaste() ),
87 87
           actionCollection() );
88 88
 
89 89
   m_actPaste->setEnabled( false );
90 90
 
91 91
   // Color Menu
92 92
   m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), this,
93
-          SLOT( slotViewColorNames() ), actionCollection(),
93
+          TQT_SLOT( slotViewColorNames() ), actionCollection(),
94 94
           "color_view_names" );
95 95
   m_actNames->setCheckedState(i18n("Hide &Color Names"));
96 96
   m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), this,
97
-          SLOT( slotColorFromPalette() ), actionCollection(),
97
+          TQT_SLOT( slotColorFromPalette() ), actionCollection(),
98 98
           "color_from_palette" );
99 99
   ( void ) new KAction( i18n("From &Screen"), KShortcut(), this,
100
-          SLOT( slotColorFromScreen() ), actionCollection(),
100
+          TQT_SLOT( slotColorFromScreen() ), actionCollection(),
101 101
           "color_from_screen" );
102 102
 }
103 103
 
@@ -112,14 +112,14 @@ void KColorEditApp::initDocument()
112 112
   doc = new KColorEditDoc(this);
113 113
   doc->newDocument();
114 114
 
115
-  connect( doc, SIGNAL( selectionChanged( int, int ) ),
116
-          SLOT( slotSelectionChanged( int, int ) ) );
117
-  connect( doc, SIGNAL( clipboardChanged() ),
118
-          SLOT( slotClipboardChanged() ) );
119
-  connect( doc, SIGNAL( modified( bool ) ),
120
-          SLOT( slotModified( bool ) ) );
121
-  connect( doc, SIGNAL( paletteAvailable( bool ) ),
122
-          SLOT( slotPaletteAvailable( bool ) ) );
115
+  connect( doc, TQT_SIGNAL( selectionChanged( int, int ) ),
116
+          TQT_SLOT( slotSelectionChanged( int, int ) ) );
117
+  connect( doc, TQT_SIGNAL( clipboardChanged() ),
118
+          TQT_SLOT( slotClipboardChanged() ) );
119
+  connect( doc, TQT_SIGNAL( modified( bool ) ),
120
+          TQT_SLOT( slotModified( bool ) ) );
121
+  connect( doc, TQT_SIGNAL( paletteAvailable( bool ) ),
122
+          TQT_SLOT( slotPaletteAvailable( bool ) ) );
123 123
 }
124 124
 
125 125
 void KColorEditApp::initView()
@@ -178,7 +178,7 @@ bool KColorEditApp::queryExit()
178 178
 }
179 179
 
180 180
 /////////////////////////////////////////////////////////////////////
181
-// SLOT IMPLEMENTATION
181
+// TQT_SLOT IMPLEMENTATION
182 182
 /////////////////////////////////////////////////////////////////////
183 183
 
184 184
 void KColorEditApp::slotSelectionChanged( int begin, int end )
@@ -221,7 +221,7 @@ void KColorEditApp::slotFileOpen() {
221 221
   if(doc->saveModified()) {
222 222
     LoadPaletteDlg dialog(this);
223 223
     if(dialog.exec()) {
224
-      QString fileToOpen = dialog.getFileName();
224
+      TQString fileToOpen = dialog.getFileName();
225 225
       if(!fileToOpen.isEmpty())
226 226
       {
227 227
         if(!doc->openDocument( fileToOpen )) {
@@ -255,12 +255,12 @@ bool KColorEditApp::slotFileSaveAs()
255 255
     bool result = true;
256 256
 
257 257
     while(result) {
258
-        QString newName=KFileDialog::getSaveFileName(lastSavePaletteAsFileDir,
258
+        TQString newName=KFileDialog::getSaveFileName(lastSavePaletteAsFileDir,
259 259
                   "*|" + i18n("All Files"), this, i18n("Save As"));
260 260
         if(newName.isEmpty())
261 261
             result = false;
262 262
         else {
263
-      QFileInfo saveAsInfo(newName);
263
+      TQFileInfo saveAsInfo(newName);
264 264
       if(!saveAsInfo.exists() ||
265 265
                KMessageBox::questionYesNo( this,
266 266
                        i18n("A Document with this name already exists.\n"
@@ -291,7 +291,7 @@ void KColorEditApp::slotClose()
291 291
 
292 292
 void KColorEditApp::slotFilePrint()
293 293
 {
294
-  QPrinter printer;
294
+  TQPrinter printer;
295 295
   if (printer.setup(this))
296 296
   {
297 297
     view->print(&printer);
@@ -348,12 +348,12 @@ void KColorEditApp::slotViewColorNames()
348 348
   doc->slotChangeViewMode(viewColorNames);
349 349
 }
350 350
 
351
-void KColorEditApp::mouseReleaseEvent(QMouseEvent* event) {
351
+void KColorEditApp::mouseReleaseEvent(TQMouseEvent* event) {
352 352
 	if(gettingColorFromScreen) {
353 353
 		gettingColorFromScreen = false;
354 354
 		releaseMouse();
355 355
 		releaseKeyboard();
356
-		QColor rgbColor =  KColorDialog::grabColor(event->globalPos());
356
+		TQColor rgbColor =  KColorDialog::grabColor(event->globalPos());
357 357
 		color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
358 358
 		view->chooseColor(&color);
359 359
 	} else

+ 3
- 3
kcoloredit/kcoloredit.h View File

@@ -22,8 +22,8 @@
22 22
 #include <config.h>
23 23
 
24 24
 // include files for Qt
25
-#include <qevent.h>
26
-#include <qstringlist.h>
25
+#include <tqevent.h>
26
+#include <tqstringlist.h>
27 27
 
28 28
 // include files for KDE
29 29
 #include <kapplication.h>
@@ -109,7 +109,7 @@ class KColorEditApp : public KMainWindow
109 109
      */
110 110
     virtual bool queryExit();
111 111
 
112
-	void mouseReleaseEvent(QMouseEvent* event);
112
+	void mouseReleaseEvent(TQMouseEvent* event);
113 113
 
114 114
   public slots:
115 115
 

+ 21
- 21
kcoloredit/kcoloreditdoc.cpp View File

@@ -16,10 +16,10 @@
16 16
  ***************************************************************************/
17 17
 
18 18
 // include files for Qt
19
-#include <qdir.h>
20
-#include <qfileinfo.h>
21
-#include <qwidget.h>
22
-#include <qclipboard.h>
19
+#include <tqdir.h>
20
+#include <tqfileinfo.h>
21
+#include <tqwidget.h>
22
+#include <tqclipboard.h>
23 23
 
24 24
 // include files for KDE
25 25
 #include <klocale.h>
@@ -31,9 +31,9 @@
31 31
 #include "kcoloreditview.h"
32 32
 #include "resource.h"
33 33
 
34
-KColorEditDoc::KColorEditDoc(QWidget *parent, const char *name) : QObject(parent, name),
34
+KColorEditDoc::KColorEditDoc(TQWidget *parent, const char *name) : TQObject(parent, name),
35 35
 	m_palette(), m_paletteHistory(&m_palette, 0) {
36
-	m_pViewList = new QPtrList<KColorEditView>();
36
+	m_pViewList = new TQPtrList<KColorEditView>();
37 37
 	m_pViewList->setAutoDelete(true);
38 38
 }
39 39
 
@@ -57,22 +57,22 @@ void KColorEditDoc::setModified(bool b) {
57 57
     emit modified( b );
58 58
 }
59 59
 
60
-void KColorEditDoc::setAbsFilePath(const QString &filename)
60
+void KColorEditDoc::setAbsFilePath(const TQString &filename)
61 61
 {
62 62
   m_absFilePath=filename;
63 63
 }
64 64
 
65
-const QString &KColorEditDoc::absFilePath() const
65
+const TQString &KColorEditDoc::absFilePath() const
66 66
 {
67 67
   return m_absFilePath;
68 68
 }
69 69
 
70
-void KColorEditDoc::setTitle(const QString &_t)
70
+void KColorEditDoc::setTitle(const TQString &_t)
71 71
 {
72 72
   m_title=_t;
73 73
 }
74 74
 
75
-const QString &KColorEditDoc::title() const
75
+const TQString &KColorEditDoc::title() const
76 76
 {
77 77
   return m_title;
78 78
 }
@@ -109,7 +109,7 @@ bool KColorEditDoc::saveModified()
109 109
     KColorEditApp *window=(KColorEditApp *) parent();
110 110
     int want_save = KMessageBox::warningYesNoCancel(window,
111 111
                                          i18n("The current file has been modified.\n"
112
-                                              "Do you want to save it?"), QString::null, KStdGuiItem::save(), i18n("Do Not Save"));
112
+                                              "Do you want to save it?"), TQString::null, KStdGuiItem::save(), i18n("Do Not Save"));
113 113
     switch(want_save)
114 114
     {
115 115
       case KMessageBox::Yes:
@@ -151,7 +151,7 @@ bool KColorEditDoc::newDocument()
151 151
 {
152 152
   deleteContents();
153 153
 	setModified(false);
154
-  setAbsFilePath( QDir::homeDirPath() );
154
+  setAbsFilePath( TQDir::homeDirPath() );
155 155
   setTitle( i18n("Untitled") );
156 156
   setPaletteCursorPos(0);
157 157
   setPaletteSelection(0, 0);
@@ -159,12 +159,12 @@ bool KColorEditDoc::newDocument()
159 159
   return true;
160 160
 }
161 161
 
162
-bool KColorEditDoc::openDocument(const QString& filename) {
162
+bool KColorEditDoc::openDocument(const TQString& filename) {
163 163
 	if(filename.isEmpty())
164 164
 		return newDocument();
165 165
 	else {
166 166
 		deleteContents();
167
-		QFileInfo fileInfo(filename);
167
+		TQFileInfo fileInfo(filename);
168 168
 		setAbsFilePath( fileInfo.absFilePath() );
169 169
 		if(!m_palette.load( absFilePath() )) {
170 170
 			setErrorString(m_palette.errorString());
@@ -181,7 +181,7 @@ bool KColorEditDoc::openDocument(const QString& filename) {
181 181
 	return true;
182 182
 }
183 183
 
184
-bool KColorEditDoc::saveDocument(const QString& filename) {
184
+bool KColorEditDoc::saveDocument(const TQString& filename) {
185 185
 	if(!m_palette.save( filename )) {
186 186
 	 	setErrorString(m_palette.errorString());
187 187
 	 	return false;
@@ -194,11 +194,11 @@ void KColorEditDoc::deleteContents() {
194 194
 	m_palette.deleteContents();
195 195
 }
196 196
 
197
-void KColorEditDoc::setErrorString(const QString& string) {
197
+void KColorEditDoc::setErrorString(const TQString& string) {
198 198
 	m_errorString = string;
199 199
 }
200 200
 
201
-const QString& KColorEditDoc::errorString() const {
201
+const TQString& KColorEditDoc::errorString() const {
202 202
 	return m_errorString;
203 203
 }
204 204
 
@@ -232,8 +232,8 @@ int KColorEditDoc::paletteSelectionEnd() const {
232 232
 }
233 233
 
234 234
 void KColorEditDoc::copyToClipboard(Palette& palette) {
235
-	QString text;
236
-	QTextOStream stream(&text);
235
+	TQString text;
236
+	TQTextOStream stream(&text);
237 237
 	palette.save(stream, 0, false);
238 238
 	KApplication::clipboard()->setText(text);
239 239
 
@@ -258,8 +258,8 @@ void KColorEditDoc::cut() {
258 258
 
259 259
 void KColorEditDoc::paste() {
260 260
 	Palette palettePaste;
261
-	QString text;
262
-	QTextIStream stream(&text);
261
+	TQString text;
262
+	TQTextIStream stream(&text);
263 263
 	text = KApplication::clipboard()->text();
264 264
 	if(palettePaste.load( stream, false )) {
265 265
 		m_paletteHistory.paste(paletteCursorPos(), palettePaste);

+ 16
- 16
kcoloredit/kcoloreditdoc.h View File

@@ -23,9 +23,9 @@
23 23
 #endif
24 24
 
25 25
 // include files for QT
26
-#include <qobject.h>
27
-#include <qstring.h>
28
-#include <qptrlist.h>
26
+#include <tqobject.h>
27
+#include <tqstring.h>
28
+#include <tqptrlist.h>
29 29
 
30 30
 // application specific includes
31 31
 #include "palette.h"
@@ -50,7 +50,7 @@ class KColorEditDoc : public QObject
50 50
 
51 51
   public:
52 52
     /** Constructor for the fileclass of the application */
53
-    KColorEditDoc(QWidget *parent, const char *name=0);
53
+    KColorEditDoc(TQWidget *parent, const char *name=0);
54 54
     /** Destructor for the fileclass of the application */
55 55
     ~KColorEditDoc();
56 56
 
@@ -71,19 +71,19 @@ class KColorEditDoc : public QObject
71 71
     /** closes the actual document */
72 72
     void closeDocument();
73 73
     /** loads the document */
74
-    bool openDocument(const QString& filename);
74
+    bool openDocument(const TQString& filename);
75 75
     /** saves the document */
76
-    bool saveDocument(const QString& filename);
76
+    bool saveDocument(const TQString& filename);
77 77
     /** sets the path to the file connected with the document */
78
-    void setAbsFilePath(const QString &filename);
78
+    void setAbsFilePath(const TQString &filename);
79 79
     /** returns the pathname of the current document file*/
80
-    const QString& absFilePath() const;
80
+    const TQString& absFilePath() const;
81 81
     /** sets the filename of the document */
82
-    void setTitle(const QString &_t);
82
+    void setTitle(const TQString &_t);
83 83
     /** returns the title of the document */
84
-    const QString& title() const;
84
+    const TQString& title() const;
85 85
 		/** @return a description of a possible unsuccessfull IO operation */
86
-		const QString& errorString() const;
86
+		const TQString& errorString() const;
87 87
 		/** returns a pointer to paletteHistory */
88 88
 		PaletteHistory* paletteHistory();
89 89
 		/** sets a palette cursor position */
@@ -115,7 +115,7 @@ class KColorEditDoc : public QObject
115 115
 
116 116
 	protected:
117 117
 		/** Sets an error string if an IO operation was unsuccesfull */
118
-		void setErrorString(const QString& string);
118
+		void setErrorString(const TQString& string);
119 119
 		/** Copies a palette to clipboard */
120 120
 		void copyToClipboard(Palette& palette);
121 121
 
@@ -136,14 +136,14 @@ class KColorEditDoc : public QObject
136 136
 
137 137
   public:
138 138
     /** the list of the views currently connected to the document */
139
-    QPtrList<KColorEditView> *m_pViewList;
139
+    TQPtrList<KColorEditView> *m_pViewList;
140 140
 
141 141
   private:
142 142
     /** the modified flag of the current document */
143 143
     bool m_modified;
144
-    QString m_title;
145
-    QString m_absFilePath;
146
-    QString m_errorString;
144
+    TQString m_title;
145
+    TQString m_absFilePath;
146
+    TQString m_errorString;
147 147
 
148 148
 	protected:
149 149
 		Palette m_palette;

+ 55
- 55
kcoloredit/kcoloreditview.cpp View File

@@ -16,13 +16,13 @@
16 16
  ***************************************************************************/
17 17
 
18 18
 // include files for Qt
19
-#include <qpainter.h>
20
-#include <qlayout.h>
21
-#include <qpushbutton.h>
22
-#include <qvgroupbox.h>
23
-#include <qlineedit.h>
24
-#include <qcolor.h>
25
-#include <qprinter.h>
19
+#include <tqpainter.h>
20
+#include <tqlayout.h>
21
+#include <tqpushbutton.h>
22
+#include <tqvgroupbox.h>
23
+#include <tqlineedit.h>
24
+#include <tqcolor.h>
25
+#include <tqprinter.h>
26 26
 
27 27
 // include files for KDE
28 28
 #include <kseparator.h>
@@ -35,28 +35,28 @@
35 35
 #include "kcoloredit.h"
36 36
 #include "palette.h"
37 37
 
38
-KColorEditView::KColorEditView(QWidget *parent, const char *name) : QSplitter(parent, name) {
38
+KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(parent, name) {
39 39
 	colorSelector = new ColorSelector(this);
40 40
 	colorSelector->slotSetColor(
41 41
 		Color( RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, "" ));
42
-	QWidget* paletteViewArea = new QWidget(this);
43
-	QVBoxLayout* paletteLayout = new QVBoxLayout(paletteViewArea);
42
+	TQWidget* paletteViewArea = new TQWidget(this);
43
+	TQVBoxLayout* paletteLayout = new TQVBoxLayout(paletteViewArea);
44 44
 	paletteView = new PaletteView(16, 16, 2, this, paletteViewArea);
45 45
 	paletteLayout->addWidget(paletteView, 10);
46
-	QHBoxLayout* layout = new QHBoxLayout();
47
-	QVBoxLayout* addColorLayout = new QVBoxLayout(4);
46
+	TQHBoxLayout* layout = new TQHBoxLayout();
47
+	TQVBoxLayout* addColorLayout = new TQVBoxLayout(4);
48 48
 	addColorLayout->setMargin(8);
49
-	QHBoxLayout* buttonsLayout = new QHBoxLayout(4);
50
-	QPushButton* addColorButton = new QPushButton(i18n( "Add Color" ), paletteViewArea);
51
-	connect(addColorButton, SIGNAL( clicked() ), SLOT( slotAddColor() ));
49
+	TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4);
50
+	TQPushButton* addColorButton = new TQPushButton(i18n( "Add Color" ), paletteViewArea);
51
+	connect(addColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddColor() ));
52 52
 	buttonsLayout->addWidget(addColorButton);
53 53
 	buttonsLayout->addStretch(10);
54 54
 	addColorLayout->addLayout(buttonsLayout);
55
-	QCheckBox* atCursorCheckBox = new QCheckBox(i18n( "At cursor" ), paletteViewArea);
56
-	connect(atCursorCheckBox, SIGNAL( toggled(bool) ), SLOT( slotAddColorAtCursor(bool) ));
55
+	TQCheckBox* atCursorCheckBox = new TQCheckBox(i18n( "At cursor" ), paletteViewArea);
56
+	connect(atCursorCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAddColorAtCursor(bool) ));
57 57
 	addColorLayout->addWidget(atCursorCheckBox);
58
-	overwriteCheckBox = new QCheckBox(i18n( "Overwrite" ), paletteViewArea);
59
-	connect(overwriteCheckBox, SIGNAL( toggled(bool) ), SLOT( slotAddColorOverwrite(bool) ));
58
+	overwriteCheckBox = new TQCheckBox(i18n( "Overwrite" ), paletteViewArea);
59
+	connect(overwriteCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAddColorOverwrite(bool) ));
60 60
 	slotAddColorAtCursor(false);
61 61
 	slotAddColorOverwrite(false);
62 62
 	addColorLayout->addWidget(overwriteCheckBox);
@@ -64,66 +64,66 @@ KColorEditView::KColorEditView(QWidget *parent, const char *name) : QSplitter(pa
64 64
 	//KSeparator* hLine = new KSeparator(KSeparator::HLine, paletteViewArea);
65 65
 	//addColorLayout->addWidget(hLine);
66 66
 	//addColorLayout->addStretch(10);
67
-	//QCheckBox* cursorFollowsChosenColor = new QCheckBox(i18n( "Cursor follows" ), paletteViewArea);
67
+	//TQCheckBox* cursorFollowsChosenColor = new TQCheckBox(i18n( "Cursor follows" ), paletteViewArea);
68 68
 	//addColorLayout->addWidget(cursorFollowsChosenColor);
69
-	//connect(cursorFollowsChosenColor, SIGNAL( toggled(bool) ),
70
-	//	paletteView, SLOT( slotCursorFollowsChosenColor(bool) ));
69
+	//connect(cursorFollowsChosenColor, TQT_SIGNAL( toggled(bool) ),
70
+	//	paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) ));
71 71
 	//cursorFollowsChosenColor->toggle();
72 72
 	paletteView->slotCursorFollowsChosenColor(true);
73 73
 	layout->addLayout(addColorLayout, 0);
74
-	QVGroupBox* colorAtCursorFrame = new QVGroupBox(i18n("Color at Cursor"), paletteViewArea);
75
-	QWidget* colorAtCursorFrameArea = new QWidget(colorAtCursorFrame);
76
-	QVBoxLayout* colorAtCursorLayout = new QVBoxLayout(colorAtCursorFrameArea, 4);
77
-	QHBoxLayout* colorNameLayout = new QHBoxLayout(0);
78
-	QLabel* nameLabel = new QLabel(i18n( "Name" ) + ": ", colorAtCursorFrameArea);
74
+	TQVGroupBox* colorAtCursorFrame = new TQVGroupBox(i18n("Color at Cursor"), paletteViewArea);
75
+	TQWidget* colorAtCursorFrameArea = new TQWidget(colorAtCursorFrame);
76
+	TQVBoxLayout* colorAtCursorLayout = new TQVBoxLayout(colorAtCursorFrameArea, 4);
77
+	TQHBoxLayout* colorNameLayout = new TQHBoxLayout(0);
78
+	TQLabel* nameLabel = new TQLabel(i18n( "Name" ) + ": ", colorAtCursorFrameArea);
79 79
 	colorNameLayout->addWidget(nameLabel, 0);
80
-	colorName = new QLineEdit(colorAtCursorFrameArea);
81
-	connect(colorName, SIGNAL( textChanged(const QString&) ), SLOT( slotSetColorName(const QString&) ));
80
+	colorName = new TQLineEdit(colorAtCursorFrameArea);
81
+	connect(colorName, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotSetColorName(const TQString&) ));
82 82
 	colorNameLayout->addWidget(colorName, 10);
83 83
 	colorAtCursorLayout->addLayout(colorNameLayout);
84
-	QGridLayout* colorAtCursorComponentsLayout = new QGridLayout(3, 6, 4);
84
+	TQGridLayout* colorAtCursorComponentsLayout = new TQGridLayout(3, 6, 4);
85 85
 	colorAtCursorLayout->addLayout(colorAtCursorComponentsLayout);
86 86
 	colorAtCursorComponentsLayout->setColStretch(1, 10);
87 87
 	colorAtCursorComponentsLayout->addColSpacing(2, 8);
88 88
 	colorAtCursorComponentsLayout->setColStretch(4, 10);
89 89
 	colorAtCursorComponentsLayout->setColStretch(5, 10);
90
-	QLabel* hLabel = new QLabel("H: ", colorAtCursorFrameArea);
90
+	TQLabel* hLabel = new TQLabel("H: ", colorAtCursorFrameArea);
91 91
 	colorAtCursorComponentsLayout->addWidget(hLabel, 0, 0);
92
-	colorAtCursorHValueLabel = new QLabel("", colorAtCursorFrameArea);
92
+	colorAtCursorHValueLabel = new TQLabel("", colorAtCursorFrameArea);
93 93
 	setColorAtCursorComponentValueLabelSizes(colorAtCursorHValueLabel);
94 94
 	colorAtCursorComponentsLayout->addWidget(colorAtCursorHValueLabel, 0, 1);
95
-	QLabel* sLabel = new QLabel("S: ", colorAtCursorFrameArea);
95
+	TQLabel* sLabel = new TQLabel("S: ", colorAtCursorFrameArea);
96 96
 	colorAtCursorComponentsLayout->addWidget(sLabel, 1, 0);
97
-	colorAtCursorSValueLabel = new QLabel("", colorAtCursorFrameArea);
97
+	colorAtCursorSValueLabel = new TQLabel("", colorAtCursorFrameArea);
98 98
 	setColorAtCursorComponentValueLabelSizes(colorAtCursorSValueLa