From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksirc/KSPrefs/ksprefs.cpp | 72 ++++++++++++++++---------------- ksirc/KSPrefs/ksprefs.h | 2 +- ksirc/KSPrefs/page_autoconnect.cpp | 84 +++++++++++++++++++------------------- ksirc/KSPrefs/page_autoconnect.h | 4 +- ksirc/KSPrefs/page_colors.cpp | 44 ++++++++++---------- ksirc/KSPrefs/page_colors.h | 12 +++--- ksirc/KSPrefs/page_font.cpp | 12 +++--- ksirc/KSPrefs/page_font.h | 6 +-- ksirc/KSPrefs/page_general.cpp | 10 ++--- ksirc/KSPrefs/page_general.h | 2 +- ksirc/KSPrefs/page_irccolors.cpp | 6 +-- ksirc/KSPrefs/page_irccolors.h | 2 +- ksirc/KSPrefs/page_looknfeel.cpp | 18 ++++---- ksirc/KSPrefs/page_looknfeel.h | 4 +- ksirc/KSPrefs/page_rmbmenu.cpp | 48 +++++++++++----------- ksirc/KSPrefs/page_rmbmenu.h | 2 +- ksirc/KSPrefs/page_servchan.cpp | 30 +++++++------- ksirc/KSPrefs/page_servchan.h | 2 +- ksirc/KSPrefs/page_shortcuts.cpp | 8 ++-- ksirc/KSPrefs/page_shortcuts.h | 2 +- ksirc/KSPrefs/page_startup.cpp | 24 +++++------ ksirc/KSPrefs/page_startup.h | 2 +- 22 files changed, 198 insertions(+), 198 deletions(-) (limited to 'ksirc/KSPrefs') diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp index 2bf97e84..40ccc56f 100644 --- a/ksirc/KSPrefs/ksprefs.cpp +++ b/ksirc/KSPrefs/ksprefs.cpp @@ -7,7 +7,7 @@ * * ***************************************************************************/ -#include +#include #include #include @@ -26,37 +26,37 @@ #include "page_looknfeel.h" #include "page_shortcuts.h" -KSPrefs::KSPrefs(QWidget * parent, const char * name): +KSPrefs::KSPrefs(TQWidget * parent, const char * name): KDialogBase(KDialogBase::IconList, i18n("Configure KSirc"), KDialogBase::Help | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default, KDialogBase::Ok, parent, name) { setWFlags( getWFlags() | WDestructiveClose ); - QFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", KIcon::SizeMedium ) ); - QFrame *itemGeneral = addPage( i18n( "General" ), i18n( "General KSirc Settings" ), BarIcon( "ksirc", KIcon::SizeMedium ) ); - QFrame *itemStartup = addPage( i18n( "Startup" ), i18n( "KSirc Startup Settings" ), BarIcon( "gear", KIcon::SizeMedium ) ); - QFrame *itemColors = addPage( i18n( "Colors" ), i18n( "KSirc Color Settings" ), BarIcon( "colors", KIcon::SizeMedium ) ); - QFrame *itemIRCColors = addPage( i18n( "IRC Colors" ), i18n( "KSirc IRC Color Settings" ), BarIcon( "colors", KIcon::SizeMedium ) ); + TQFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", KIcon::SizeMedium ) ); + TQFrame *itemGeneral = addPage( i18n( "General" ), i18n( "General KSirc Settings" ), BarIcon( "ksirc", KIcon::SizeMedium ) ); + TQFrame *itemStartup = addPage( i18n( "Startup" ), i18n( "KSirc Startup Settings" ), BarIcon( "gear", KIcon::SizeMedium ) ); + TQFrame *itemColors = addPage( i18n( "Colors" ), i18n( "KSirc Color Settings" ), BarIcon( "colors", KIcon::SizeMedium ) ); + TQFrame *itemIRCColors = addPage( i18n( "IRC Colors" ), i18n( "KSirc IRC Color Settings" ), BarIcon( "colors", KIcon::SizeMedium ) ); - QFrame *itemRMBMenu = addPage( i18n( "User Menu" ), i18n( "User Menu Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); - QFrame *itemServChan = addPage( i18n( "Server/Channel" ), i18n( "Server/Channel Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); - QFrame *itemAutoConnect = addPage( i18n( "Auto Connect" ), i18n( "Auto Connect Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); - QFrame *itemFont = addPage( i18n( "Fonts" ), i18n( "Font Settings" ), BarIcon( "fonts", KIcon::SizeMedium ) ); - QFrame *itemShortcuts = addPage( i18n( "Shortcuts" ), i18n( "Shortcut Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); + TQFrame *itemRMBMenu = addPage( i18n( "User Menu" ), i18n( "User Menu Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); + TQFrame *itemServChan = addPage( i18n( "Server/Channel" ), i18n( "Server/Channel Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); + TQFrame *itemAutoConnect = addPage( i18n( "Auto Connect" ), i18n( "Auto Connect Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); + TQFrame *itemFont = addPage( i18n( "Fonts" ), i18n( "Font Settings" ), BarIcon( "fonts", KIcon::SizeMedium ) ); + TQFrame *itemShortcuts = addPage( i18n( "Shortcuts" ), i18n( "Shortcut Configuration" ), BarIcon( "", KIcon::SizeMedium ) ); - QVBoxLayout *fontTopLayout = new QVBoxLayout( itemFont, 0, 6 ); + TQVBoxLayout *fontTopLayout = new TQVBoxLayout( itemFont, 0, 6 ); - QVBoxLayout *looknfeelTopLayout= new QVBoxLayout( itemLooknFeel, 0, 6 ); - QVBoxLayout *generalTopLayout = new QVBoxLayout( itemGeneral, 0, 6 ); - QVBoxLayout *startupTopLayout = new QVBoxLayout( itemStartup, 0, 6 ); - QVBoxLayout *colorsTopLayout = new QVBoxLayout( itemColors, 0, 6 ); - QVBoxLayout *ircColorsTopLayout = new QVBoxLayout( itemIRCColors, 0, 6 ); + TQVBoxLayout *looknfeelTopLayout= new TQVBoxLayout( itemLooknFeel, 0, 6 ); + TQVBoxLayout *generalTopLayout = new TQVBoxLayout( itemGeneral, 0, 6 ); + TQVBoxLayout *startupTopLayout = new TQVBoxLayout( itemStartup, 0, 6 ); + TQVBoxLayout *colorsTopLayout = new TQVBoxLayout( itemColors, 0, 6 ); + TQVBoxLayout *ircColorsTopLayout = new TQVBoxLayout( itemIRCColors, 0, 6 ); - QVBoxLayout *rmbMenuTopLayout = new QVBoxLayout( itemRMBMenu, 0, 6 ); - QVBoxLayout *servChanTopLayout = new QVBoxLayout( itemServChan, 0, 6 ); - QVBoxLayout *autoConnectTopLayout = new QVBoxLayout( itemAutoConnect, 0, 6 ); - QVBoxLayout *autoShortcutsTopLayout = new QVBoxLayout( itemShortcuts, 0, 6 ); + TQVBoxLayout *rmbMenuTopLayout = new TQVBoxLayout( itemRMBMenu, 0, 6 ); + TQVBoxLayout *servChanTopLayout = new TQVBoxLayout( itemServChan, 0, 6 ); + TQVBoxLayout *autoConnectTopLayout = new TQVBoxLayout( itemAutoConnect, 0, 6 ); + TQVBoxLayout *autoShortcutsTopLayout = new TQVBoxLayout( itemShortcuts, 0, 6 ); pageLooknFeel= new PageLooknFeel( itemLooknFeel ); pageGeneral = new PageGeneral( itemGeneral ); @@ -69,20 +69,20 @@ KSPrefs::KSPrefs(QWidget * parent, const char * name): pageAutoConnect = new PageAutoConnect( itemAutoConnect ); pageShortcuts = new PageShortcuts( itemShortcuts ); - connect(pageLooknFeel, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageGeneral, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageStartup, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageColors, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageIRCColors, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageFont, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageRMBMenu, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageServChan, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageAutoConnect, SIGNAL( modified() ), SLOT( modified() ) ); - connect(pageShortcuts, SIGNAL( modified() ), SLOT( modified() ) ); - - connect(this, SIGNAL( applyClicked() ), this, SLOT( saveConfig() ) ); - connect(this, SIGNAL( okClicked() ), this, SLOT( saveConfig() ) ); - connect(this, SIGNAL( defaultClicked() ), this, SLOT(defaultConfig() ) ); + connect(pageLooknFeel, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageGeneral, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageStartup, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageColors, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageIRCColors, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageFont, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageRMBMenu, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageServChan, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageAutoConnect, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect(pageShortcuts, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + + connect(this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( saveConfig() ) ); + connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( saveConfig() ) ); + connect(this, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT(defaultConfig() ) ); looknfeelTopLayout->addWidget( pageLooknFeel ); generalTopLayout->addWidget( pageGeneral ); diff --git a/ksirc/KSPrefs/ksprefs.h b/ksirc/KSPrefs/ksprefs.h index 6c41fd9a..1e5beaf0 100644 --- a/ksirc/KSPrefs/ksprefs.h +++ b/ksirc/KSPrefs/ksprefs.h @@ -30,7 +30,7 @@ class KSPrefs : public KDialogBase Q_OBJECT public: - KSPrefs(QWidget * parent = 0, const char * name = 0); + KSPrefs(TQWidget * parent = 0, const char * name = 0); ~KSPrefs(); public slots: diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp index a6532915..c9ab585d 100644 --- a/ksirc/KSPrefs/page_autoconnect.cpp +++ b/ksirc/KSPrefs/page_autoconnect.cpp @@ -10,12 +10,12 @@ #include "page_autoconnect.h" -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -26,7 +26,7 @@ #define PASS 2 #define SSL 3 -PageAutoConnect::PageAutoConnect( QWidget *parent, const char *name ) : PageAutoConnectBase( parent, name) +PageAutoConnect::PageAutoConnect( TQWidget *parent, const char *name ) : PageAutoConnectBase( parent, name) { KLVAutoConnect->setSorting( 0 ); //KLVAutoConnect->header()->hide(); @@ -46,34 +46,34 @@ void PageAutoConnect::saveConfig() KConfig *conf = kapp->config(); conf->setGroup("AutoConnect"); - QStringList servers; + TQStringList servers; - for(QListViewItem *it = KLVAutoConnect->firstChild(); + for(TQListViewItem *it = KLVAutoConnect->firstChild(); it != 0; it = it->nextSibling()){ - QString server = it->text(NAME); + TQString server = it->text(NAME); if(it->text(PK).length() > 0) server += ":" + it->text(1); if(it->text(SSL).length() > 0) server += " (SSL)"; if(it->text(PASS).length() > 0) - server += QString(" (pass: %1)").arg(it->text(PASS)); + server += TQString(" (pass: %1)").arg(it->text(PASS)); servers << server; - QStringList channels; + TQStringList channels; - for(QListViewItem *ch = it->firstChild(); + for(TQListViewItem *ch = it->firstChild(); ch != 0; ch = ch->nextSibling()){ - QString channel; + TQString channel; channel = ch->text(NAME); if(ch->text(PK).length() > 0) - channel += QString(" (key: %1)").arg(ch->text(PK)); + channel += TQString(" (key: %1)").arg(ch->text(PK)); channels << channel; @@ -94,17 +94,17 @@ void PageAutoConnect::readConfig() { KConfig *conf = kapp->config(); conf->setGroup("AutoConnect"); - QStringList servers = conf->readListEntry("Servers"); + TQStringList servers = conf->readListEntry("Servers"); servers.sort(); - QStringList::ConstIterator ser = servers.begin(); + TQStringList::ConstIterator ser = servers.begin(); for( ; ser != servers.end(); ser++){ - QStringList channels = conf->readListEntry(*ser); - QString server = *ser; - QString port = "6667"; - QString ssl = QString::null; - QString pass = QString::null; + TQStringList channels = conf->readListEntry(*ser); + TQString server = *ser; + TQString port = "6667"; + TQString ssl = TQString::null; + TQString pass = TQString::null; - QRegExp rx("(.+) \\(SSL\\)(.*)"); + TQRegExp rx("(.+) \\(SSL\\)(.*)"); if(rx.search(server) >= 0){ server = rx.cap(1) + rx.cap(3); ssl = i18n("SSL"); @@ -121,19 +121,19 @@ void PageAutoConnect::readConfig() port = rx.cap(2); } kdDebug(5008) << server << ": Done " << port << " " << ssl << " " << pass << endl; - QListViewItem *s = new QListViewItem(KLVAutoConnect, server, port, pass, ssl); + TQListViewItem *s = new TQListViewItem(KLVAutoConnect, server, port, pass, ssl); s->setOpen(TRUE); channels.sort(); - QStringList::ConstIterator chan = channels.begin(); + TQStringList::ConstIterator chan = channels.begin(); for(; chan != channels.end(); chan++){ - QString channel = *chan; - QString key = QString::null; - QRegExp crx("(.+) \\(key: (\\S+)\\)"); + TQString channel = *chan; + TQString key = TQString::null; + TQRegExp crx("(.+) \\(key: (\\S+)\\)"); if(crx.search(channel) >= 0){ channel = crx.cap(1); key = crx.cap(2); } - new QListViewItem(s, channel, key); + new TQListViewItem(s, channel, key); } } } @@ -152,26 +152,26 @@ void PageAutoConnect::changed() void PageAutoConnect::add_pressed() { int fnd = 0; - QListViewItem *s = 0; + TQListViewItem *s = 0; s = KLVAutoConnect->selectedItem(); if(!s){ /* new item */ - QString server = ServerLE->text(); - QString ssl = QString::null; - QString port; + TQString server = ServerLE->text(); + TQString ssl = TQString::null; + TQString port; port.setNum(PortKI->value()); if(sslCB->isChecked()) ssl = i18n("SSL"); - s = new QListViewItem(KLVAutoConnect, server, port, PassLE->text(), ssl); + s = new TQListViewItem(KLVAutoConnect, server, port, PassLE->text(), ssl); s->setOpen(TRUE); - s = new QListViewItem(s, ChannelLE->text(), KeyLE->text()); + s = new TQListViewItem(s, ChannelLE->text(), KeyLE->text()); KLVAutoConnect->setCurrentItem(s); } else { /* update the existing one */ - QListViewItem *parent; - QListViewItem *child; + TQListViewItem *parent; + TQListViewItem *child; if(s->parent()){ parent = s->parent(); @@ -183,12 +183,12 @@ void PageAutoConnect::add_pressed() } parent->setText(NAME, ServerLE->text()); - parent->setText(PK, QString("%1").arg(PortKI->value())); + parent->setText(PK, TQString("%1").arg(PortKI->value())); parent->setText(PASS, PassLE->text()); if(sslCB->isChecked()) parent->setText(SSL, i18n("SSL")); else - parent->setText(SSL, QString::null); + parent->setText(SSL, TQString::null); if(child){ child->setText(NAME, ChannelLE->text()); @@ -197,7 +197,7 @@ void PageAutoConnect::add_pressed() else { if(ChannelLE->text().length() > 0){ fnd = 0; - QListViewItem *c = parent->firstChild(); + TQListViewItem *c = parent->firstChild(); for( ; c != 0 && fnd == 0; c = c->nextSibling()){ if(c->text(NAME) == ChannelLE->text()){ c->setText(PK, KeyLE->text()); @@ -205,7 +205,7 @@ void PageAutoConnect::add_pressed() } } if(fnd == 0){ - new QListViewItem(parent, ChannelLE->text(), KeyLE->text()); + new TQListViewItem(parent, ChannelLE->text(), KeyLE->text()); } } } @@ -228,13 +228,13 @@ void PageAutoConnect::new_pressed() void PageAutoConnect::delete_pressed() { - for(QListViewItem *it = KLVAutoConnect->firstChild(); + for(TQListViewItem *it = KLVAutoConnect->firstChild(); it != 0; it = it->nextSibling()){ if(it->text(NAME) == ServerLE->text()){ if(ChannelLE->text().isEmpty() == FALSE){ - for(QListViewItem *ch = it->firstChild(); + for(TQListViewItem *ch = it->firstChild(); ch != 0; ch = ch->nextSibling()){ if(ch->text(NAME) == ChannelLE->text()){ @@ -257,7 +257,7 @@ void PageAutoConnect::delete_pressed() changed(); } -void PageAutoConnect::kvl_clicked(QListViewItem *it) +void PageAutoConnect::kvl_clicked(TQListViewItem *it) { if(it != 0){ if(it->parent() != 0){ diff --git a/ksirc/KSPrefs/page_autoconnect.h b/ksirc/KSPrefs/page_autoconnect.h index efd9a4ed..04b5b821 100644 --- a/ksirc/KSPrefs/page_autoconnect.h +++ b/ksirc/KSPrefs/page_autoconnect.h @@ -9,7 +9,7 @@ class PageAutoConnect : public PageAutoConnectBase Q_OBJECT public: - PageAutoConnect( QWidget* parent = 0, const char* name = 0); + PageAutoConnect( TQWidget* parent = 0, const char* name = 0); ~PageAutoConnect(); void saveConfig(); @@ -29,7 +29,7 @@ protected slots: virtual void new_pressed(); virtual void delete_pressed(); - virtual void kvl_clicked(QListViewItem *); + virtual void kvl_clicked(TQListViewItem *); }; diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp index f6d68a52..e7b36af4 100644 --- a/ksirc/KSPrefs/page_colors.cpp +++ b/ksirc/KSPrefs/page_colors.cpp @@ -9,17 +9,17 @@ #include "page_colors.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -PageColors::PageColors( QWidget *parent, const char *name ) : PageColorsBase( parent, name) +PageColors::PageColors( TQWidget *parent, const char *name ) : PageColorsBase( parent, name) { changing = 0; m_dcol.setAutoDelete(true); @@ -52,13 +52,13 @@ void PageColors::saveConfig() } else if(autoOtherColRB->isChecked()){ ksopts->nickColourization = true; - ksopts->nickForeground = QColor(); - ksopts->nickBackground = QColor(); + ksopts->nickForeground = TQColor(); + ksopts->nickBackground = TQColor(); } else { ksopts->nickColourization = false; - ksopts->nickForeground = QColor(); - ksopts->nickBackground = QColor(); + ksopts->nickForeground = TQColor(); + ksopts->nickBackground = TQColor(); } ksopts->msgContainNick = ownContainNickCBtn->color(); @@ -68,7 +68,7 @@ void PageColors::saveConfig() ksopts->msg1Regex = msg1Regex->isChecked(); } else { - ksopts->msg1Contain = QColor(); + ksopts->msg1Contain = TQColor(); ksopts->msg1String = msg1LE->text(); ksopts->msg1Regex = false; } @@ -78,7 +78,7 @@ void PageColors::saveConfig() ksopts->msg2Regex = msg2Regex->isChecked(); } else { - ksopts->msg2Contain = QColor(); + ksopts->msg2Contain = TQColor(); ksopts->msg2String = msg2LE->text(); ksopts->msg2Regex = false; } @@ -88,8 +88,8 @@ void PageColors::saveConfig() ksopts->colourTheme = themeLB->currentText(); KConfig *conf = kapp->config(); - QDictIterator it(m_dcol); - QStringList names; + TQDictIterator it(m_dcol); + TQStringList names; for(; it.current(); ++it){ names << it.currentKey(); conf->setGroup("ColourSchemes-"+ it.currentKey()); @@ -128,8 +128,8 @@ void PageColors::readConfig( const KSOColors *opts ) if( opts->nickColourization ){ autoOtherColRB->setChecked( true ); - nickFGCBtn->setColor( QColor() ); - nickBGCBtn->setColor( QColor() ); + nickFGCBtn->setColor( TQColor() ); + nickBGCBtn->setColor( TQColor() ); } else if( opts->nickForeground.isValid() || @@ -140,8 +140,8 @@ void PageColors::readConfig( const KSOColors *opts ) } else { noOtherColRB->setChecked( true ); - nickFGCBtn->setColor( QColor() ); - nickBGCBtn->setColor( QColor() ); + nickFGCBtn->setColor( TQColor() ); + nickBGCBtn->setColor( TQColor() ); } @@ -161,7 +161,7 @@ void PageColors::readConfig( const KSOColors *opts ) KConfig *conf = kapp->config(); conf->setGroup("ColourSchemes"); themeLB->clear(); - QStringList names = conf->readListEntry("Names"); + TQStringList names = conf->readListEntry("Names"); if(names.contains("Custom")){ names.remove(names.find("Custom")); } @@ -175,7 +175,7 @@ void PageColors::readConfig( const KSOColors *opts ) m_dcol.clear(); - QStringList::Iterator it = names.begin(); + TQStringList::Iterator it = names.begin(); for( ; it != names.end(); ++it){ conf->setGroup("ColourSchemes-"+ *it); m_dcol.insert(*it, new KSOColors); @@ -207,12 +207,12 @@ void PageColors::changed() emit modified(); } -void PageColors::theme_clicked(QListBoxItem *li) +void PageColors::theme_clicked(TQListBoxItem *li) { if(li == 0x0) return; - QString name = li->text(); + TQString name = li->text(); changing = 1; backCBtn->setColor( m_dcol[name]->backgroundColor ); @@ -239,7 +239,7 @@ void PageColors::themeNewPB_clicked() void PageColors::themeAddPB_clicked() { - QString name = themeLE->text(); + TQString name = themeLE->text(); kdDebug(5008) << "Got add: " << themeLB->currentText() << endl; diff --git a/ksirc/KSPrefs/page_colors.h b/ksirc/KSPrefs/page_colors.h index 188fe0a8..5401aecc 100644 --- a/ksirc/KSPrefs/page_colors.h +++ b/ksirc/KSPrefs/page_colors.h @@ -13,16 +13,16 @@ #include "page_colorsbase.h" #include "ksopts.h" -#include -#include -#include +#include +#include +#include class PageColors : public PageColorsBase { Q_OBJECT public: - PageColors( QWidget *parent = 0, const char *name = 0 ); + PageColors( TQWidget *parent = 0, const char *name = 0 ); ~PageColors(); void saveConfig(); @@ -33,7 +33,7 @@ protected slots: void changed(); public slots: - virtual void theme_clicked(QListBoxItem*); + virtual void theme_clicked(TQListBoxItem*); virtual void themeNewPB_clicked(); virtual void themeAddPB_clicked(); virtual void themeDelPB_clicked(); @@ -47,7 +47,7 @@ private: private: int changing; - QDict m_dcol; + TQDict m_dcol; }; #endif diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index e9f9e0e6..5ea0dd9b 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -1,12 +1,12 @@ #include "page_font.h" -#include "qapplication.h" -PageFont::PageFont( QWidget *parent, const char *name ) : - QWidget( parent, name) +#include "tqapplication.h" +PageFont::PageFont( TQWidget *parent, const char *name ) : + TQWidget( parent, name) { - layout = new QHBoxLayout(this); + layout = new TQHBoxLayout(this); fontchooser = new KFontChooser(this); layout->addWidget(fontchooser); - connect(fontchooser,SIGNAL(fontSelected ( const QFont&)), this, SLOT(update())); + connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); } PageFont::~PageFont( ) @@ -21,7 +21,7 @@ void PageFont::update( void ){ void PageFont::saveConfig( void ) { ksopts->defaultFont = fontchooser->font(); - QApplication::setFont(fontchooser->font(), true, "KSirc::TextView" ); + TQApplication::setFont(fontchooser->font(), true, "KSirc::TextView" ); } void PageFont::readConfig( const KSOColors * opts ) diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h index 0d2fa673..44940170 100644 --- a/ksirc/KSPrefs/page_font.h +++ b/ksirc/KSPrefs/page_font.h @@ -1,7 +1,7 @@ #ifndef _PAGE_FONT #define _PAGE_FONT #include // For the font selection widget -#include // For the layout +#include // For the layout #include "ksopts.h" // For storing the info. /** @@ -17,7 +17,7 @@ class PageFont : public QWidget /** * Create the Widget */ - PageFont( QWidget *parent = 0, const char *name = 0 ); + PageFont( TQWidget *parent = 0, const char *name = 0 ); /* @@ -56,7 +56,7 @@ class PageFont : public QWidget private: KFontChooser* fontchooser; /** The font choosing widget from kdelib */ - QHBoxLayout* layout; + TQHBoxLayout* layout; }; #endif diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp index d6256e2c..51a78ec3 100644 --- a/ksirc/KSPrefs/page_general.cpp +++ b/ksirc/KSPrefs/page_general.cpp @@ -7,15 +7,15 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include #include #include "page_general.h" #include "../servercontroller.h" -PageGeneral::PageGeneral( QWidget *parent, const char *name ) : PageGeneralBase( parent, name) +PageGeneral::PageGeneral( TQWidget *parent, const char *name ) : PageGeneralBase( parent, name) { } @@ -82,10 +82,10 @@ void PageGeneral::readConfig( const KSOGeneral *opts ) encodingsCB->clear(); - QStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); // remove utf16/ucs2 as it just doesn't work for IRC - QStringList::Iterator encodingIt = encodings.begin(); + TQStringList::Iterator encodingIt = encodings.begin(); while ( encodingIt != encodings.end() ) { if ( ( *encodingIt ).find( "utf16" ) != -1 || ( *encodingIt ).find( "iso-10646" ) != -1 ) diff --git a/ksirc/KSPrefs/page_general.h b/ksirc/KSPrefs/page_general.h index ecf515ca..253d6623 100644 --- a/ksirc/KSPrefs/page_general.h +++ b/ksirc/KSPrefs/page_general.h @@ -18,7 +18,7 @@ class PageGeneral : public PageGeneralBase Q_OBJECT public: - PageGeneral( QWidget *parent = 0, const char *name = 0 ); + PageGeneral( TQWidget *parent = 0, const char *name = 0 ); ~PageGeneral(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_irccolors.cpp b/ksirc/KSPrefs/page_irccolors.cpp index aa6ff351..5ed96054 100644 --- a/ksirc/KSPrefs/page_irccolors.cpp +++ b/ksirc/KSPrefs/page_irccolors.cpp @@ -9,12 +9,12 @@ #include "page_irccolors.h" -#include -#include +#include +#include #include #include -PageIRCColors::PageIRCColors( QWidget *parent, const char *name ) : PageIRCColorsBase( parent, name) +PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name) { } diff --git a/ksirc/KSPrefs/page_irccolors.h b/ksirc/KSPrefs/page_irccolors.h index a34045c3..34565b42 100644 --- a/ksirc/KSPrefs/page_irccolors.h +++ b/ksirc/KSPrefs/page_irccolors.h @@ -18,7 +18,7 @@ class PageIRCColors : public PageIRCColorsBase Q_OBJECT public: - PageIRCColors( QWidget *parent = 0, const char *name = 0 ); + PageIRCColors( TQWidget *parent = 0, const char *name = 0 ); ~PageIRCColors(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_looknfeel.cpp b/ksirc/KSPrefs/page_looknfeel.cpp index 931a897c..29608e04 100644 --- a/ksirc/KSPrefs/page_looknfeel.cpp +++ b/ksirc/KSPrefs/page_looknfeel.cpp @@ -7,18 +7,18 @@ * * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include #include #include "page_looknfeel.h" -PageLooknFeel::PageLooknFeel( QWidget *parent, const char *name ) : PageLooknFeelBase( parent, name) +PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name) { - modePreview->setPixmap(QPixmap(locate("data","ksirc/pics/sdi.png"))); + modePreview->setPixmap(TQPixmap(locate("data","ksirc/pics/sdi.png"))); wallpaperPathLE->fileDialog()->setFilter( "*.jpg *.png *.gif" ); } @@ -54,14 +54,14 @@ void PageLooknFeel::defaultConfig() void PageLooknFeel::setPreviewPixmap( bool isSDI ) { if (isSDI == true) - modePreview->setPixmap( QPixmap( locate("data", "ksirc/pics/sdi.png" ) ) ); + modePreview->setPixmap( TQPixmap( locate("data", "ksirc/pics/sdi.png" ) ) ); else - modePreview->setPixmap( QPixmap( locate("data", "ksirc/pics/mdi.png" ) ) ); + modePreview->setPixmap( TQPixmap( locate("data", "ksirc/pics/mdi.png" ) ) ); } -void PageLooknFeel::showWallpaperPixmap( const QString &url ) +void PageLooknFeel::showWallpaperPixmap( const TQString &url ) { - wallpaperPreview->setPixmap( QPixmap( url ) ); + wallpaperPreview->setPixmap( TQPixmap( url ) ); } void PageLooknFeel::changed() diff --git a/ksirc/KSPrefs/page_looknfeel.h b/ksirc/KSPrefs/page_looknfeel.h index a5c7f96f..326498cb 100644 --- a/ksirc/KSPrefs/page_looknfeel.h +++ b/ksirc/KSPrefs/page_looknfeel.h @@ -18,7 +18,7 @@ class PageLooknFeel : public PageLooknFeelBase Q_OBJECT public: - PageLooknFeel( QWidget *parent = 0, const char *name = 0 ); + PageLooknFeel( TQWidget *parent = 0, const char *name = 0 ); ~PageLooknFeel(); void saveConfig(); @@ -30,7 +30,7 @@ signals: public slots: virtual void setPreviewPixmap( bool isSDI ); - virtual void showWallpaperPixmap( const QString &url ); + virtual void showWallpaperPixmap( const TQString &url ); virtual void changed(); }; diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp index 7baf5da5..de30a829 100644 --- a/ksirc/KSPrefs/page_rmbmenu.cpp +++ b/ksirc/KSPrefs/page_rmbmenu.cpp @@ -8,11 +8,11 @@ #include "page_rmbmenu.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -20,7 +20,7 @@ -PageRMBMenu::PageRMBMenu( QWidget *parent, const char *name ) : PageRMBMenuBase( parent, name) +PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase( parent, name) { UserControlMenu *ucm; @@ -41,21 +41,21 @@ PageRMBMenu::PageRMBMenu( QWidget *parent, const char *name ) : PageRMBMenuBase( changeItemPB->hide(); - connect(commandLB, SIGNAL(highlighted( int )), - this, SLOT(highlighted( int ))); - connect(moveUpPB, SIGNAL(clicked()), - this, SLOT(moveDown())); - connect(moveDownPB, SIGNAL(clicked()), - this, SLOT(moveUp())); + connect(commandLB, TQT_SIGNAL(highlighted( int )), + this, TQT_SLOT(highlighted( int ))); + connect(moveUpPB, TQT_SIGNAL(clicked()), + this, TQT_SLOT(moveDown())); + connect(moveDownPB, TQT_SIGNAL(clicked()), + this, TQT_SLOT(moveUp())); - connect(insertSeperatorPB, SIGNAL(clicked()), - this, SLOT(insSeperator())); + connect(insertSeperatorPB, TQT_SIGNAL(clicked()), + this, TQT_SLOT(insSeperator())); - connect(insertItemPB, SIGNAL(clicked()), - this, SLOT(insCommand())); + connect(insertItemPB, TQT_SIGNAL(clicked()), + this, TQT_SLOT(insCommand())); - connect(deleteItemPB, SIGNAL(clicked()), - this, SLOT(delCommand())); + connect(deleteItemPB, TQT_SIGNAL(clicked()), + this, TQT_SLOT(delCommand())); } @@ -122,7 +122,7 @@ void PageRMBMenu::moveUp() { int item = commandLB->currentItem(); - QString txt = commandLB->text(item); + TQString txt = commandLB->text(item); commandLB->removeItem(item); commandLB->insertItem(txt, item-1); @@ -139,7 +139,7 @@ void PageRMBMenu::moveDown() { int item = commandLB->currentItem(); - QString txt = commandLB->text(item); + TQString txt = commandLB->text(item); commandLB->removeItem(item); commandLB->insertItem(txt, item+1); @@ -156,7 +156,7 @@ void PageRMBMenu::insSeperator() { int item = commandLB->currentItem(); - QString txt = commandLB->text(item); + TQString txt = commandLB->text(item); commandLB->insertItem("--------------", item); commandLB->setCurrentItem(item); @@ -171,8 +171,8 @@ void PageRMBMenu::insCommand() { int item = commandLB->currentItem(); - QString te = entryLE->text(); - QString ce = commandLE->text(); + TQString te = entryLE->text(); + TQString ce = commandLE->text(); commandLB->insertItem(te, item); commandLB->setCurrentItem(item); @@ -193,7 +193,7 @@ void PageRMBMenu::delCommand() { int item = commandLB->currentItem(); - QString txt = commandLB->text(item); + TQString txt = commandLB->text(item); commandLB->removeItem(item); UserControlMenu::UserMenu.remove(item); diff --git a/ksirc/KSPrefs/page_rmbmenu.h b/ksirc/KSPrefs/page_rmbmenu.h index cb1de421..1d4a8dac 100644 --- a/ksirc/KSPrefs/page_rmbmenu.h +++ b/ksirc/KSPrefs/page_rmbmenu.h @@ -18,7 +18,7 @@ class PageRMBMenu : public PageRMBMenuBase Q_OBJECT public: - PageRMBMenu( QWidget *parent = 0, const char *name = 0 ); + PageRMBMenu( TQWidget *parent = 0, const char *name = 0 ); ~PageRMBMenu(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp index 4689bd2a..f7587947 100644 --- a/ksirc/KSPrefs/page_servchan.cpp +++ b/ksirc/KSPrefs/page_servchan.cpp @@ -9,18 +9,18 @@ #include "page_servchan.h" -#include -#include -#include +#include +#include +#include #include #include -PageServChan::PageServChan( QWidget *parent, const char *name ) : PageServChanBase( parent, name) +PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name) { - connect(serverDeleteItemPB, SIGNAL(pressed()), this, SLOT(deletePressedSL())); - connect(ServerAddItemPB, SIGNAL(pressed()), this, SLOT(addPressedSL())); - connect(chanDeleteItmPB, SIGNAL(pressed()), this, SLOT(deletePressedCL())); - connect(ChanAddItemPB, SIGNAL(pressed()), this, SLOT(addPressedCL())); + connect(serverDeleteItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedSL())); + connect(ServerAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedSL())); + connect(chanDeleteItmPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedCL())); + connect(ChanAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedCL())); } @@ -30,10 +30,10 @@ PageServChan::~PageServChan() void PageServChan::saveConfig() { - QStringList sLB; + TQStringList sLB; uint i; for(i = 0; i < serverLB->count(); i++){ - QString txt = serverLB->text(i); + TQString txt = serverLB->text(i); if(!txt.isNull()) sLB << txt; } @@ -41,9 +41,9 @@ void PageServChan::saveConfig() conf->setGroup("ServerList"); conf->writeEntry("RecentServers", sLB); - QStringList sCL; + TQStringList sCL; for(i = 0; i < channelLB->count(); i++){ - QString txt = channelLB->text(i); + TQString txt = channelLB->text(i); if(!txt.isNull()) sCL << txt; } @@ -55,7 +55,7 @@ void PageServChan::readConfig( const KSOServChan * ) { KConfig *conf = kapp->config(); conf->setGroup("ServerList"); - QStringList recent = conf->readListEntry("RecentServers"); + TQStringList recent = conf->readListEntry("RecentServers"); recent.sort(); serverLB->insertStringList(recent); conf->setGroup("Recent"); @@ -79,7 +79,7 @@ void PageServChan::deletePressedSL() { void PageServChan::addPressedSL() { uint i; - QString txt = LineEdit6->text(); + TQString txt = LineEdit6->text(); for(i = 0; i < serverLB->count(); i++){ if(txt == serverLB->text(i)){ @@ -111,7 +111,7 @@ void PageServChan::deletePressedCL() { void PageServChan::addPressedCL() { uint i; - QString txt = LineEdit6_2->text(); + TQString txt = LineEdit6_2->text(); for(i = 0; i < channelLB->count(); i++){ if(txt == channelLB->text(i)){ diff --git a/ksirc/KSPrefs/page_servchan.h b/ksirc/KSPrefs/page_servchan.h index 07429f2b..1e20e8d7 100644 --- a/ksirc/KSPrefs/page_servchan.h +++ b/ksirc/KSPrefs/page_servchan.h @@ -18,7 +18,7 @@ class PageServChan : public PageServChanBase Q_OBJECT public: - PageServChan( QWidget *parent = 0, const char *name = 0 ); + PageServChan( TQWidget *parent = 0, const char *name = 0 ); ~PageServChan(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index 45a83beb..4d2fda54 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -7,8 +7,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include @@ -16,12 +16,12 @@ #include "page_shortcuts.h" #include "../servercontroller.h" -PageShortcuts::PageShortcuts( QWidget *parent, const char *name ) : PageShortcutsBase( parent, name) +PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcutsBase( parent, name) { globalGB->setColumnLayout( 0, Qt::Horizontal ); m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); - connect(m_key, SIGNAL(keyChange()), this, SLOT(changed())); + connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); globalGB->layout()->add(m_key); } diff --git a/ksirc/KSPrefs/page_shortcuts.h b/ksirc/KSPrefs/page_shortcuts.h index 4c16aa35..36048f44 100644 --- a/ksirc/KSPrefs/page_shortcuts.h +++ b/ksirc/KSPrefs/page_shortcuts.h @@ -20,7 +20,7 @@ class PageShortcuts : public PageShortcutsBase Q_OBJECT public: - PageShortcuts( QWidget *parent = 0, const char *name = 0 ); + PageShortcuts( TQWidget *parent = 0, const char *name = 0 ); ~PageShortcuts(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp index 060da44d..e2ddfdc1 100644 --- a/ksirc/KSPrefs/page_startup.cpp +++ b/ksirc/KSPrefs/page_startup.cpp @@ -7,9 +7,9 @@ * * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include @@ -19,16 +19,16 @@ #include "page_startup.h" -PageStartup::PageStartup( QWidget *parent, const char *name ) : PageStartupBase( parent, name) +PageStartup::PageStartup( TQWidget *parent, const char *name ) : PageStartupBase( parent, name) { notifyLB->upButton()->hide(); notifyLB->downButton()->hide(); serverLB->upButton()->hide(); serverLB->downButton()->hide(); - QListBox *lb = serverLB->listBox(); - connect(lb, SIGNAL(highlighted(int)), - this, SLOT(clickedLB(int))); + TQListBox *lb = serverLB->listBox(); + connect(lb, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(clickedLB(int))); changing = false; @@ -41,11 +41,11 @@ PageStartup::~PageStartup() void PageStartup::saveConfig() { KSOServer glb = ksopts->server["global"]; - QStringList items = serverLB->items(); + TQStringList items = serverLB->items(); ksopts->server.clear(); - QStringList::iterator it = items.begin(); + TQStringList::iterator it = items.begin(); for( ; it != items.end(); ++it){ ksopts->server[*it] = server[*it]; } @@ -65,7 +65,7 @@ void PageStartup::readConfig( const KSOptions *opts ) if(it.data().globalCopy == false) serverLB->insertItem(it.key()); } - QListBoxItem *item = serverLB->listBox()->findItem("global"); + TQListBoxItem *item = serverLB->listBox()->findItem("global"); serverLB->listBox()->setSelected(item, true); changing = false; clickedLB(serverLB->listBox()->index(item)); @@ -82,7 +82,7 @@ void PageStartup::changed() { emit modified(); - QString ser = serverLB->currentText(); + TQString ser = serverLB->currentText(); if(ser.isEmpty()) return; @@ -106,7 +106,7 @@ void PageStartup::changed() void PageStartup::clickedLB(int index) { - QString text = serverLB->text(index); + TQString text = serverLB->text(index); if(!server.contains(text)){ server[text] = server["global"]; server[text].globalCopy = true; diff --git a/ksirc/KSPrefs/page_startup.h b/ksirc/KSPrefs/page_startup.h index ecac8305..c2092e65 100644 --- a/ksirc/KSPrefs/page_startup.h +++ b/ksirc/KSPrefs/page_startup.h @@ -18,7 +18,7 @@ class PageStartup : public PageStartupBase Q_OBJECT public: - PageStartup( QWidget *parent = 0, const char *name = 0 ); + PageStartup( TQWidget *parent = 0, const char *name = 0 ); ~PageStartup(); void saveConfig(); -- cgit v1.2.1