Browse Source

Rename a number of classes to enhance compatibility with KDE4

Timothy Pearson 6 years ago
parent
commit
a503c83523

+ 2
- 2
ksystemlog.kdevses View File

@@ -62,7 +62,7 @@
62 62
   <Doc19 NumberOfViews="1" URL="file:///mnt/boulot/devel/playground/sysadmin/ksystemlog/src/view.cpp" >
63 63
    <View0 line="33" Type="Source" />
64 64
   </Doc19>
65
-  <Doc20 NumberOfViews="1" URL="file:///usr/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/classKListViewItem.html" >
65
+  <Doc20 NumberOfViews="1" URL="file:///usr/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/classTDEListViewItem.html" >
66 66
    <View0 Type="Documentation" />
67 67
   </Doc20>
68 68
   <Doc21 NumberOfViews="1" URL="file:///mnt/boulot/devel/playground/sysadmin/ksystemlog/src/apache/apacheReader.h" >
@@ -119,7 +119,7 @@
119 119
   <Doc38 NumberOfViews="1" URL="file:///mnt/boulot/devel/playground/sysadmin/ksystemlog/src/logManager.cpp" >
120 120
    <View0 line="246" Type="Source" />
121 121
   </Doc38>
122
-  <Doc39 NumberOfViews="1" URL="file:///usr/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/classKAction.html" >
122
+  <Doc39 NumberOfViews="1" URL="file:///usr/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/classTDEAction.html" >
123 123
    <View0 Type="Documentation" />
124 124
   </Doc39>
125 125
  </DocsAndViews>

+ 2
- 2
ksystemlog/src/fileList.cpp View File

@@ -56,7 +56,7 @@ FileList::FileList(TQWidget *parent, TQString description) :
56 56
 	TQHBox* center= new TQHBox(dirBox);
57 57
 	center->setSpacing(10);
58 58
 		
59
-	fileList=new KListBox(center);
59
+	fileList=new TDEListBox(center);
60 60
 	buttons=new TQVBox(center);
61 61
 	
62 62
 	fileList->setSelectionMode(TQListBox::Extended);
@@ -91,7 +91,7 @@ FileList::FileList(TQWidget *parent, TQString description) :
91 91
 	TQToolTip::add(removeAll, i18n("Remove all files"));
92 92
 	TQWhatsThis::add(removeAll, i18n("<qt>Remove all files of the list, even if they are not selected.</qt>"));
93 93
 
94
-	fileListMenu=new KPopupMenu(this);
94
+	fileListMenu=new TDEPopupMenu(this);
95 95
 	fileListMenu->insertTitle(i18n("File List"));
96 96
 	fileListMenu->insertItem(SmallIcon("fileopen"), i18n("&Add File..."), this, TQT_SLOT(addItem()), 0, ADD_FILE_MENU_ID);
97 97
 	fileListMenu->insertItem(SmallIcon("edit_remove"), i18n("&Remove"), this, TQT_SLOT(removeSelectedItem()), 0, REMOVE_MENU_ID);

+ 2
- 2
ksystemlog/src/fileList.h View File

@@ -73,9 +73,9 @@ class FileList : public TQWidget {
73 73
 		
74 74
 		TQVBox* buttons;
75 75
 		
76
-		KPopupMenu* fileListMenu;
76
+		TDEPopupMenu* fileListMenu;
77 77
 		
78
-		KListBox* fileList;
78
+		TDEListBox* fileList;
79 79
 	
80 80
 	private:
81 81
 	

+ 2
- 2
ksystemlog/src/findManager.cpp View File

@@ -64,7 +64,7 @@ void FindManager::slotFirstFind() {
64 64
 	kdDebug() << "First Find" << endl;
65 65
 	
66 66
 	LogManager* currentManager=main->activeLogManager();
67
-	KListView* list=currentManager->getView()->getLogList();
67
+	TDEListView* list=currentManager->getView()->getLogList();
68 68
 	
69 69
 	//Delete the previous KFind object (if it exists)
70 70
 	if (findManager!=NULL) {
@@ -190,7 +190,7 @@ void FindManager::slotFindNext() {
190 190
 
191 191
 void FindManager::highlightSearch(const TQString& /*text*/, int /*matchingIndex*/, int /*matchingLength*/) {
192 192
 	LogManager* currentManager=main->activeLogManager();
193
-	KListView* list=currentManager->getView()->getLogList();
193
+	TDEListView* list=currentManager->getView()->getLogList();
194 194
 		
195 195
 	if (previousItemFound!=NULL) {
196 196
 		list->setSelected(previousItemFound, false);

+ 50
- 50
ksystemlog/src/ksystemlog.cpp View File

@@ -86,7 +86,7 @@
86 86
 #include "readerFactory.h"
87 87
 
88 88
 KSystemLog::KSystemLog() :
89
-	KMainWindow(0, "ksystemlog"),
89
+	TDEMainWindow(0, "ksystemlog"),
90 90
 	printer(NULL),
91 91
 	detailDialog(NULL),
92 92
 	loadingDialog(NULL),
@@ -117,7 +117,7 @@ KSystemLog::KSystemLog() :
117 117
 	//Setup the main tab bar
118 118
 	setupTabBar();
119 119
 		
120
-	//TabBar widget becomes the central place of the KMainWindow
120
+	//TabBar widget becomes the central place of the TDEMainWindow
121 121
 	setCentralWidget(tabs);
122 122
 
123 123
 	//Setup the Progress Bar Dialog
@@ -248,7 +248,7 @@ void KSystemLog::currentTabChanged(TQWidget* /*widget*/) {
248 248
 	
249 249
 	//Modify the menu button to help the user know what is the currently log mode
250 250
 	//setModeToAction(currentManager->getLogMode(), true);
251
-	KToggleAction* action=getCorrespondingLogAction(currentManager->getLogMode());
251
+	TDEToggleAction* action=getCorrespondingLogAction(currentManager->getLogMode());
252 252
 	if (action!=NULL)
253 253
 		action->setChecked(true);
254 254
 	
@@ -295,22 +295,22 @@ void KSystemLog::setupActions() {
295 295
 	copyAction->setWhatsThis(i18n("Copies the selection to the clipboard. This action is useful if you want to paste the selection in a chat or an email."));	
296 296
 	copyAction->setEnabled(false);
297 297
 	
298
-	expandAllAction=new KAction(i18n("Ex&pand All"), NULL, CTRL+Key_X, TQT_TQOBJECT(this), NULL, actionCollection(), "expand_all" );
298
+	expandAllAction=new TDEAction(i18n("Ex&pand All"), NULL, CTRL+Key_X, TQT_TQOBJECT(this), NULL, actionCollection(), "expand_all" );
299 299
 	expandAllAction->setToolTip(i18n("Expand all categories"));
300 300
 	expandAllAction->setWhatsThis(i18n("<qt>This action opens all main categories. This is enabled only if an option has been selected in the <b>Group By</b> menu.</qt>"));
301 301
 	expandAllAction->setEnabled(false);
302 302
 	
303
-	collapseAllAction=new KAction(i18n("Col&lapse All"), NULL, CTRL+Key_L, TQT_TQOBJECT(this), NULL, actionCollection(), "collapse_all" );
303
+	collapseAllAction=new TDEAction(i18n("Col&lapse All"), NULL, CTRL+Key_L, TQT_TQOBJECT(this), NULL, actionCollection(), "collapse_all" );
304 304
 	collapseAllAction->setToolTip(i18n("Collapse all categories"));
305 305
 	collapseAllAction->setWhatsThis(i18n("<qt>This action closes all main categories. This is enabled only if an option has been selected in the <b>Group By</b> menu.</qt>"));
306 306
 	collapseAllAction->setEnabled(false);
307 307
 	
308
-	sendMailAction=new KAction(i18n("&Email Selection..."), "mail_generic", CTRL+Key_M, TQT_TQOBJECT(this), NULL, actionCollection(), "send_mail" );
308
+	sendMailAction=new TDEAction(i18n("&Email Selection..."), "mail_generic", CTRL+Key_M, TQT_TQOBJECT(this), NULL, actionCollection(), "send_mail" );
309 309
 	sendMailAction->setToolTip(i18n("Send the selection by mail"));
310 310
 	sendMailAction->setWhatsThis(i18n("Sends the selection by mail. Simply select the important lines and click on this menu entry to send the selection to a friend or a mailing list."));	
311 311
 	sendMailAction->setEnabled(false);
312 312
 	
313
-	logMessageAction=new KAction(i18n("&Send Message..."), "filenew", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLogMessage()), actionCollection(), "log_message" );
313
+	logMessageAction=new TDEAction(i18n("&Send Message..."), "filenew", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLogMessage()), actionCollection(), "log_message" );
314 314
 	logMessageAction->setToolTip(i18n("Send a message to the log system"));
315 315
 	logMessageAction->setWhatsThis(i18n("This action will open a dialog which lets you send a message to the log system."));
316 316
 	
@@ -322,7 +322,7 @@ void KSystemLog::setupActions() {
322 322
 	KStdAction::findNext(findManager, TQT_SLOT(slotFindNext()), actionCollection(), "find_next");
323 323
 
324 324
 	//TODO Find a solution to display at the right place this action (see Akregator interface)
325
-	filterBarAction=new KToggleAction(i18n("Show &Filter Bar"), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar");
325
+	filterBarAction=new TDEToggleAction(i18n("Show &Filter Bar"), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar");
326 326
 #if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
327 327
 	filterBarAction->setEnabled(true);
328 328
 #else
@@ -331,53 +331,53 @@ void KSystemLog::setupActions() {
331 331
 
332 332
 	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection());
333 333
 	
334
-	newTabAction=new KAction(i18n("&New Tab"), "tab_new", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(newTab()), actionCollection(), "new_tab" );
334
+	newTabAction=new TDEAction(i18n("&New Tab"), "tab_new", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(newTab()), actionCollection(), "new_tab" );
335 335
 	newTabAction->setToolTip(i18n("Create a new tab"));
336 336
 	newTabAction->setWhatsThis(i18n("Creates a new tab which can display another log."));
337 337
 	
338
-	closeTabAction=new KAction(i18n("&Close Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(closeTab()), actionCollection(), "close_tab" );
338
+	closeTabAction=new TDEAction(i18n("&Close Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(closeTab()), actionCollection(), "close_tab" );
339 339
 	closeTabAction->setToolTip(i18n("Close the current tab"));
340 340
 	closeTabAction->setWhatsThis(i18n("Closes the current tab."));
341 341
 	
342
-	duplicateTabAction=new KAction(i18n("&Duplicate Tab"), "tab_duplicate", SHIFT+CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(duplicateTab()), actionCollection(), "duplicate_tab" );
342
+	duplicateTabAction=new TDEAction(i18n("&Duplicate Tab"), "tab_duplicate", SHIFT+CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(duplicateTab()), actionCollection(), "duplicate_tab" );
343 343
 	duplicateTabAction->setToolTip(i18n("Duplicate the current tab"));
344 344
 	duplicateTabAction->setWhatsThis(i18n("Duplicates the current tab."));
345 345
 	
346
-	moveTabLeftAction=new KAction(i18n("Move Tab &Left"), "1leftarrow", SHIFT+CTRL+Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveTabLeft()), actionCollection(), "move_tab_left" );
346
+	moveTabLeftAction=new TDEAction(i18n("Move Tab &Left"), "1leftarrow", SHIFT+CTRL+Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveTabLeft()), actionCollection(), "move_tab_left" );
347 347
 	moveTabLeftAction->setToolTip(i18n("Move the current tab to the left"));
348 348
 	moveTabLeftAction->setWhatsThis(i18n("Moves the current tab to the left."));
349 349
 	
350
-	moveTabRightAction=new KAction(i18n("Move Tab &Right"), "1rightarrow", SHIFT+CTRL+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveTabRight()), actionCollection(), "move_tab_right" );
350
+	moveTabRightAction=new TDEAction(i18n("Move Tab &Right"), "1rightarrow", SHIFT+CTRL+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveTabRight()), actionCollection(), "move_tab_right" );
351 351
 	moveTabRightAction->setToolTip(i18n("Move the current tab to the right"));
352 352
 	moveTabRightAction->setWhatsThis(i18n("Moves the current tab to the right."));
353 353
 	
354 354
 	
355
-	reloadAction=new KAction(i18n("&Reload"), "reload", Key_F5, TQT_TQOBJECT(this), TQT_SLOT(reloadCurrent()), actionCollection(), "reload" );
355
+	reloadAction=new TDEAction(i18n("&Reload"), "reload", Key_F5, TQT_TQOBJECT(this), TQT_SLOT(reloadCurrent()), actionCollection(), "reload" );
356 356
 	reloadAction->setToolTip(i18n("Reload the current log"));
357 357
 	reloadAction->setWhatsThis(i18n("Reloads the current log, if you want to be sure that the view is correctly updated."));
358 358
 	
359
-	resumeParsingAction=new KAction(i18n("Resu&me Parsing"), "player_play", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(resumeParsing()), actionCollection(), "resume_parsing");
359
+	resumeParsingAction=new TDEAction(i18n("Resu&me Parsing"), "player_play", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(resumeParsing()), actionCollection(), "resume_parsing");
360 360
 	resumeParsingAction->setToolTip(i18n("Resume the watching of the current log"));
361 361
 	resumeParsingAction->setWhatsThis(i18n("Resumes the watching of the current log. This action is only available when the user has already paused the reading."));
362 362
 	resumeParsingAction->setEnabled(true);
363 363
 	
364
-	pauseParsingAction=new KAction(i18n("S&top Parsing"), "player_stop", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(pauseParsing()), actionCollection(), "pause_parsing");
364
+	pauseParsingAction=new TDEAction(i18n("S&top Parsing"), "player_stop", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(pauseParsing()), actionCollection(), "pause_parsing");
365 365
 	pauseParsingAction->setToolTip(i18n("Pause the watching of the current log"));
366 366
 	pauseParsingAction->setWhatsThis(i18n("Pauses the watching of the current log. This action is particularly useful when the system is writing too many lines to log files, causing KSystemLog to reload too frequently."));
367 367
 
368
-	detailAction=new KAction(i18n("&Details"), "viewmag", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDetails()), actionCollection(), "details");
368
+	detailAction=new TDEAction(i18n("&Details"), "viewmag", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDetails()), actionCollection(), "details");
369 369
 	detailAction->setToolTip(i18n("Display details on the currently selected line"));
370 370
 	detailAction->setWhatsThis(i18n("Displays a dialog box which contains details on the currently selected line. You are able to navigate through the logs from this dialog box with the <b>Previous</b> / <b>Next</b> buttons."));
371 371
 	detailAction->setEnabled(false);
372 372
 
373
-	tooltipEnabledAction=new KToggleAction(i18n("&Enable Detailed Tooltips"), 0, actionCollection(), "enable_tooltip");
373
+	tooltipEnabledAction=new TDEToggleAction(i18n("&Enable Detailed Tooltips"), 0, actionCollection(), "enable_tooltip");
374 374
 	tooltipEnabledAction->setToolTip(i18n("Disable/Enable the tooltips on the current view"));
375 375
 	tooltipEnabledAction->setWhatsThis(i18n("Disables/Enables the tooltips displayed when the cursor hovers a log line."));
376 376
 	
377 377
 	
378 378
 	connect(tooltipEnabledAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotTooltipEnabled(bool)));
379 379
 	
380
-	newLinesDisplayedAction=new KToggleAction(i18n("&Display New Lines"), 0, actionCollection(), "display_new_line");
380
+	newLinesDisplayedAction=new TDEToggleAction(i18n("&Display New Lines"), 0, actionCollection(), "display_new_line");
381 381
 	newLinesDisplayedAction->setToolTip(i18n("Display or not new lines if the log changes"));
382 382
 	newLinesDisplayedAction->setWhatsThis(i18n("Displays or not the new lines if the log changes. This option is useful when you want to see an old log lines and that KSystemLog often refreshes the current view."));
383 383
 	
@@ -394,7 +394,7 @@ void KSystemLog::setupLogActions() {
394 394
 	
395 395
 	//Define a macro allowing the connection of the signal from log action to the slotLogAction object
396 396
 	#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
397
-		#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(KAction::ActivationReason, TQt::ButtonState)));
397
+		#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(TDEAction::ActivationReason, TQt::ButtonState)));
398 398
 	#else
399 399
 		#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated()), slotLogAction, TQT_SLOT(slotLogAction()));
400 400
 	#endif
@@ -406,7 +406,7 @@ void KSystemLog::setupLogActions() {
406 406
 	TQString exclusiveGroup="LogActions";
407 407
 
408 408
 	//System Log Action
409
-	KToggleAction* systemAction=new KToggleAction(i18n("S&ystem Log"), SYSTEM_MODE_ICON, 0, NULL, NULL, actionCollection(), "system_log" );
409
+	TDEToggleAction* systemAction=new TDEToggleAction(i18n("S&ystem Log"), SYSTEM_MODE_ICON, 0, NULL, NULL, actionCollection(), "system_log" );
410 410
 	systemAction->setToolTip(i18n("Display the system log."));
411 411
 	systemAction->setWhatsThis(i18n("Displays the system log in the current tab. This log is generally used by non-specialized processes (like \"sudo\" or \"fsck\" commands)"));
412 412
 	systemAction->setExclusiveGroup(exclusiveGroup);
@@ -414,7 +414,7 @@ void KSystemLog::setupLogActions() {
414 414
 	CONNECTED_SLOT(systemAction)
415 415
 	
416 416
 	//Kernel Log Action
417
-	KToggleAction* kernelAction=new KToggleAction(i18n("&Kernel Log"), KERNEL_MODE_ICON, 0, NULL, NULL, actionCollection(), "kernel_log" );
417
+	TDEToggleAction* kernelAction=new TDEToggleAction(i18n("&Kernel Log"), KERNEL_MODE_ICON, 0, NULL, NULL, actionCollection(), "kernel_log" );
418 418
 	kernelAction->setToolTip(i18n("Display the kernel log."));
419 419
 	kernelAction->setWhatsThis(i18n("<qt>Displays the kernel log in the current tab. This log is only useful for users who want to know why the Kernel does not detect their hardware or what is the cause of the last <i>kernel panic/oops</i>.</qt>"));
420 420
 	kernelAction->setExclusiveGroup(exclusiveGroup);
@@ -422,7 +422,7 @@ void KSystemLog::setupLogActions() {
422 422
 	CONNECTED_SLOT(kernelAction)
423 423
 	
424 424
 	//Boot Log Action
425
-	KToggleAction* bootAction=new KToggleAction(i18n("&Boot Log"), BOOT_MODE_ICON, 0, NULL, NULL, actionCollection(), "boot_log" );
425
+	TDEToggleAction* bootAction=new TDEToggleAction(i18n("&Boot Log"), BOOT_MODE_ICON, 0, NULL, NULL, actionCollection(), "boot_log" );
426 426
 	bootAction->setToolTip(i18n("Display the boot log."));
427 427
 	bootAction->setWhatsThis(i18n("<qt>Displays the boot log in the current tab. This log is useful if you want to verify if all startup services have been correctly started.</qt>"));
428 428
 	bootAction->setExclusiveGroup(exclusiveGroup);
@@ -430,7 +430,7 @@ void KSystemLog::setupLogActions() {
430 430
 	CONNECTED_SLOT(bootAction)
431 431
 	
432 432
 	//Authentication Log Action
433
-	KToggleAction* authenticationAction=new KToggleAction(i18n("A&uthentication Log"), AUTHENTICATION_MODE_ICON, 0, NULL, NULL, actionCollection(), "authentication_log" );
433
+	TDEToggleAction* authenticationAction=new TDEToggleAction(i18n("A&uthentication Log"), AUTHENTICATION_MODE_ICON, 0, NULL, NULL, actionCollection(), "authentication_log" );
434 434
 	authenticationAction->setToolTip(i18n("Display the authentication log."));
435 435
 	authenticationAction->setWhatsThis(i18n("<qt>Displays the authentication log in the current tab. This log displays all log in made by each user of the system, and can help you to know if someone tried to crack your system.</qt>"));
436 436
 	authenticationAction->setExclusiveGroup(exclusiveGroup);
@@ -438,7 +438,7 @@ void KSystemLog::setupLogActions() {
438 438
 	CONNECTED_SLOT(authenticationAction)
439 439
 	
440 440
 	//Daemon Log Action
441
-	KToggleAction* daemonAction=new KToggleAction(i18n("&Daemons Log"), DAEMON_MODE_ICON, 0, NULL, NULL, actionCollection(), "daemon_log" );
441
+	TDEToggleAction* daemonAction=new TDEToggleAction(i18n("&Daemons Log"), DAEMON_MODE_ICON, 0, NULL, NULL, actionCollection(), "daemon_log" );
442 442
 	daemonAction->setToolTip(i18n("Display the daemons log."));
443 443
 	daemonAction->setWhatsThis(i18n("<qt>Displays the daemons log in the current tab. The daemons are all processes launched in the background of the system. See this log if you want to know what it occurs in the background of your system.</qt>"));
444 444
 	daemonAction->setExclusiveGroup(exclusiveGroup);
@@ -446,7 +446,7 @@ void KSystemLog::setupLogActions() {
446 446
 	CONNECTED_SLOT(daemonAction)
447 447
 	
448 448
 	//Cron Log Action
449
-	KToggleAction* cronAction=new KToggleAction(i18n("&Planned Tasks Cron Log"), CRON_MODE_ICON, 0, NULL, NULL, actionCollection(), "cron_log" );
449
+	TDEToggleAction* cronAction=new TDEToggleAction(i18n("&Planned Tasks Cron Log"), CRON_MODE_ICON, 0, NULL, NULL, actionCollection(), "cron_log" );
450 450
 	cronAction->setToolTip(i18n("Display the planned tasks log (or Cron log)."));
451 451
 	cronAction->setWhatsThis(i18n("<qt>Displays the planned tasks log in the current tab. Cron process is a program in charged of launching planned tasks on your system, like security checks, or auto-restarting of some services. Use this menu to see the last-launched processes.</qt>"));
452 452
 	cronAction->setExclusiveGroup(exclusiveGroup);
@@ -454,7 +454,7 @@ void KSystemLog::setupLogActions() {
454 454
 	CONNECTED_SLOT(cronAction)
455 455
 	
456 456
 	//Xorg Log Action
457
-	KToggleAction* xorgAction=new KToggleAction(i18n("&X.org Log"), XORG_MODE_ICON, 0, NULL, NULL, actionCollection(), "xorg_log" );
457
+	TDEToggleAction* xorgAction=new TDEToggleAction(i18n("&X.org Log"), XORG_MODE_ICON, 0, NULL, NULL, actionCollection(), "xorg_log" );
458 458
 	xorgAction->setToolTip(i18n("Display the X.org log."));
459 459
 	xorgAction->setWhatsThis(i18n("<qt>Displays the X.org log in the current tab. X.org is the service which displays on screen your desktop and manage your graphical hardware. See this log if you want to know why you do not have 3D accelerations or why your input device is not recognized.</qt>"));
460 460
 	xorgAction->setExclusiveGroup(exclusiveGroup);
@@ -462,7 +462,7 @@ void KSystemLog::setupLogActions() {
462 462
 	CONNECTED_SLOT(xorgAction)
463 463
 	
464 464
 	//ACPId Log Action
465
-	KToggleAction* acpidAction=new KToggleAction(i18n("&ACPI Log"), ACPID_MODE_ICON, 0, NULL, NULL, actionCollection(), "acpid_log" );
465
+	TDEToggleAction* acpidAction=new TDEToggleAction(i18n("&ACPI Log"), ACPID_MODE_ICON, 0, NULL, NULL, actionCollection(), "acpid_log" );
466 466
 	acpidAction->setToolTip(i18n("Display the ACPI log."));
467 467
 	acpidAction->setWhatsThis(i18n("<qt>Displays the ACPI log in the current tab. ACPI is used to manage the hardware components of your computer, like notebook batteries, reset buttons...</qt>"));
468 468
 	acpidAction->setExclusiveGroup(exclusiveGroup);
@@ -470,7 +470,7 @@ void KSystemLog::setupLogActions() {
470 470
 	CONNECTED_SLOT(acpidAction)
471 471
 
472 472
 	//Cups Log Action
473
-	KToggleAction* cupsAction=new KToggleAction(i18n("&Cups Log"), CUPS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_log" );
473
+	TDEToggleAction* cupsAction=new TDEToggleAction(i18n("&Cups Log"), CUPS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_log" );
474 474
 	cupsAction->setToolTip(i18n("Display the Cups log."));
475 475
 	cupsAction->setWhatsThis(i18n("<qt>Displays the CUPS log in the current tab. CUPS is the program which manage printing on your computer.</qt>"));
476 476
 	cupsAction->setExclusiveGroup(exclusiveGroup);
@@ -478,7 +478,7 @@ void KSystemLog::setupLogActions() {
478 478
 	CONNECTED_SLOT(cupsAction)
479 479
 
480 480
 	//Cups Access Log Action
481
-	KToggleAction* cupsAccessAction=new KToggleAction(i18n("&Cups Web Log"), CUPS_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_access_log" );
481
+	TDEToggleAction* cupsAccessAction=new TDEToggleAction(i18n("&Cups Web Log"), CUPS_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_access_log" );
482 482
 	cupsAccessAction->setToolTip(i18n("Display the CUPS Web Server Access log."));
483 483
 	cupsAccessAction->setWhatsThis(i18n("<qt>Displays the CUPS Web Server Access log in the current tab. CUPS is the program which manage printing on your computer. This log saves all requests performed to the CUPS embedded web server (default: <i>http://localhost:631</i>).</qt>"));
484 484
 	cupsAccessAction->setExclusiveGroup(exclusiveGroup);
@@ -487,7 +487,7 @@ void KSystemLog::setupLogActions() {
487 487
 	
488 488
 
489 489
 	//Apache Log Action
490
-	KToggleAction* apacheAction=new KToggleAction(i18n("&Apache log"), APACHE_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_log" );
490
+	TDEToggleAction* apacheAction=new TDEToggleAction(i18n("&Apache log"), APACHE_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_log" );
491 491
 	apacheAction->setToolTip(i18n("Display the Apache log."));
492 492
 	apacheAction->setWhatsThis(i18n("<qt>Displays the Apache log in the current tab. Apache is the main used Web server in the world.</qt>"));
493 493
 	apacheAction->setExclusiveGroup(exclusiveGroup);
@@ -495,7 +495,7 @@ void KSystemLog::setupLogActions() {
495 495
 	CONNECTED_SLOT(apacheAction)
496 496
 
497 497
 	//Apache Access Log Action
498
-	KToggleAction* apacheAccessAction=new KToggleAction(i18n("&Apache Web log"), APACHE_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_access_log" );
498
+	TDEToggleAction* apacheAccessAction=new TDEToggleAction(i18n("&Apache Web log"), APACHE_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_access_log" );
499 499
 	apacheAccessAction->setToolTip(i18n("Display the Apache Access log."));
500 500
 	apacheAccessAction->setWhatsThis(i18n("<qt>Displays the Apache Access log in the current tab. CUPS is the program which manage printing on your computer. This log saves all requests performed by the Apache web server.</qt>"));
501 501
 	apacheAccessAction->setExclusiveGroup(exclusiveGroup);
@@ -503,7 +503,7 @@ void KSystemLog::setupLogActions() {
503 503
 	CONNECTED_SLOT(apacheAccessAction)
504 504
 	
505 505
 	//Mail Log Action
506
-	KToggleAction* mailAction=new KToggleAction(i18n("&Mail Log"), MAIL_MODE_ICON, 0, NULL, NULL, actionCollection(), "mail_log" );
506
+	TDEToggleAction* mailAction=new TDEToggleAction(i18n("&Mail Log"), MAIL_MODE_ICON, 0, NULL, NULL, actionCollection(), "mail_log" );
507 507
 	mailAction->setToolTip(i18n("Display the Mail log."));
508 508
 	mailAction->setWhatsThis(i18n("<qt>Displays the mail log in the current tab. Mail is the most known and used mail server in the Linux world.</qt>"));
509 509
 	mailAction->setExclusiveGroup(exclusiveGroup);
@@ -511,7 +511,7 @@ void KSystemLog::setupLogActions() {
511 511
 	CONNECTED_SLOT(mailAction)
512 512
 	
513 513
 	//Samba Log Action
514
-	KToggleAction* sambaAction=new KToggleAction(i18n("&Samba Log"), SAMBA_MODE_ICON, 0, NULL, NULL, actionCollection(), "samba_log" );
514
+	TDEToggleAction* sambaAction=new TDEToggleAction(i18n("&Samba Log"), SAMBA_MODE_ICON, 0, NULL, NULL, actionCollection(), "samba_log" );
515 515
 	sambaAction->setToolTip(i18n("Display the Samba log."));
516 516
 	sambaAction->setWhatsThis(i18n("<qt>Displays the Samba log in the current tab. Samba is the file sharing server which interacts with Microsoft Windows network.</qt>"));
517 517
 	sambaAction->setExclusiveGroup(exclusiveGroup);
@@ -896,10 +896,10 @@ void KSystemLog::resumeParsing() {
896 896
 
897 897
 //If no actions are selected, than all are deselected
898 898
 void KSystemLog::deactiveLogActions() {
899
-	TQValueList<KToggleAction*> actions=mapActionLogModes.keys();
899
+	TQValueList<TDEToggleAction*> actions=mapActionLogModes.keys();
900 900
 	
901
-	KToggleAction* action;
902
-	TQValueList<KToggleAction*>::iterator it;
901
+	TDEToggleAction* action;
902
+	TQValueList<TDEToggleAction*>::iterator it;
903 903
 	for (it=actions.begin(); it!=actions.end(); ++it) {
904 904
 		action=*it;
905 905
 		
@@ -908,17 +908,17 @@ void KSystemLog::deactiveLogActions() {
908 908
 	
909 909
 }
910 910
 
911
-KToggleAction* KSystemLog::getCorrespondingLogAction(LogMode* mode) {
911
+TDEToggleAction* KSystemLog::getCorrespondingLogAction(LogMode* mode) {
912 912
 	//Special case for no and opening mode
913 913
 	//TODO Maybe use a list for "special" log mode, and pre-test the parameter with it
914 914
 	if (mode==Globals::noMode || mode==Globals::openingMode)
915 915
 		return(NULL);
916 916
 
917
-	TQValueList<KToggleAction*> keys=mapActionLogModes.keys();
917
+	TQValueList<TDEToggleAction*> keys=mapActionLogModes.keys();
918 918
 	
919
-	TQValueList<KToggleAction*>::iterator it;
919
+	TQValueList<TDEToggleAction*>::iterator it;
920 920
 	
921
-	KToggleAction* key;
921
+	TDEToggleAction* key;
922 922
 	
923 923
 	
924 924
 	for (it=keys.begin(); it!=keys.end(); ++it) {
@@ -933,17 +933,17 @@ KToggleAction* KSystemLog::getCorrespondingLogAction(LogMode* mode) {
933 933
 }
934 934
 
935 935
 
936
-KToggleAction* KSystemLog::getLogAction(const char* name) {
937
-	return( static_cast<KToggleAction*> (actionCollection()->action(name)) );
936
+TDEToggleAction* KSystemLog::getLogAction(const char* name) {
937
+	return( static_cast<TDEToggleAction*> (actionCollection()->action(name)) );
938 938
 }
939 939
 
940 940
 #if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
941
-void KSystemLog::logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state) {
941
+void KSystemLog::logActionClicked(const TQObject* sender, TDEAction::ActivationReason reason, TQt::ButtonState state) {
942 942
 #else
943 943
 void KSystemLog::logActionClicked(const TQObject* sender) {
944 944
 #endif
945 945
 	
946
-	KToggleAction* action=getLogAction(sender->name());
946
+	TDEToggleAction* action=getLogAction(sender->name());
947 947
 	
948 948
 	LogMode* mode=mapActionLogModes[action];
949 949
 	
@@ -1317,10 +1317,10 @@ void KSystemLog::dragEnterEvent(TQDragEnterEvent *event) {
1317 1317
 }
1318 1318
 
1319 1319
 void KSystemLog::setupGroupBy() {
1320
-	groupBy=new KActionMenu(i18n("Group By"), SmallIcon(GROUP_BY_ICON), TQT_TQOBJECT(this), "group_by");
1320
+	groupBy=new TDEActionMenu(i18n("Group By"), SmallIcon(GROUP_BY_ICON), TQT_TQOBJECT(this), "group_by");
1321 1321
 	actionCollection()->insert(groupBy);
1322 1322
 
1323
-	KPopupMenu* menu=groupBy->popupMenu();
1323
+	TDEPopupMenu* menu=groupBy->popupMenu();
1324 1324
 	
1325 1325
 	menu->insertItem(SmallIcon(NO_GROUP_BY_ICON), i18n("None"), NO_GROUP_BY);
1326 1326
 	
@@ -1341,7 +1341,7 @@ void KSystemLog::setupGroupBy() {
1341 1341
 }
1342 1342
 
1343 1343
 void KSystemLog::groupByChanged(int group) {
1344
-	KPopupMenu* menu=groupBy->popupMenu();
1344
+	TDEPopupMenu* menu=groupBy->popupMenu();
1345 1345
 
1346 1346
 	for(int i=0; i<(int) menu->count(); ++i) {
1347 1347
 		menu->setItemChecked(menu->idAt(i), false);
@@ -1374,9 +1374,9 @@ void KSystemLog::updateGroupBy() {
1374 1374
 
1375 1375
 	kdDebug() << "Updating group by..." << endl;
1376 1376
 	
1377
-	KPopupMenu* menu=groupBy->popupMenu();
1377
+	TDEPopupMenu* menu=groupBy->popupMenu();
1378 1378
 	
1379
-	//First : removing old KAction
1379
+	//First : removing old TDEAction
1380 1380
 	//The deleting begins at default groupby count + 2 separator (in the menu)
1381 1381
 	int deleting=DEFAULT_GROUP_BY_COUNT+2;
1382 1382
 	int end=menu->count();

+ 25
- 25
ksystemlog/src/ksystemlog.h View File

@@ -67,7 +67,7 @@ typedef TQValueList<LogFile*> LogFiles;
67 67
 
68 68
 
69 69
 class KPrinter;
70
-class KToggleAction;
70
+class TDEToggleAction;
71 71
 class KURL;
72 72
 
73 73
 /**
@@ -78,7 +78,7 @@ class KURL;
78 78
  * @author Nicolas Ternisien <nicolas.ternisien@gmail.com>
79 79
  * @version 0.1
80 80
  */
81
-class KSystemLog : public KMainWindow {
81
+class KSystemLog : public TDEMainWindow {
82 82
 
83 83
 	Q_OBJECT
84 84
   
@@ -110,7 +110,7 @@ class KSystemLog : public KMainWindow {
110 110
 	
111 111
 #if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
112 112
 		//Actual KDE method
113
-		void logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state);
113
+		void logActionClicked(const TQObject* sender, TDEAction::ActivationReason reason, TQt::ButtonState state);
114 114
 #else
115 115
 		//Method for old versions of KDE
116 116
 		void logActionClicked(const TQObject* sender);
@@ -209,8 +209,8 @@ class KSystemLog : public KMainWindow {
209 209
 		/**
210 210
 		 * Get the Log Action called name from actionCollection()
211 211
 		 */
212
-		KToggleAction* getLogAction(const char* name);
213
-		KToggleAction* getCorrespondingLogAction(LogMode* mode);
212
+		TDEToggleAction* getLogAction(const char* name);
213
+		TDEToggleAction* getCorrespondingLogAction(LogMode* mode);
214 214
 		
215 215
 		void setupStatusBar();
216 216
 		
@@ -235,37 +235,37 @@ class KSystemLog : public KMainWindow {
235 235
 		
236 236
 		KPrinter* printer;
237 237
 		
238
-		KAction* newTabAction;
239
-		KAction* closeTabAction;
240
-		KAction* duplicateTabAction;
238
+		TDEAction* newTabAction;
239
+		TDEAction* closeTabAction;
240
+		TDEAction* duplicateTabAction;
241 241
 		
242
-		KAction* moveTabLeftAction;
243
-		KAction* moveTabRightAction;
242
+		TDEAction* moveTabLeftAction;
243
+		TDEAction* moveTabRightAction;
244 244
 				
245
-		KAction* saveAction;
246
-		KAction* copyAction;
245
+		TDEAction* saveAction;
246
+		TDEAction* copyAction;
247 247
 		
248
-		KAction* sendMailAction;
249
-		KAction* logMessageAction;
248
+		TDEAction* sendMailAction;
249
+		TDEAction* logMessageAction;
250 250
 
251
-		KToggleAction* filterBarAction;
251
+		TDEToggleAction* filterBarAction;
252 252
 
253
-		KAction* reloadAction;
253
+		TDEAction* reloadAction;
254 254
 
255
-		KAction* expandAllAction;
256
-		KAction* collapseAllAction;
255
+		TDEAction* expandAllAction;
256
+		TDEAction* collapseAllAction;
257 257
 		
258
-		KAction* resumeParsingAction;
259
-		KAction* pauseParsingAction;
260
-		KAction* detailAction;
258
+		TDEAction* resumeParsingAction;
259
+		TDEAction* pauseParsingAction;
260
+		TDEAction* detailAction;
261 261
 		
262
-		KToggleAction* tooltipEnabledAction;
263
-		KToggleAction* newLinesDisplayedAction;
262
+		TDEToggleAction* tooltipEnabledAction;
263
+		TDEToggleAction* newLinesDisplayedAction;
264 264
 		
265 265
 		/**
266 266
 		 * The Group By Action Menu
267 267
 		 */
268
-		KActionMenu* groupBy;
268
+		TDEActionMenu* groupBy;
269 269
 
270 270
 		/**
271 271
 		 * A pointer to the Detail dialog
@@ -287,7 +287,7 @@ class KSystemLog : public KMainWindow {
287 287
 		 */
288 288
 		KTabWidget* tabs;
289 289
 	
290
-		TQMap<KToggleAction*, LogMode*> mapActionLogModes;
290
+		TQMap<TDEToggleAction*, LogMode*> mapActionLogModes;
291 291
 
292 292
 };
293 293
 

+ 5
- 5
ksystemlog/src/logLineFilter.cpp View File

@@ -30,8 +30,8 @@
30 30
 
31 31
 #include "logLineFilter.h"
32 32
 
33
-LogLineFilter::LogLineFilter(TQWidget* parent, KListView* listView, const char* name) :
34
-	KListViewSearchLine(parent, listView, name) {
33
+LogLineFilter::LogLineFilter(TQWidget* parent, TDEListView* listView, const char* name) :
34
+	TDEListViewSearchLine(parent, listView, name) {
35 35
 
36 36
 	drawFilterMessage = true;
37 37
 	
@@ -40,7 +40,7 @@ LogLineFilter::LogLineFilter(TQWidget* parent, KListView* listView, const char*
40 40
 
41 41
 
42 42
 void LogLineFilter::drawContents(TQPainter *p) {
43
-    KListViewSearchLine::drawContents( p );
43
+    TDEListViewSearchLine::drawContents( p );
44 44
 
45 45
     if ( drawFilterMessage == true && !hasFocus() ) {
46 46
         TQPen tmp = p->pen();
@@ -63,7 +63,7 @@ void LogLineFilter::focusInEvent( TQFocusEvent *ev )
63 63
         drawFilterMessage = false;
64 64
         repaint();
65 65
     }
66
-    KListViewSearchLine::focusInEvent( ev );
66
+    TDEListViewSearchLine::focusInEvent( ev );
67 67
 }
68 68
 
69 69
 
@@ -73,7 +73,7 @@ void LogLineFilter::focusOutEvent( TQFocusEvent *ev )
73 73
         drawFilterMessage = true;
74 74
         repaint();
75 75
     }
76
-    KListViewSearchLine::focusOutEvent( ev );
76
+    TDEListViewSearchLine::focusOutEvent( ev );
77 77
 }
78 78
 
79 79
 

+ 2
- 2
ksystemlog/src/logLineFilter.h View File

@@ -37,10 +37,10 @@
37 37
   @short LineEdit with customizable "Click here" text
38 38
   @author Nicolas Ternisien
39 39
 */
40
-class LogLineFilter : public KListViewSearchLine
40
+class LogLineFilter : public TDEListViewSearchLine
41 41
 {
42 42
     public:
43
-        LogLineFilter(TQWidget* parent=NULL, KListView* listView=NULL, const char* name=NULL);
43
+        LogLineFilter(TQWidget* parent=NULL, TDEListView* listView=NULL, const char* name=NULL);
44 44
 
45 45
     protected:
46 46
         virtual void drawContents( TQPainter *p );

+ 11
- 11
ksystemlog/src/logListItem.cpp View File

@@ -46,14 +46,14 @@
46 46
 
47 47
 
48 48
 LogListItem::LogListItem(TQListView* list, LogLine* l) :
49
-	KListViewItem(list),
49
+	TDEListViewItem(list),
50 50
 	line(l)
51 51
 	{
52 52
 
53 53
 }
54 54
 
55 55
 LogListItem::LogListItem(TQListViewItem* parent, LogLine* l) :
56
-	KListViewItem(parent),
56
+	TDEListViewItem(parent),
57 57
 	line(l)
58 58
 	{
59 59
 
@@ -133,15 +133,15 @@ TQString LogListItem::exportToText() {
133 133
 
134 134
 void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align) {
135 135
 	/* For debugging
136
-	KListViewItem::paintCell( p, cg, column, width, align );
136
+	TDEListViewItem::paintCell( p, cg, column, width, align );
137 137
 	return;
138 138
 	*/
139 139
 	
140
-	//Get the KListView item
141
-	KListView* lv = (KListView *) listView();
140
+	//Get the TDEListView item
141
+	TDEListView* lv = (TDEListView *) listView();
142 142
 	if (lv==NULL) {
143
-		kdDebug() << "LogListItem::paintCell() : KListView null" << endl;
144
-		KListViewItem::paintCell( p, cg, column, width, align );
143
+		kdDebug() << "LogListItem::paintCell() : TDEListView null" << endl;
144
+		TDEListViewItem::paintCell( p, cg, column, width, align );
145 145
 		return;
146 146
 	}
147 147
 	
@@ -149,10 +149,10 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
149 149
 	static TQPixmap buffer;
150 150
 	buffer.resize(width, height());
151 151
 
152
-	//If there is a problem, let KListViewItem class draw this item
152
+	//If there is a problem, let TDEListViewItem class draw this item
153 153
 	if( buffer.isNull() ) {
154 154
 		kdDebug() << "LogListItem::paintCell() : TQPixmap null" << endl;
155
-		KListViewItem::paintCell(p, cg, column, width, align);
155
+		TDEListViewItem::paintCell(p, cg, column, width, align);
156 156
 		return;
157 157
 	}
158 158
 
@@ -275,7 +275,7 @@ static TQPixmap buffer;
275 275
 buffer.resize( width, height() );
276 276
 
277 277
 if( buffer.isNull() ) {
278
-	KListViewItem::paintCell( p, cg, column, width, align );
278
+	TDEListViewItem::paintCell( p, cg, column, width, align );
279 279
 	return;
280 280
 }
281 281
 
@@ -289,7 +289,7 @@ if( detailedView ) {
289 289
 	pBuf.drawLine( 0, 0, width, 0 );
290 290
 }
291 291
 
292
-KListView *lv = (KListView *)listView();
292
+TDEListView *lv = (TDEListView *)listView();
293 293
 
294 294
 TQRect rect( ((lv->treeStepSize()-9) / 2) + 1, (height()-9) / 2, 9, 9 );
295 295
 

+ 1
- 1
ksystemlog/src/logListItem.h View File

@@ -45,7 +45,7 @@ class XorgLogLine;
45 45
 /**
46 46
  * @author Nicolas Ternisien
47 47
  */
48
-class LogListItem : public KListViewItem {
48
+class LogListItem : public TDEListViewItem {
49 49
 	
50 50
 	public:
51 51
 		LogListItem(TQListView* list, LogLine* l);

+ 2
- 2
ksystemlog/src/logManager.cpp View File

@@ -557,9 +557,9 @@ void LogManager::synchronize(LogLineList* buffer) {
557 557
 	
558 558
 	//Here to find a bug
559 559
 	if (view->getLogList()==NULL)
560
-		kdDebug() << "ERROR! KListView NULL" << endl;
560
+		kdDebug() << "ERROR! TDEListView NULL" << endl;
561 561
 	else
562
-		kdDebug() << "KListView not NULL" << endl;
562
+		kdDebug() << "TDEListView not NULL" << endl;
563 563
 	
564 564
 	if (isNewLinesDisplayed()==true) {
565 565
 		if (line!=NULL) {

+ 1
- 1
ksystemlog/src/slotLogAction.cpp View File

@@ -37,7 +37,7 @@ SlotLogAction::SlotLogAction(KSystemLog* p) :
37 37
 }
38 38
 
39 39
 #if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,4,0))
40
-void SlotLogAction::slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state) {
40
+void SlotLogAction::slotLogAction(TDEAction::ActivationReason reason, TQt::ButtonState state) {
41 41
 	const TQObject* sender=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQObject::sender()));
42 42
 	
43 43
 	//We can call the correct method from KSystemLog, which manage the two parameters

+ 1
- 1
ksystemlog/src/slotLogAction.h View File

@@ -40,7 +40,7 @@ class SlotLogAction : public TQObject {
40 40
 		/**
41 41
 		 * This header contains the normal version of the main slot
42 42
 		 */
43
-		void slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state);
43
+		void slotLogAction(TDEAction::ActivationReason reason, TQt::ButtonState state);
44 44
 	
45 45
 	private:
46 46
 		KSystemLog* parent;

+ 1
- 1
ksystemlog/src/specificFileList.cpp View File

@@ -114,7 +114,7 @@ void SpecificFileList::changeItemType() {
114 114
 	topContents.setMinimumSize(TQSize(100, 230));
115 115
 	
116 116
 	TQLabel text(i18n("Please select the type of this file:"), &topContents);
117
-	KListBox choiceList(&topContents, "type_list");
117
+	TDEListBox choiceList(&topContents, "type_list");
118 118
 	
119 119
 	TQToolTip::add(choiceList.viewport(), i18n("List of existing log levels"));
120 120
 	TQWhatsThis::add(choiceList.viewport(), i18n("<qt>This is the list of all existing log levels. Please select one of them to be used for the selected files of the list.</qt>"));

+ 8
- 8
ksystemlog/src/view.cpp View File

@@ -75,7 +75,7 @@ View::View(TQWidget *parent) :
75 75
 	filterBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
76 76
 	
77 77
 	
78
-	clearSearch=new KToolBarButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, filterBar);
78
+	clearSearch=new TDEToolBarButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, filterBar);
79 79
 	clearSearch->setText(i18n("Clear the filter"));
80 80
 	
81 81
 	TQWhatsThis::add(clearSearch, i18n("This button clears the filter in one click."));
@@ -84,7 +84,7 @@ View::View(TQWidget *parent) :
84 84
 	
85 85
 	TQLabel* label=new TQLabel(i18n("Filter:"), filterBar);
86 86
 	
87
-	search=new LogLineFilter(filterBar, (KListView*)NULL);
87
+	search=new LogLineFilter(filterBar, (TDEListView*)NULL);
88 88
 	label->setBuddy(search);
89 89
 	
90 90
 	TQWhatsThis::add(search, i18n("Allows you to select only list items that match the content of this text."));
@@ -302,7 +302,7 @@ void View::updateList() {
302 302
 
303 303
 void View::initLogList() {
304 304
 	
305
-	table=new KListView(this, "log_list");
305
+	table=new TDEListView(this, "log_list");
306 306
 
307 307
 	TQWhatsThis::add(table, i18n("<qt><p>This is the main view of KSystemLog. It displays the last lines of the selected log. Please see the documentation to discovers the meaning of each icons and existing log.</p><p>Log lines in <b>bold</b> are the last added to the list.</p></qt>"));
308 308
 	
@@ -314,7 +314,7 @@ void View::initLogList() {
314 314
 	table->setShowSortIndicator(true);
315 315
 	table->setAllColumnsShowFocus(true);
316 316
 	
317
-	//This method is not implemented for the moment by KListView class
317
+	//This method is not implemented for the moment by TDEListView class
318 318
 	table->setAutoOpen(false);
319 319
 	
320 320
 	//This is buggy but it's not my fault (I hope :-)
@@ -324,7 +324,7 @@ void View::initLogList() {
324 324
 	TQColor* alternate=new TQColor(246,246,255);
325 325
 	table->setAlternateBackground(*alternate);
326 326
 	
327
-	table->setSelectionModeExt(KListView::Extended);
327
+	table->setSelectionModeExt(TDEListView::Extended);
328 328
 	
329 329
 	toolTip=new ViewToolTip(this->getLogList()->viewport(), this);
330 330
 
@@ -383,7 +383,7 @@ void View::initSearchFilter(TQWidget* filterBox) {
383 383
 void View::addElement(TQStringList* entries, TQPixmap* icon) {
384 384
 	TQStringList::Iterator it = entries->begin();
385 385
 	
386
-	KListViewItem* item=new KListViewItem(table, *(it++), *(it++), *(it++), *(it++), *(it++));
386
+	TDEListViewItem* item=new TDEListViewItem(table, *(it++), *(it++), *(it++), *(it++), *(it++));
387 387
 	if (icon!=NULL)
388 388
 		item->setPixmap(0, *icon);
389 389
 	
@@ -392,12 +392,12 @@ void View::addElement(TQStringList* entries, TQPixmap* icon) {
392 392
 void View::addElementAtEnd(TQStringList* entries, TQPixmap* icon) {
393 393
 	TQStringList::Iterator it = entries->begin();
394 394
 	
395
-	KListViewItem* item=new KListViewItem(table, table->lastItem(), *(it++), *(it++), *(it++), *(it++), *(it++));
395
+	TDEListViewItem* item=new TDEListViewItem(table, table->lastItem(), *(it++), *(it++), *(it++), *(it++), *(it++));
396 396
 	if (icon!=NULL)
397 397
 		item->setPixmap(0, *icon);
398 398
 }
399 399
 
400
-KListView* View::getLogList() {
400
+TDEListView* View::getLogList() {
401 401
 	return(table);
402 402
 }
403 403
 

+ 4
- 4
ksystemlog/src/view.h View File

@@ -104,7 +104,7 @@ class View : public TQWidget, public KSystemLogInterface {
104 104
 		
105 105
 		bool isTooltipEnabled();
106 106
 		
107
-		KListView* getLogList();
107
+		TDEListView* getLogList();
108 108
 		
109 109
 		void saveConfig();
110 110
 		
@@ -165,15 +165,15 @@ class View : public TQWidget, public KSystemLogInterface {
165 165
 		/**
166 166
 		 * Central table
167 167
 		 */
168
-		KListView* table;
168
+		TDEListView* table;
169 169
 		
170 170
 #if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,3,0))
171 171
 		TQHBox* filterBar;
172 172
 		
173
-		KToolBarButton* clearSearch;
173
+		TDEToolBarButton* clearSearch;
174 174
 		
175 175
 		/**
176
-		 * Search line (inherits from KListViewSearchLine)
176
+		 * Search line (inherits from TDEListViewSearchLine)
177 177
 		 */
178 178
 		LogLineFilter* search;
179 179
 			

Loading…
Cancel
Save