Browse Source

Rename a number of classes to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
a503c83523

+ 2
- 2
ksystemlog.kdevses View File

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

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

@@ -56,7 +56,7 @@ FileList::FileList(TQWidget *parent, TQString description) :
TQHBox* center= new TQHBox(dirBox);
center->setSpacing(10);
fileList=new KListBox(center);
fileList=new TDEListBox(center);
buttons=new TQVBox(center);
fileList->setSelectionMode(TQListBox::Extended);
@@ -91,7 +91,7 @@ FileList::FileList(TQWidget *parent, TQString description) :
TQToolTip::add(removeAll, i18n("Remove all files"));
TQWhatsThis::add(removeAll, i18n("<qt>Remove all files of the list, even if they are not selected.</qt>"));

fileListMenu=new KPopupMenu(this);
fileListMenu=new TDEPopupMenu(this);
fileListMenu->insertTitle(i18n("File List"));
fileListMenu->insertItem(SmallIcon("fileopen"), i18n("&Add File..."), this, TQT_SLOT(addItem()), 0, ADD_FILE_MENU_ID);
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 {
TQVBox* buttons;
KPopupMenu* fileListMenu;
TDEPopupMenu* fileListMenu;
KListBox* fileList;
TDEListBox* fileList;
private:

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

@@ -64,7 +64,7 @@ void FindManager::slotFirstFind() {
kdDebug() << "First Find" << endl;
LogManager* currentManager=main->activeLogManager();
KListView* list=currentManager->getView()->getLogList();
TDEListView* list=currentManager->getView()->getLogList();
//Delete the previous KFind object (if it exists)
if (findManager!=NULL) {
@@ -190,7 +190,7 @@ void FindManager::slotFindNext() {

void FindManager::highlightSearch(const TQString& /*text*/, int /*matchingIndex*/, int /*matchingLength*/) {
LogManager* currentManager=main->activeLogManager();
KListView* list=currentManager->getView()->getLogList();
TDEListView* list=currentManager->getView()->getLogList();
if (previousItemFound!=NULL) {
list->setSelected(previousItemFound, false);

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

@@ -86,7 +86,7 @@
#include "readerFactory.h"

KSystemLog::KSystemLog() :
KMainWindow(0, "ksystemlog"),
TDEMainWindow(0, "ksystemlog"),
printer(NULL),
detailDialog(NULL),
loadingDialog(NULL),
@@ -117,7 +117,7 @@ KSystemLog::KSystemLog() :
//Setup the main tab bar
setupTabBar();
//TabBar widget becomes the central place of the KMainWindow
//TabBar widget becomes the central place of the TDEMainWindow
setCentralWidget(tabs);

//Setup the Progress Bar Dialog
@@ -248,7 +248,7 @@ void KSystemLog::currentTabChanged(TQWidget* /*widget*/) {
//Modify the menu button to help the user know what is the currently log mode
//setModeToAction(currentManager->getLogMode(), true);
KToggleAction* action=getCorrespondingLogAction(currentManager->getLogMode());
TDEToggleAction* action=getCorrespondingLogAction(currentManager->getLogMode());
if (action!=NULL)
action->setChecked(true);
@@ -295,22 +295,22 @@ void KSystemLog::setupActions() {
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."));
copyAction->setEnabled(false);
expandAllAction=new KAction(i18n("Ex&pand All"), NULL, CTRL+Key_X, TQT_TQOBJECT(this), NULL, actionCollection(), "expand_all" );
expandAllAction=new TDEAction(i18n("Ex&pand All"), NULL, CTRL+Key_X, TQT_TQOBJECT(this), NULL, actionCollection(), "expand_all" );
expandAllAction->setToolTip(i18n("Expand all categories"));
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>"));
expandAllAction->setEnabled(false);
collapseAllAction=new KAction(i18n("Col&lapse All"), NULL, CTRL+Key_L, TQT_TQOBJECT(this), NULL, actionCollection(), "collapse_all" );
collapseAllAction=new TDEAction(i18n("Col&lapse All"), NULL, CTRL+Key_L, TQT_TQOBJECT(this), NULL, actionCollection(), "collapse_all" );
collapseAllAction->setToolTip(i18n("Collapse all categories"));
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>"));
collapseAllAction->setEnabled(false);
sendMailAction=new KAction(i18n("&Email Selection..."), "mail_generic", CTRL+Key_M, TQT_TQOBJECT(this), NULL, actionCollection(), "send_mail" );
sendMailAction=new TDEAction(i18n("&Email Selection..."), "mail_generic", CTRL+Key_M, TQT_TQOBJECT(this), NULL, actionCollection(), "send_mail" );
sendMailAction->setToolTip(i18n("Send the selection by mail"));
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."));
sendMailAction->setEnabled(false);
logMessageAction=new KAction(i18n("&Send Message..."), "filenew", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLogMessage()), actionCollection(), "log_message" );
logMessageAction=new TDEAction(i18n("&Send Message..."), "filenew", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLogMessage()), actionCollection(), "log_message" );
logMessageAction->setToolTip(i18n("Send a message to the log system"));
logMessageAction->setWhatsThis(i18n("This action will open a dialog which lets you send a message to the log system."));
@@ -322,7 +322,7 @@ void KSystemLog::setupActions() {
KStdAction::findNext(findManager, TQT_SLOT(slotFindNext()), actionCollection(), "find_next");

//TODO Find a solution to display at the right place this action (see Akregator interface)
filterBarAction=new KToggleAction(i18n("Show &Filter Bar"), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar");
filterBarAction=new TDEToggleAction(i18n("Show &Filter Bar"), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFilterBar()), actionCollection(), "toggle_filter_bar");
#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
filterBarAction->setEnabled(true);
#else
@@ -331,53 +331,53 @@ void KSystemLog::setupActions() {

KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection());
newTabAction=new KAction(i18n("&New Tab"), "tab_new", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(newTab()), actionCollection(), "new_tab" );
newTabAction=new TDEAction(i18n("&New Tab"), "tab_new", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(newTab()), actionCollection(), "new_tab" );
newTabAction->setToolTip(i18n("Create a new tab"));
newTabAction->setWhatsThis(i18n("Creates a new tab which can display another log."));
closeTabAction=new KAction(i18n("&Close Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(closeTab()), actionCollection(), "close_tab" );
closeTabAction=new TDEAction(i18n("&Close Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(closeTab()), actionCollection(), "close_tab" );
closeTabAction->setToolTip(i18n("Close the current tab"));
closeTabAction->setWhatsThis(i18n("Closes the current tab."));
duplicateTabAction=new KAction(i18n("&Duplicate Tab"), "tab_duplicate", SHIFT+CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(duplicateTab()), actionCollection(), "duplicate_tab" );
duplicateTabAction=new TDEAction(i18n("&Duplicate Tab"), "tab_duplicate", SHIFT+CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(duplicateTab()), actionCollection(), "duplicate_tab" );
duplicateTabAction->setToolTip(i18n("Duplicate the current tab"));
duplicateTabAction->setWhatsThis(i18n("Duplicates the current tab."));
moveTabLeftAction=new KAction(i18n("Move Tab &Left"), "1leftarrow", SHIFT+CTRL+Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveTabLeft()), actionCollection(), "move_tab_left" );
moveTabLeftAction=new TDEAction(i18n("Move Tab &Left"), "1leftarrow", SHIFT+CTRL+Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveTabLeft()), actionCollection(), "move_tab_left" );
moveTabLeftAction->setToolTip(i18n("Move the current tab to the left"));
moveTabLeftAction->setWhatsThis(i18n("Moves the current tab to the left."));
moveTabRightAction=new KAction(i18n("Move Tab &Right"), "1rightarrow", SHIFT+CTRL+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveTabRight()), actionCollection(), "move_tab_right" );
moveTabRightAction=new TDEAction(i18n("Move Tab &Right"), "1rightarrow", SHIFT+CTRL+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveTabRight()), actionCollection(), "move_tab_right" );
moveTabRightAction->setToolTip(i18n("Move the current tab to the right"));
moveTabRightAction->setWhatsThis(i18n("Moves the current tab to the right."));
reloadAction=new KAction(i18n("&Reload"), "reload", Key_F5, TQT_TQOBJECT(this), TQT_SLOT(reloadCurrent()), actionCollection(), "reload" );
reloadAction=new TDEAction(i18n("&Reload"), "reload", Key_F5, TQT_TQOBJECT(this), TQT_SLOT(reloadCurrent()), actionCollection(), "reload" );
reloadAction->setToolTip(i18n("Reload the current log"));
reloadAction->setWhatsThis(i18n("Reloads the current log, if you want to be sure that the view is correctly updated."));
resumeParsingAction=new KAction(i18n("Resu&me Parsing"), "player_play", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(resumeParsing()), actionCollection(), "resume_parsing");
resumeParsingAction=new TDEAction(i18n("Resu&me Parsing"), "player_play", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(resumeParsing()), actionCollection(), "resume_parsing");
resumeParsingAction->setToolTip(i18n("Resume the watching of the current log"));
resumeParsingAction->setWhatsThis(i18n("Resumes the watching of the current log. This action is only available when the user has already paused the reading."));
resumeParsingAction->setEnabled(true);
pauseParsingAction=new KAction(i18n("S&top Parsing"), "player_stop", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(pauseParsing()), actionCollection(), "pause_parsing");
pauseParsingAction=new TDEAction(i18n("S&top Parsing"), "player_stop", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(pauseParsing()), actionCollection(), "pause_parsing");
pauseParsingAction->setToolTip(i18n("Pause the watching of the current log"));
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."));

detailAction=new KAction(i18n("&Details"), "viewmag", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDetails()), actionCollection(), "details");
detailAction=new TDEAction(i18n("&Details"), "viewmag", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDetails()), actionCollection(), "details");
detailAction->setToolTip(i18n("Display details on the currently selected line"));
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."));
detailAction->setEnabled(false);

tooltipEnabledAction=new KToggleAction(i18n("&Enable Detailed Tooltips"), 0, actionCollection(), "enable_tooltip");
tooltipEnabledAction=new TDEToggleAction(i18n("&Enable Detailed Tooltips"), 0, actionCollection(), "enable_tooltip");
tooltipEnabledAction->setToolTip(i18n("Disable/Enable the tooltips on the current view"));
tooltipEnabledAction->setWhatsThis(i18n("Disables/Enables the tooltips displayed when the cursor hovers a log line."));
connect(tooltipEnabledAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotTooltipEnabled(bool)));
newLinesDisplayedAction=new KToggleAction(i18n("&Display New Lines"), 0, actionCollection(), "display_new_line");
newLinesDisplayedAction=new TDEToggleAction(i18n("&Display New Lines"), 0, actionCollection(), "display_new_line");
newLinesDisplayedAction->setToolTip(i18n("Display or not new lines if the log changes"));
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."));
@@ -394,7 +394,7 @@ void KSystemLog::setupLogActions() {
//Define a macro allowing the connection of the signal from log action to the slotLogAction object
#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(KAction::ActivationReason, TQt::ButtonState)));
#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), slotLogAction, TQT_SLOT(slotLogAction(TDEAction::ActivationReason, TQt::ButtonState)));
#else
#define CONNECTED_SLOT(action) connect(action, TQT_SIGNAL(activated()), slotLogAction, TQT_SLOT(slotLogAction()));
#endif
@@ -406,7 +406,7 @@ void KSystemLog::setupLogActions() {
TQString exclusiveGroup="LogActions";

//System Log Action
KToggleAction* systemAction=new KToggleAction(i18n("S&ystem Log"), SYSTEM_MODE_ICON, 0, NULL, NULL, actionCollection(), "system_log" );
TDEToggleAction* systemAction=new TDEToggleAction(i18n("S&ystem Log"), SYSTEM_MODE_ICON, 0, NULL, NULL, actionCollection(), "system_log" );
systemAction->setToolTip(i18n("Display the system log."));
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)"));
systemAction->setExclusiveGroup(exclusiveGroup);
@@ -414,7 +414,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(systemAction)
//Kernel Log Action
KToggleAction* kernelAction=new KToggleAction(i18n("&Kernel Log"), KERNEL_MODE_ICON, 0, NULL, NULL, actionCollection(), "kernel_log" );
TDEToggleAction* kernelAction=new TDEToggleAction(i18n("&Kernel Log"), KERNEL_MODE_ICON, 0, NULL, NULL, actionCollection(), "kernel_log" );
kernelAction->setToolTip(i18n("Display the kernel log."));
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>"));
kernelAction->setExclusiveGroup(exclusiveGroup);
@@ -422,7 +422,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(kernelAction)
//Boot Log Action
KToggleAction* bootAction=new KToggleAction(i18n("&Boot Log"), BOOT_MODE_ICON, 0, NULL, NULL, actionCollection(), "boot_log" );
TDEToggleAction* bootAction=new TDEToggleAction(i18n("&Boot Log"), BOOT_MODE_ICON, 0, NULL, NULL, actionCollection(), "boot_log" );
bootAction->setToolTip(i18n("Display the boot log."));
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>"));
bootAction->setExclusiveGroup(exclusiveGroup);
@@ -430,7 +430,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(bootAction)
//Authentication Log Action
KToggleAction* authenticationAction=new KToggleAction(i18n("A&uthentication Log"), AUTHENTICATION_MODE_ICON, 0, NULL, NULL, actionCollection(), "authentication_log" );
TDEToggleAction* authenticationAction=new TDEToggleAction(i18n("A&uthentication Log"), AUTHENTICATION_MODE_ICON, 0, NULL, NULL, actionCollection(), "authentication_log" );
authenticationAction->setToolTip(i18n("Display the authentication log."));
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>"));
authenticationAction->setExclusiveGroup(exclusiveGroup);
@@ -438,7 +438,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(authenticationAction)
//Daemon Log Action
KToggleAction* daemonAction=new KToggleAction(i18n("&Daemons Log"), DAEMON_MODE_ICON, 0, NULL, NULL, actionCollection(), "daemon_log" );
TDEToggleAction* daemonAction=new TDEToggleAction(i18n("&Daemons Log"), DAEMON_MODE_ICON, 0, NULL, NULL, actionCollection(), "daemon_log" );
daemonAction->setToolTip(i18n("Display the daemons log."));
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>"));
daemonAction->setExclusiveGroup(exclusiveGroup);
@@ -446,7 +446,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(daemonAction)
//Cron Log Action
KToggleAction* cronAction=new KToggleAction(i18n("&Planned Tasks Cron Log"), CRON_MODE_ICON, 0, NULL, NULL, actionCollection(), "cron_log" );
TDEToggleAction* cronAction=new TDEToggleAction(i18n("&Planned Tasks Cron Log"), CRON_MODE_ICON, 0, NULL, NULL, actionCollection(), "cron_log" );
cronAction->setToolTip(i18n("Display the planned tasks log (or Cron log)."));
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>"));
cronAction->setExclusiveGroup(exclusiveGroup);
@@ -454,7 +454,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(cronAction)
//Xorg Log Action
KToggleAction* xorgAction=new KToggleAction(i18n("&X.org Log"), XORG_MODE_ICON, 0, NULL, NULL, actionCollection(), "xorg_log" );
TDEToggleAction* xorgAction=new TDEToggleAction(i18n("&X.org Log"), XORG_MODE_ICON, 0, NULL, NULL, actionCollection(), "xorg_log" );
xorgAction->setToolTip(i18n("Display the X.org log."));
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>"));
xorgAction->setExclusiveGroup(exclusiveGroup);
@@ -462,7 +462,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(xorgAction)
//ACPId Log Action
KToggleAction* acpidAction=new KToggleAction(i18n("&ACPI Log"), ACPID_MODE_ICON, 0, NULL, NULL, actionCollection(), "acpid_log" );
TDEToggleAction* acpidAction=new TDEToggleAction(i18n("&ACPI Log"), ACPID_MODE_ICON, 0, NULL, NULL, actionCollection(), "acpid_log" );
acpidAction->setToolTip(i18n("Display the ACPI log."));
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>"));
acpidAction->setExclusiveGroup(exclusiveGroup);
@@ -470,7 +470,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(acpidAction)

//Cups Log Action
KToggleAction* cupsAction=new KToggleAction(i18n("&Cups Log"), CUPS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_log" );
TDEToggleAction* cupsAction=new TDEToggleAction(i18n("&Cups Log"), CUPS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_log" );
cupsAction->setToolTip(i18n("Display the Cups log."));
cupsAction->setWhatsThis(i18n("<qt>Displays the CUPS log in the current tab. CUPS is the program which manage printing on your computer.</qt>"));
cupsAction->setExclusiveGroup(exclusiveGroup);
@@ -478,7 +478,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(cupsAction)

//Cups Access Log Action
KToggleAction* cupsAccessAction=new KToggleAction(i18n("&Cups Web Log"), CUPS_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_access_log" );
TDEToggleAction* cupsAccessAction=new TDEToggleAction(i18n("&Cups Web Log"), CUPS_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "cups_access_log" );
cupsAccessAction->setToolTip(i18n("Display the CUPS Web Server Access log."));
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>"));
cupsAccessAction->setExclusiveGroup(exclusiveGroup);
@@ -487,7 +487,7 @@ void KSystemLog::setupLogActions() {

//Apache Log Action
KToggleAction* apacheAction=new KToggleAction(i18n("&Apache log"), APACHE_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_log" );
TDEToggleAction* apacheAction=new TDEToggleAction(i18n("&Apache log"), APACHE_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_log" );
apacheAction->setToolTip(i18n("Display the Apache log."));
apacheAction->setWhatsThis(i18n("<qt>Displays the Apache log in the current tab. Apache is the main used Web server in the world.</qt>"));
apacheAction->setExclusiveGroup(exclusiveGroup);
@@ -495,7 +495,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(apacheAction)

//Apache Access Log Action
KToggleAction* apacheAccessAction=new KToggleAction(i18n("&Apache Web log"), APACHE_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_access_log" );
TDEToggleAction* apacheAccessAction=new TDEToggleAction(i18n("&Apache Web log"), APACHE_ACCESS_MODE_ICON, 0, NULL, NULL, actionCollection(), "apache_access_log" );
apacheAccessAction->setToolTip(i18n("Display the Apache Access log."));
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>"));
apacheAccessAction->setExclusiveGroup(exclusiveGroup);
@@ -503,7 +503,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(apacheAccessAction)
//Mail Log Action
KToggleAction* mailAction=new KToggleAction(i18n("&Mail Log"), MAIL_MODE_ICON, 0, NULL, NULL, actionCollection(), "mail_log" );
TDEToggleAction* mailAction=new TDEToggleAction(i18n("&Mail Log"), MAIL_MODE_ICON, 0, NULL, NULL, actionCollection(), "mail_log" );
mailAction->setToolTip(i18n("Display the Mail log."));
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>"));
mailAction->setExclusiveGroup(exclusiveGroup);
@@ -511,7 +511,7 @@ void KSystemLog::setupLogActions() {
CONNECTED_SLOT(mailAction)
//Samba Log Action
KToggleAction* sambaAction=new KToggleAction(i18n("&Samba Log"), SAMBA_MODE_ICON, 0, NULL, NULL, actionCollection(), "samba_log" );
TDEToggleAction* sambaAction=new TDEToggleAction(i18n("&Samba Log"), SAMBA_MODE_ICON, 0, NULL, NULL, actionCollection(), "samba_log" );
sambaAction->setToolTip(i18n("Display the Samba log."));
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>"));
sambaAction->setExclusiveGroup(exclusiveGroup);
@@ -896,10 +896,10 @@ void KSystemLog::resumeParsing() {

//If no actions are selected, than all are deselected
void KSystemLog::deactiveLogActions() {
TQValueList<KToggleAction*> actions=mapActionLogModes.keys();
TQValueList<TDEToggleAction*> actions=mapActionLogModes.keys();
KToggleAction* action;
TQValueList<KToggleAction*>::iterator it;
TDEToggleAction* action;
TQValueList<TDEToggleAction*>::iterator it;
for (it=actions.begin(); it!=actions.end(); ++it) {
action=*it;
@@ -908,17 +908,17 @@ void KSystemLog::deactiveLogActions() {
}

KToggleAction* KSystemLog::getCorrespondingLogAction(LogMode* mode) {
TDEToggleAction* KSystemLog::getCorrespondingLogAction(LogMode* mode) {
//Special case for no and opening mode
//TODO Maybe use a list for "special" log mode, and pre-test the parameter with it
if (mode==Globals::noMode || mode==Globals::openingMode)
return(NULL);

TQValueList<KToggleAction*> keys=mapActionLogModes.keys();
TQValueList<TDEToggleAction*> keys=mapActionLogModes.keys();
TQValueList<KToggleAction*>::iterator it;
TQValueList<TDEToggleAction*>::iterator it;
KToggleAction* key;
TDEToggleAction* key;
for (it=keys.begin(); it!=keys.end(); ++it) {
@@ -933,17 +933,17 @@ KToggleAction* KSystemLog::getCorrespondingLogAction(LogMode* mode) {
}


KToggleAction* KSystemLog::getLogAction(const char* name) {
return( static_cast<KToggleAction*> (actionCollection()->action(name)) );
TDEToggleAction* KSystemLog::getLogAction(const char* name) {
return( static_cast<TDEToggleAction*> (actionCollection()->action(name)) );
}

#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
void KSystemLog::logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state) {
void KSystemLog::logActionClicked(const TQObject* sender, TDEAction::ActivationReason reason, TQt::ButtonState state) {
#else
void KSystemLog::logActionClicked(const TQObject* sender) {
#endif
KToggleAction* action=getLogAction(sender->name());
TDEToggleAction* action=getLogAction(sender->name());
LogMode* mode=mapActionLogModes[action];
@@ -1317,10 +1317,10 @@ void KSystemLog::dragEnterEvent(TQDragEnterEvent *event) {
}

void KSystemLog::setupGroupBy() {
groupBy=new KActionMenu(i18n("Group By"), SmallIcon(GROUP_BY_ICON), TQT_TQOBJECT(this), "group_by");
groupBy=new TDEActionMenu(i18n("Group By"), SmallIcon(GROUP_BY_ICON), TQT_TQOBJECT(this), "group_by");
actionCollection()->insert(groupBy);

KPopupMenu* menu=groupBy->popupMenu();
TDEPopupMenu* menu=groupBy->popupMenu();
menu->insertItem(SmallIcon(NO_GROUP_BY_ICON), i18n("None"), NO_GROUP_BY);
@@ -1341,7 +1341,7 @@ void KSystemLog::setupGroupBy() {
}

void KSystemLog::groupByChanged(int group) {
KPopupMenu* menu=groupBy->popupMenu();
TDEPopupMenu* menu=groupBy->popupMenu();

for(int i=0; i<(int) menu->count(); ++i) {
menu->setItemChecked(menu->idAt(i), false);
@@ -1374,9 +1374,9 @@ void KSystemLog::updateGroupBy() {

kdDebug() << "Updating group by..." << endl;
KPopupMenu* menu=groupBy->popupMenu();
TDEPopupMenu* menu=groupBy->popupMenu();
//First : removing old KAction
//First : removing old TDEAction
//The deleting begins at default groupby count + 2 separator (in the menu)
int deleting=DEFAULT_GROUP_BY_COUNT+2;
int end=menu->count();

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

@@ -67,7 +67,7 @@ typedef TQValueList<LogFile*> LogFiles;


class KPrinter;
class KToggleAction;
class TDEToggleAction;
class KURL;

/**
@@ -78,7 +78,7 @@ class KURL;
* @author Nicolas Ternisien <nicolas.ternisien@gmail.com>
* @version 0.1
*/
class KSystemLog : public KMainWindow {
class KSystemLog : public TDEMainWindow {

Q_OBJECT
@@ -110,7 +110,7 @@ class KSystemLog : public KMainWindow {
#if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
//Actual KDE method
void logActionClicked(const TQObject* sender, KAction::ActivationReason reason, TQt::ButtonState state);
void logActionClicked(const TQObject* sender, TDEAction::ActivationReason reason, TQt::ButtonState state);
#else
//Method for old versions of KDE
void logActionClicked(const TQObject* sender);
@@ -209,8 +209,8 @@ class KSystemLog : public KMainWindow {
/**
* Get the Log Action called name from actionCollection()
*/
KToggleAction* getLogAction(const char* name);
KToggleAction* getCorrespondingLogAction(LogMode* mode);
TDEToggleAction* getLogAction(const char* name);
TDEToggleAction* getCorrespondingLogAction(LogMode* mode);
void setupStatusBar();
@@ -235,37 +235,37 @@ class KSystemLog : public KMainWindow {
KPrinter* printer;
KAction* newTabAction;
KAction* closeTabAction;
KAction* duplicateTabAction;
TDEAction* newTabAction;
TDEAction* closeTabAction;
TDEAction* duplicateTabAction;
KAction* moveTabLeftAction;
KAction* moveTabRightAction;
TDEAction* moveTabLeftAction;
TDEAction* moveTabRightAction;
KAction* saveAction;
KAction* copyAction;
TDEAction* saveAction;
TDEAction* copyAction;
KAction* sendMailAction;
KAction* logMessageAction;
TDEAction* sendMailAction;
TDEAction* logMessageAction;

KToggleAction* filterBarAction;
TDEToggleAction* filterBarAction;

KAction* reloadAction;
TDEAction* reloadAction;

KAction* expandAllAction;
KAction* collapseAllAction;
TDEAction* expandAllAction;
TDEAction* collapseAllAction;
KAction* resumeParsingAction;
KAction* pauseParsingAction;
KAction* detailAction;
TDEAction* resumeParsingAction;
TDEAction* pauseParsingAction;
TDEAction* detailAction;
KToggleAction* tooltipEnabledAction;
KToggleAction* newLinesDisplayedAction;
TDEToggleAction* tooltipEnabledAction;
TDEToggleAction* newLinesDisplayedAction;
/**
* The Group By Action Menu
*/
KActionMenu* groupBy;
TDEActionMenu* groupBy;

/**
* A pointer to the Detail dialog
@@ -287,7 +287,7 @@ class KSystemLog : public KMainWindow {
*/
KTabWidget* tabs;
TQMap<KToggleAction*, LogMode*> mapActionLogModes;
TQMap<TDEToggleAction*, LogMode*> mapActionLogModes;

};


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

@@ -30,8 +30,8 @@

#include "logLineFilter.h"

LogLineFilter::LogLineFilter(TQWidget* parent, KListView* listView, const char* name) :
KListViewSearchLine(parent, listView, name) {
LogLineFilter::LogLineFilter(TQWidget* parent, TDEListView* listView, const char* name) :
TDEListViewSearchLine(parent, listView, name) {

drawFilterMessage = true;
@@ -40,7 +40,7 @@ LogLineFilter::LogLineFilter(TQWidget* parent, KListView* listView, const char*


void LogLineFilter::drawContents(TQPainter *p) {
KListViewSearchLine::drawContents( p );
TDEListViewSearchLine::drawContents( p );

if ( drawFilterMessage == true && !hasFocus() ) {
TQPen tmp = p->pen();
@@ -63,7 +63,7 @@ void LogLineFilter::focusInEvent( TQFocusEvent *ev )
drawFilterMessage = false;
repaint();
}
KListViewSearchLine::focusInEvent( ev );
TDEListViewSearchLine::focusInEvent( ev );
}


@@ -73,7 +73,7 @@ void LogLineFilter::focusOutEvent( TQFocusEvent *ev )
drawFilterMessage = true;
repaint();
}
KListViewSearchLine::focusOutEvent( ev );
TDEListViewSearchLine::focusOutEvent( ev );
}



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

@@ -37,10 +37,10 @@
@short LineEdit with customizable "Click here" text
@author Nicolas Ternisien
*/
class LogLineFilter : public KListViewSearchLine
class LogLineFilter : public TDEListViewSearchLine
{
public:
LogLineFilter(TQWidget* parent=NULL, KListView* listView=NULL, const char* name=NULL);
LogLineFilter(TQWidget* parent=NULL, TDEListView* listView=NULL, const char* name=NULL);

protected:
virtual void drawContents( TQPainter *p );

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

@@ -46,14 +46,14 @@


LogListItem::LogListItem(TQListView* list, LogLine* l) :
KListViewItem(list),
TDEListViewItem(list),
line(l)
{

}

LogListItem::LogListItem(TQListViewItem* parent, LogLine* l) :
KListViewItem(parent),
TDEListViewItem(parent),
line(l)
{

@@ -133,15 +133,15 @@ TQString LogListItem::exportToText() {

void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align) {
/* For debugging
KListViewItem::paintCell( p, cg, column, width, align );
TDEListViewItem::paintCell( p, cg, column, width, align );
return;
*/
//Get the KListView item
KListView* lv = (KListView *) listView();
//Get the TDEListView item
TDEListView* lv = (TDEListView *) listView();
if (lv==NULL) {
kdDebug() << "LogListItem::paintCell() : KListView null" << endl;
KListViewItem::paintCell( p, cg, column, width, align );
kdDebug() << "LogListItem::paintCell() : TDEListView null" << endl;
TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}
@@ -149,10 +149,10 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
static TQPixmap buffer;
buffer.resize(width, height());

//If there is a problem, let KListViewItem class draw this item
//If there is a problem, let TDEListViewItem class draw this item
if( buffer.isNull() ) {
kdDebug() << "LogListItem::paintCell() : TQPixmap null" << endl;
KListViewItem::paintCell(p, cg, column, width, align);
TDEListViewItem::paintCell(p, cg, column, width, align);
return;
}

@@ -275,7 +275,7 @@ static TQPixmap buffer;
buffer.resize( width, height() );

if( buffer.isNull() ) {
KListViewItem::paintCell( p, cg, column, width, align );
TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}

@@ -289,7 +289,7 @@ if( detailedView ) {
pBuf.drawLine( 0, 0, width, 0 );
}

KListView *lv = (KListView *)listView();
TDEListView *lv = (TDEListView *)listView();

TQRect rect( ((lv->treeStepSize()-9) / 2) + 1, (height()-9) / 2, 9, 9 );


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

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

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

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

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

@@ -37,7 +37,7 @@ SlotLogAction::SlotLogAction(KSystemLog* p) :
}

#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,4,0))
void SlotLogAction::slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state) {
void SlotLogAction::slotLogAction(TDEAction::ActivationReason reason, TQt::ButtonState state) {
const TQObject* sender=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQObject::sender()));
//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 {
/**
* This header contains the normal version of the main slot
*/
void slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state);
void slotLogAction(TDEAction::ActivationReason reason, TQt::ButtonState state);
private:
KSystemLog* parent;

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

@@ -114,7 +114,7 @@ void SpecificFileList::changeItemType() {
topContents.setMinimumSize(TQSize(100, 230));
TQLabel text(i18n("Please select the type of this file:"), &topContents);
KListBox choiceList(&topContents, "type_list");
TDEListBox choiceList(&topContents, "type_list");
TQToolTip::add(choiceList.viewport(), i18n("List of existing log levels"));
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) :
filterBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
clearSearch=new KToolBarButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, filterBar);
clearSearch=new TDEToolBarButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, filterBar);
clearSearch->setText(i18n("Clear the filter"));
TQWhatsThis::add(clearSearch, i18n("This button clears the filter in one click."));
@@ -84,7 +84,7 @@ View::View(TQWidget *parent) :
TQLabel* label=new TQLabel(i18n("Filter:"), filterBar);
search=new LogLineFilter(filterBar, (KListView*)NULL);
search=new LogLineFilter(filterBar, (TDEListView*)NULL);
label->setBuddy(search);
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() {

void View::initLogList() {
table=new KListView(this, "log_list");
table=new TDEListView(this, "log_list");

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>"));
@@ -314,7 +314,7 @@ void View::initLogList() {
table->setShowSortIndicator(true);
table->setAllColumnsShowFocus(true);
//This method is not implemented for the moment by KListView class
//This method is not implemented for the moment by TDEListView class
table->setAutoOpen(false);
//This is buggy but it's not my fault (I hope :-)
@@ -324,7 +324,7 @@ void View::initLogList() {
TQColor* alternate=new TQColor(246,246,255);
table->setAlternateBackground(*alternate);
table->setSelectionModeExt(KListView::Extended);
table->setSelectionModeExt(TDEListView::Extended);
toolTip=new ViewToolTip(this->getLogList()->viewport(), this);

@@ -383,7 +383,7 @@ void View::initSearchFilter(TQWidget* filterBox) {
void View::addElement(TQStringList* entries, TQPixmap* icon) {
TQStringList::Iterator it = entries->begin();
KListViewItem* item=new KListViewItem(table, *(it++), *(it++), *(it++), *(it++), *(it++));
TDEListViewItem* item=new TDEListViewItem(table, *(it++), *(it++), *(it++), *(it++), *(it++));
if (icon!=NULL)
item->setPixmap(0, *icon);
@@ -392,12 +392,12 @@ void View::addElement(TQStringList* entries, TQPixmap* icon) {
void View::addElementAtEnd(TQStringList* entries, TQPixmap* icon) {
TQStringList::Iterator it = entries->begin();
KListViewItem* item=new KListViewItem(table, table->lastItem(), *(it++), *(it++), *(it++), *(it++), *(it++));
TDEListViewItem* item=new TDEListViewItem(table, table->lastItem(), *(it++), *(it++), *(it++), *(it++), *(it++));
if (icon!=NULL)
item->setPixmap(0, *icon);
}

KListView* View::getLogList() {
TDEListView* View::getLogList() {
return(table);
}


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

@@ -104,7 +104,7 @@ class View : public TQWidget, public KSystemLogInterface {
bool isTooltipEnabled();
KListView* getLogList();
TDEListView* getLogList();
void saveConfig();
@@ -165,15 +165,15 @@ class View : public TQWidget, public KSystemLogInterface {
/**
* Central table
*/
KListView* table;
TDEListView* table;
#if defined(TDE_MAKE_VERSION) && (TDE_VERSION >= TDE_MAKE_VERSION(3,3,0))
TQHBox* filterBar;
KToolBarButton* clearSearch;
TDEToolBarButton* clearSearch;
/**
* Search line (inherits from KListViewSearchLine)
* Search line (inherits from TDEListViewSearchLine)
*/
LogLineFilter* search;

Loading…
Cancel
Save