diff --git a/ksystemlog/src/acpid/acpidOptions.cpp b/ksystemlog/src/acpid/acpidOptions.cpp
index d695613..cf97bfb 100644
--- a/ksystemlog/src/acpid/acpidOptions.cpp
+++ b/ksystemlog/src/acpid/acpidOptions.cpp
@@ -46,8 +46,8 @@ AcpidOptions::AcpidOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description=i18n("These files will be analyzed to display ACPId log. This list also determines the order in which the files are read.
");
fileList=new FileList(this, description);
diff --git a/ksystemlog/src/apache/apacheOptions.cpp b/ksystemlog/src/apache/apacheOptions.cpp
index ddda011..9705b19 100644
--- a/ksystemlog/src/apache/apacheOptions.cpp
+++ b/ksystemlog/src/apache/apacheOptions.cpp
@@ -49,8 +49,8 @@ ApacheOptions::ApacheOptions(TQWidget *parent) :
apacheAccessFileList(this, i18n("These files will be analyzed to display Apache Access log. This list also determines the order in which the files are read.
"))
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
tabs.addTab(&apacheFileList, Globals::apacheMode->pixmap, Globals::apacheMode->name);
tabs.addTab(&apacheAccessFileList, Globals::apacheAccessMode->pixmap, Globals::apacheAccessMode->name);
diff --git a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
index 78c231c..6be3dfb 100644
--- a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
+++ b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp
@@ -46,8 +46,8 @@ BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
- tqlayout->setSpacing(10);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ layout->setSpacing(10);
//Boot log file
TQVGroupBox* bootBox=new TQVGroupBox(i18n("Boot Log File"), this);
@@ -75,9 +75,9 @@ BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
TQSpacerItem* spacer=new TQSpacerItem(0, 0, TQSizePolicy::Preferred, TQSizePolicy::Expanding);
- tqlayout->addWidget(bootBox);
- tqlayout->addWidget(authenticationBox);
- tqlayout->addItem(spacer);
+ layout->addWidget(bootBox);
+ layout->addWidget(authenticationBox);
+ layout->addItem(spacer);
readConfig();
}
diff --git a/ksystemlog/src/cron/cronOptions.cpp b/ksystemlog/src/cron/cronOptions.cpp
index 170b8af..de63023 100644
--- a/ksystemlog/src/cron/cronOptions.cpp
+++ b/ksystemlog/src/cron/cronOptions.cpp
@@ -46,8 +46,8 @@ CronOptions::CronOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display Cron Logs (i.e. planned tasks logs). This list also determines the order in which the files are read.
");
fileList=new SpecificFileList(this, description);
diff --git a/ksystemlog/src/cups/cupsOptions.cpp b/ksystemlog/src/cups/cupsOptions.cpp
index 855e2e3..786011c 100644
--- a/ksystemlog/src/cups/cupsOptions.cpp
+++ b/ksystemlog/src/cups/cupsOptions.cpp
@@ -49,8 +49,8 @@ CupsOptions::CupsOptions(TQWidget *parent) :
cupsAccessFileList(this, i18n("These files will be analyzed to display Cups Web Server log. This list also determines the order in which the files are read.
"))
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
tabs.addTab(&cupsFileList, Globals::cupsMode->pixmap, Globals::cupsMode->name);
tabs.addTab(&cupsAccessFileList, Globals::cupsAccessMode->pixmap, Globals::cupsAccessMode->name);
diff --git a/ksystemlog/src/daemon/daemonOptions.cpp b/ksystemlog/src/daemon/daemonOptions.cpp
index e86c6c9..098c1d0 100644
--- a/ksystemlog/src/daemon/daemonOptions.cpp
+++ b/ksystemlog/src/daemon/daemonOptions.cpp
@@ -46,8 +46,8 @@ DaemonOptions::DaemonOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display daemons Logs. This list also determine the order in which the files are read.
");
fileList=new SpecificFileList(this, description);
diff --git a/ksystemlog/src/detailDialogBase.ui b/ksystemlog/src/detailDialogBase.ui
index 5c169dc..2545d2c 100644
--- a/ksystemlog/src/detailDialogBase.ui
+++ b/ksystemlog/src/detailDialogBase.ui
@@ -75,7 +75,7 @@
- tqlayout2
+ layout2
diff --git a/ksystemlog/src/fileList.cpp b/ksystemlog/src/fileList.cpp
index 78223f4..6caa8d8 100644
--- a/ksystemlog/src/fileList.cpp
+++ b/ksystemlog/src/fileList.cpp
@@ -44,8 +44,8 @@ FileList::FileList(TQWidget *parent, TQString description) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQVGroupBox* dirBox = new TQVGroupBox(i18n( "Files" ), this);
diff --git a/ksystemlog/src/generalOptions.cpp b/ksystemlog/src/generalOptions.cpp
index 8a8114c..0b5457b 100644
--- a/ksystemlog/src/generalOptions.cpp
+++ b/ksystemlog/src/generalOptions.cpp
@@ -42,8 +42,8 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
- tqlayout->setSpacing(10);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ layout->setSpacing(10);
//Maximum Lines
TQVGroupBox* logLinesBox=new TQVGroupBox(i18n("Log Lines List"), this);
@@ -88,11 +88,11 @@ GeneralOptions::GeneralOptions(TQWidget *parent) :
TQSpacerItem* spacer=new TQSpacerItem(0, 0, TQSizePolicy::Preferred, TQSizePolicy::Expanding);
- tqlayout->addWidget(logLinesBox);
- tqlayout->addWidget(maxCharBox);
- tqlayout->addWidget(options);
+ layout->addWidget(logLinesBox);
+ layout->addWidget(maxCharBox);
+ layout->addWidget(options);
- tqlayout->addItem(spacer);
+ layout->addItem(spacer);
readConfig();
}
diff --git a/ksystemlog/src/kernel/kernelOptions.cpp b/ksystemlog/src/kernel/kernelOptions.cpp
index 8868cf7..e42b2a9 100644
--- a/ksystemlog/src/kernel/kernelOptions.cpp
+++ b/ksystemlog/src/kernel/kernelOptions.cpp
@@ -47,8 +47,8 @@ KernelOptions::KernelOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display Kernel logs. This list also determines the order in which the files are read.
");
fileList=new SpecificFileList(this, description);
diff --git a/ksystemlog/src/logManager.cpp b/ksystemlog/src/logManager.cpp
index 9025f6d..c0de9e9 100644
--- a/ksystemlog/src/logManager.cpp
+++ b/ksystemlog/src/logManager.cpp
@@ -521,8 +521,8 @@ void LogManager::slotCopyToClipboard() {
}
else {
//Copy both to clipboard and X11-selection
- TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
- TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
+ TQApplication::clipboard()->setText(text, TQClipboard::Clipboard);
+ TQApplication::clipboard()->setText(text, TQClipboard::Selection);
emit changeStatusbar(i18n("1 log line copied to clipboard.", "%n log lines copied to clipboard.", nbCopied));
}
diff --git a/ksystemlog/src/loggerDialogBase.ui b/ksystemlog/src/loggerDialogBase.ui
index b99fd01..7a777b1 100644
--- a/ksystemlog/src/loggerDialogBase.ui
+++ b/ksystemlog/src/loggerDialogBase.ui
@@ -116,7 +116,7 @@
- tqlayout9_2
+ layout9_2
@@ -175,7 +175,7 @@
- tqlayout9
+ layout9
@@ -255,7 +255,7 @@
- tqlayout11
+ layout11
@@ -342,7 +342,7 @@
- tqlayout6
+ layout6
diff --git a/ksystemlog/src/postfix/postfixOptions.cpp b/ksystemlog/src/postfix/postfixOptions.cpp
index 5976b7a..57628ea 100644
--- a/ksystemlog/src/postfix/postfixOptions.cpp
+++ b/ksystemlog/src/postfix/postfixOptions.cpp
@@ -47,8 +47,8 @@ PostfixOptions::PostfixOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display Postfix Logs. This list also determine the order in which the files are read.
");
fileList=new SpecificFileList(this, description);
diff --git a/ksystemlog/src/samba/sambaOptions.cpp b/ksystemlog/src/samba/sambaOptions.cpp
index 709d6a0..aa78c59 100644
--- a/ksystemlog/src/samba/sambaOptions.cpp
+++ b/ksystemlog/src/samba/sambaOptions.cpp
@@ -46,8 +46,8 @@ SambaOptions::SambaOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display Samba log. This list also determines the order in which the files are read.
");
fileList=new FileList(this, description);
diff --git a/ksystemlog/src/system/systemOptions.cpp b/ksystemlog/src/system/systemOptions.cpp
index c7ab22f..bed499e 100644
--- a/ksystemlog/src/system/systemOptions.cpp
+++ b/ksystemlog/src/system/systemOptions.cpp
@@ -46,15 +46,15 @@ SystemOptions::SystemOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
- //tqlayout->setAutoAdd(true);
+ TQVBoxLayout* layout = new TQVBoxLayout(this);
+ //layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display System logs. This list also determines the order in which the files are read.
");
fileList=new SpecificFileList(this, description);
connect(fileList, TQT_SIGNAL(fileListChanged(int)), this, TQT_SLOT(slotFileListChanged(int)));
- tqlayout->addWidget(fileList);
+ layout->addWidget(fileList);
readConfig();
diff --git a/ksystemlog/src/view.cpp b/ksystemlog/src/view.cpp
index 9c97dd3..e852849 100644
--- a/ksystemlog/src/view.cpp
+++ b/ksystemlog/src/view.cpp
@@ -64,7 +64,7 @@ View::View(TQWidget *parent) :
firstLoad(true)
{
- // setup our tqlayout manager to automatically add our widgets
+ // setup our layout manager to automatically add our widgets
TQVBoxLayout* topLayout = new TQVBoxLayout(this);
topLayout->setAutoAdd(true);
@@ -210,7 +210,7 @@ void View::setColumns(LogViewColumns* list) {
TQString group="List";
group.append(logManager->getIndex());
- //We first restore the tqlayout from the config
+ //We first restore the layout from the config
table->restoreLayout(configXT->config(), group);
//Then we delete it from config, to avoid reloading problem
diff --git a/ksystemlog/src/xorg/xorgOptions.cpp b/ksystemlog/src/xorg/xorgOptions.cpp
index 3a5e0ce..182997d 100644
--- a/ksystemlog/src/xorg/xorgOptions.cpp
+++ b/ksystemlog/src/xorg/xorgOptions.cpp
@@ -46,8 +46,8 @@ XorgOptions::XorgOptions(TQWidget *parent) :
TQWidget(parent)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
- tqlayout->setAutoAdd(true);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
+ layout->setAutoAdd(true);
TQString description= i18n("These files will be analyzed to display X.org log. This list also determines the order in which the files are read.
");
fileList=new FileList(this, description);