summaryrefslogtreecommitdiffstats
path: root/kcontrol/konsole
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/konsole')
-rw-r--r--kcontrol/konsole/kcmkonsole.cpp46
-rw-r--r--kcontrol/konsole/kcmkonsole.h2
-rw-r--r--kcontrol/konsole/schemaeditor.cpp64
-rw-r--r--kcontrol/konsole/schemaeditor.h2
-rw-r--r--kcontrol/konsole/sessioneditor.cpp36
-rw-r--r--kcontrol/konsole/sessioneditor.h2
6 files changed, 76 insertions, 76 deletions
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 7dfb77dae..28cec6825 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -60,28 +60,28 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org");
setAboutData( ab );
- connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
- connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->realTransparency,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
- connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
- connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
- connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
- connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
- dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
- connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList()));
+ connect(dialog->terminalSizeHintCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->warnCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->ctrldragCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->cutToBeginningOfLineCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->allowResizeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->bidiCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->xonXoffCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->blinkingCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->frameCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->line_spacingSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
+ connect(dialog->matchTabWinTitleCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->tabsCycleWheelCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->menuAcceleratorsCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->metaAsAltModeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->realTransparency,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+ connect(dialog->silence_secondsSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
+ connect(dialog->word_connectorLE,TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT( changed() ));
+ connect(dialog->SchemaEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
+ connect(dialog->SessionEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
+ connect(dialog->SchemaEditor1, TQ_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
+ dialog->SessionEditor1, TQ_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
+ connect(dialog->SessionEditor1, TQ_SIGNAL(getList()), dialog->SchemaEditor1, TQ_SLOT(getList()));
}
void KCMKonsole::load()
@@ -165,7 +165,7 @@ void KCMKonsole::save()
emit changed(false);
- DCOPClient *dcc = kapp->dcopClient();
+ DCOPClient *dcc = tdeApp->dcopClient();
dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
dcc->send("kdesktop", "default", "configure()", TQByteArray());
dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray());
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index abdd4cc76..32eb58141 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -28,7 +28,7 @@ class TQStringList;
class KCMKonsole
: public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCMKonsole (TQWidget *parent = 0, const char *name = 0, const TQStringList& = 0);
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index dfa4dbefe..81fc2adff 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -29,7 +29,7 @@
#include <tqcombobox.h>
#include <kdebug.h>
#include <tqcheckbox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
//#include <errno.h>
@@ -75,9 +75,9 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
defaultSchema = "";
spix = new TDESharedPixmap;
- connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool)));
+ connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool)));
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
client->attach();
TQByteArray data;
@@ -94,29 +94,29 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations
- connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect()));
- connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
- connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
- connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int)));
- connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int)));
- connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
- connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview()));
- connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview()));
- connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview()));
- connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview()));
-
- connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
- connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
- connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified()));
- connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
- connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified()));
- connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified()));
- connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
- connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
- connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
- connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
-
- connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
+ connect(imageBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(imageSelect()));
+ connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent()));
+ connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent()));
+ connect(colorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotColorChanged(int)));
+ connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTypeChanged(int)));
+ connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
+ connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updatePreview()));
+ connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updatePreview()));
+ connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updatePreview()));
+ connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updatePreview()));
+
+ connect(titleLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified()));
+ connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified()));
+ connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(schemaModified()));
+ connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+ connect(modeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(schemaModified()));
+ connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(schemaModified()));
+ connect(transparentCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+ connect(boldCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+ connect(colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified()));
+ connect(backgndLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified()));
+
+ connect(defaultSchemaCB, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
removeButton->setEnabled( schemaList->currentItem() );
}
@@ -230,7 +230,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile)
{
TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema");
TQStringList::ConstIterator it;
- disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+ disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
schemaList->clear();
TQListBoxItem* currentItem = 0;
@@ -253,7 +253,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile)
schemaList->sort();
schemaList->setCurrentItem(0); // select the first added item correctly too
schemaList->setCurrentItem(currentItem);
- connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+ connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
schemaListChanged();
}
@@ -528,11 +528,11 @@ void SchemaEditor::readSchema(int num)
}
if(schMod) {
- disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+ disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
schemaList->setCurrentItem(oldSchema);
querySave();
schemaList->setCurrentItem(num);
- connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+ connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
schMod=false;
}
@@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
continue;
if (!(0 <= bo && bo <= 1))
continue;
- color[fi] = kapp->palette().active().text();
+ color[fi] = tdeApp->palette().active().text();
transparent[fi] = tr;
bold[fi] = bo;
type[fi] = 1;
@@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
continue;
if (!(0 <= bo && bo <= 1))
continue;
- color[fi] = kapp->palette().active().base();
+ color[fi] = tdeApp->palette().active().base();
transparent[fi] = tr;
bold[fi] = bo;
type[fi] = 2;
diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h
index 903cc1436..1dd990795 100644
--- a/kcontrol/konsole/schemaeditor.h
+++ b/kcontrol/konsole/schemaeditor.h
@@ -32,7 +32,7 @@ class TDESharedPixmap;
/** SchemaEditor is the base class of the porject */
class SchemaEditor : public SchemaDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** constructor */
SchemaEditor(TQWidget* parent=0, const char *name=0);
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 290541d12..15e47d657 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -21,7 +21,7 @@
#include <tqlineedit.h>
#include <tqcombobox.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdefiledialog.h>
@@ -60,20 +60,20 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name)
TDEGlobal::iconLoader()->addAppDir( "konsole" );
directoryLine->setMode(KFile::Directory);
- connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
- connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
- connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
+ connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
+ connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent()));
+ connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent()));
- connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
- connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
- connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
- connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
+ connect(nameLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+ connect(directoryLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+ connect(executeLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+ connect(termLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
- connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified()));
+ connect(previewIcon, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(sessionModified()));
- connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
- connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
- connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
+ connect(fontCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
+ connect(keytabCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
+ connect(schemaCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
}
SessionEditor::~SessionEditor()
@@ -167,7 +167,7 @@ void SessionEditor::loadAllSession(TQString currentFile)
TQString name = (*it);
- KSimpleConfig* co = new KSimpleConfig(name,true);
+ TDESimpleConfig* co = new TDESimpleConfig(name,true);
co->setDesktopGroup();
TQString sesname = co->readEntry("Name",i18n("Unnamed"));
delete co;
@@ -187,21 +187,21 @@ void SessionEditor::readSession(int num)
{
int i,counter;
TQString str;
- KSimpleConfig* co;
+ TDESimpleConfig* co;
if(sesMod) {
- disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+ disconnect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
sessionList->setCurrentItem(oldSession);
querySave();
sessionList->setCurrentItem(num);
- connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+ connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
sesMod=false;
}
if( sessionList->item(num) )
{
removeButton->setEnabled( TQFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () );
- co = new KSimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
+ co = new TDESimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
co->setDesktopGroup();
str = co->readEntry("Name");
@@ -328,7 +328,7 @@ void SessionEditor::saveCurrent()
if (fullpath[0] != '/')
fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
- KSimpleConfig* co = new KSimpleConfig(fullpath);
+ TDESimpleConfig* co = new TDESimpleConfig(fullpath);
co->setDesktopGroup();
co->writeEntry("Type","KonsoleApplication");
co->writeEntry("Name",nameLine->text());
diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h
index be85f8505..04b60b3f7 100644
--- a/kcontrol/konsole/sessioneditor.h
+++ b/kcontrol/konsole/sessioneditor.h
@@ -31,7 +31,7 @@
class SessionEditor : public SessionDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
SessionEditor(TQWidget* parent=0, const char *name=0);
~SessionEditor();