diff options
Diffstat (limited to 'ktalkd/kcmktalkd')
-rw-r--r-- | ktalkd/kcmktalkd/answmachpage.cpp | 18 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/answmachpage.h | 5 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/forwmachpage.cpp | 12 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/forwmachpage.h | 5 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/main.cpp | 24 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/main.h | 3 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/soundpage.cpp | 14 | ||||
-rw-r--r-- | ktalkd/kcmktalkd/soundpage.h | 5 |
8 files changed, 45 insertions, 41 deletions
diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp index 3f426821..19e02f60 100644 --- a/ktalkd/kcmktalkd/answmachpage.cpp +++ b/ktalkd/kcmktalkd/answmachpage.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 1998 David Faure, [email protected] * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -29,9 +29,9 @@ #include <stdlib.h> #include <klocale.h> // for getenv -KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, +KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *tqparent, const char* name, KSimpleConfig *_config) - : KCModule (parent, name) + : KCModule (tqparent, name) { if (!_config) { delete_config = true; @@ -49,27 +49,27 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, mail_edit->setMinimumWidth(150); mail_label = new TQLabel(mail_edit,i18n("&Mail address:"),this); mail_label->adjustSize(); - mail_label->setAlignment( ShowPrefix | AlignVCenter ); + mail_label->tqsetAlignment( ShowPrefix | AlignVCenter ); subj_edit = new TQLineEdit(this); subj_edit->adjustSize(); subj_edit->setMinimumWidth(150); subj_label = new TQLabel(subj_edit, i18n("Mail s&ubject:"),this); subj_label->adjustSize(); - subj_label->setAlignment( ShowPrefix | AlignVCenter ); + subj_label->tqsetAlignment( ShowPrefix | AlignVCenter ); subj_tip = new TQLabel(i18n("Use %s for the caller name"),this); - subj_tip->setAlignment( ShowPrefix ); + subj_tip->tqsetAlignment( ShowPrefix ); head_edit = new TQLineEdit(this); head_edit->adjustSize(); head_edit->setMinimumWidth(150); head_label = new TQLabel(head_edit, i18n("Mail &first line:"),this); head_label->adjustSize(); - head_label->setAlignment( ShowPrefix | AlignVCenter ); + head_label->tqsetAlignment( ShowPrefix | AlignVCenter ); head_tip = new TQLabel( i18n("Use first %s for caller name, and second %s for caller hostname"), this); - head_tip->setAlignment( ShowPrefix ); + head_tip->tqsetAlignment( ShowPrefix ); emptymail_cb = new TQCheckBox(i18n("&Receive a mail even if no message left"), this); emptymail_cb->adjustSize(); @@ -79,7 +79,7 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, msg_ml->setMinimumWidth(150); msg_label = new TQLabel(msg_ml, i18n("&Banner displayed on answering machine startup:"),this); msg_label->adjustSize(); - msg_label->setAlignment( ShowPrefix | AlignVCenter ); + msg_label->tqsetAlignment( ShowPrefix | AlignVCenter ); int h = 10 + answmach_cb->height() + mail_edit->height() + subj_edit->height() + subj_tip->height() + head_edit->height() diff --git a/ktalkd/kcmktalkd/answmachpage.h b/ktalkd/kcmktalkd/answmachpage.h index 31032a93..7a5f0cd4 100644 --- a/ktalkd/kcmktalkd/answmachpage.h +++ b/ktalkd/kcmktalkd/answmachpage.h @@ -3,7 +3,7 @@ * * Copyright (c) 1998 David Faure * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -42,9 +42,10 @@ class KSimpleConfig; class KAnswmachPageConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KAnswmachPageConfig( TQWidget *parent=0, const char* name=0, + KAnswmachPageConfig( TQWidget *tqparent=0, const char* name=0, KSimpleConfig *config=0 ); ~KAnswmachPageConfig( ); diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp index 0a6337f7..fb04bf7f 100644 --- a/ktalkd/kcmktalkd/forwmachpage.cpp +++ b/ktalkd/kcmktalkd/forwmachpage.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 1998 David Faure, [email protected] * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -26,9 +26,9 @@ #include <ksimpleconfig.h> #include <klocale.h> -KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, +KForwmachPageConfig::KForwmachPageConfig( TQWidget *tqparent, const char* name, KSimpleConfig *_config) - : KCModule (parent, name) + : KCModule (tqparent, name) { if (!_config) { delete_config = true; @@ -45,7 +45,7 @@ KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, address_edit->setMinimumWidth(150); address_label = new TQLabel(address_edit,i18n("&Destination (user or user@host):"),this); address_label->adjustSize(); - address_label->setAlignment( ShowPrefix | AlignVCenter ); + address_label->tqsetAlignment( ShowPrefix | AlignVCenter ); method_combo = new TQComboBox(this); method_combo->insertItem("FWA"); @@ -55,7 +55,7 @@ KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, method_combo->setMinimumWidth(80); method_label = new TQLabel(method_combo, i18n("Forward &method:"),this); method_label->adjustSize(); - method_label->setAlignment( ShowPrefix | AlignVCenter ); + method_label->tqsetAlignment( ShowPrefix | AlignVCenter ); expl_label = new TQLabel(i18n( "FWA: Forward announcement only. Direct connection. Not recommended.\n\ @@ -87,7 +87,7 @@ KForwmachPageConfig::~KForwmachPageConfig( ) { if (delete_config) delete config; /* I've been told that this is not necessary as - they will be deleted by Qt. But, well... */ + they will be deleted by TQt. But, well... */ delete forwmach_cb; delete address_label; delete address_edit; diff --git a/ktalkd/kcmktalkd/forwmachpage.h b/ktalkd/kcmktalkd/forwmachpage.h index 1643aeef..7811eb71 100644 --- a/ktalkd/kcmktalkd/forwmachpage.h +++ b/ktalkd/kcmktalkd/forwmachpage.h @@ -3,7 +3,7 @@ * * Copyright (c) 1998 David Faure * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -42,9 +42,10 @@ class KSimpleConfig; class KForwmachPageConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KForwmachPageConfig( TQWidget *parent=0, const char* name=0, + KForwmachPageConfig( TQWidget *tqparent=0, const char* name=0, KSimpleConfig *config=0); ~KForwmachPageConfig( ); diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp index 06f1e9b8..a1ff8878 100644 --- a/ktalkd/kcmktalkd/main.cpp +++ b/ktalkd/kcmktalkd/main.cpp @@ -30,17 +30,17 @@ #include <tqtabwidget.h> #include <tqlayout.h> -KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name) - : KCModule(parent, name) +KTalkdConfigModule::KTalkdConfigModule(TQWidget *tqparent, const char *name) + : KCModule(tqparent, name) { config = new KSimpleConfig("ktalkdrc"); announceconfig = new KSimpleConfig("ktalkannouncerc"); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->addWidget(tab); soundpage = new KSoundPageConfig(this, "soundpage", config, announceconfig); answmachpage = new KAnswmachPageConfig(this, "answmachpage", config); @@ -88,24 +88,24 @@ void KTalkdConfigModule::resizeEvent(TQResizeEvent *) extern "C" { - KDE_EXPORT KCModule *create_ktalkd(TQWidget *parent, const char *) + KDE_EXPORT KCModule *create_ktalkd(TQWidget *tqparent, const char *) { - return new KTalkdConfigModule(parent, "kcmktalkd"); + return new KTalkdConfigModule(tqparent, "kcmktalkd"); } - KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *parent, const char *) + KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *tqparent, const char *) { - return new KAnswmachPageConfig(parent, "kcmktalkd"); + return new KAnswmachPageConfig(tqparent, "kcmktalkd"); } - KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *parent, const char *) + KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *tqparent, const char *) { - return new KSoundPageConfig(parent, "kcmktalkd"); + return new KSoundPageConfig(tqparent, "kcmktalkd"); } - KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *parent, const char *) + KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *tqparent, const char *) { - return new KForwmachPageConfig(parent, "kcmktalkd"); + return new KForwmachPageConfig(tqparent, "kcmktalkd"); } } diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h index 088c9594..1fb1c910 100644 --- a/ktalkd/kcmktalkd/main.h +++ b/ktalkd/kcmktalkd/main.h @@ -35,10 +35,11 @@ class KForwmachPageConfig; class KTalkdConfigModule : public KCModule { Q_OBJECT + TQ_OBJECT public: - KTalkdConfigModule(TQWidget *parent, const char *name); + KTalkdConfigModule(TQWidget *tqparent, const char *name); virtual ~KTalkdConfigModule(); //void init(); diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index 289b180f..8e812a58 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 1998 David Faure, [email protected] * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -44,9 +44,9 @@ /* Lots of stuff taken from syssound.cpp */ -KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, +KSoundPageConfig::KSoundPageConfig( TQWidget *tqparent, const char* name, KSimpleConfig *_config, KSimpleConfig *_announceconfig) - : KCModule (parent, name) + : KCModule (tqparent, name) { if (!_config) { delete_config = true; @@ -66,7 +66,7 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, extprg_box->setColumnLayout( 0, Qt::Horizontal ); toplay->addWidget(extprg_box); - TQGridLayout* l = new TQGridLayout(extprg_box->layout()); + TQGridLayout* l = new TQGridLayout(extprg_box->tqlayout()); extprg_edit = new KURLRequester(extprg_box); l->addWidget(extprg_edit, 2, 4); @@ -90,7 +90,7 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, TQBoxLayout* lay = new TQVBoxLayout(sound_box, 10, 10); - int edit_h = client_edit->height(); // The height of a QLineEdit + int edit_h = client_edit->height(); // The height of a TQLineEdit sound_list = new TQListBox(sound_box); sound_list->setMinimumHeight( 3 * edit_h ); @@ -193,7 +193,7 @@ void KSoundPageConfig::sound_listDropEvent(TQDropEvent* e){ if (url.path().right(4).upper() != ".WAV") { TQString msg = i18n("%1\ndoes not appear "\ - "to be a WAV file.").arg(url.path()); + "to be a WAV file.").tqarg(url.path()); KMessageBox::sorry(this, msg, i18n("Improper File Extension")); @@ -203,7 +203,7 @@ void KSoundPageConfig::sound_listDropEvent(TQDropEvent* e){ if (!addToSound_List(url.path())) { // did not add file because it is already in the list - TQString msg = i18n("The file %1 is already in the list").arg(url.path()); + TQString msg = i18n("The file %1 is already in the list").tqarg(url.path()); KMessageBox::information(this, msg, i18n("File Already in List")); diff --git a/ktalkd/kcmktalkd/soundpage.h b/ktalkd/kcmktalkd/soundpage.h index 256df41b..2c19ee66 100644 --- a/ktalkd/kcmktalkd/soundpage.h +++ b/ktalkd/kcmktalkd/soundpage.h @@ -3,7 +3,7 @@ * * Copyright (c) 1998 David Faure * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -46,9 +46,10 @@ class TQPushButton; class KSoundPageConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KSoundPageConfig( TQWidget *parent=0, const char* name=0, + KSoundPageConfig( TQWidget *tqparent=0, const char* name=0, KSimpleConfig *config=0, KSimpleConfig *announceconfig=0); ~KSoundPageConfig( ); |