From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/konq/behaviour.cpp | 120 ++++++++++++------------- kcontrol/konq/behaviour.h | 28 +++--- kcontrol/konq/browser.cpp | 30 +++---- kcontrol/konq/browser.h | 6 +- kcontrol/konq/desktop.cpp | 74 +++++++-------- kcontrol/konq/desktop.h | 6 +- kcontrol/konq/desktopbehavior_impl.cpp | 118 ++++++++++++------------ kcontrol/konq/desktopbehavior_impl.h | 8 +- kcontrol/konq/fontopts.cpp | 158 ++++++++++++++++----------------- kcontrol/konq/fontopts.h | 46 +++++----- kcontrol/konq/main.cpp | 20 ++--- kcontrol/konq/previews.cpp | 58 ++++++------ kcontrol/konq/previews.h | 10 +-- kcontrol/konq/rootopts.cpp | 74 +++++++-------- kcontrol/konq/rootopts.h | 6 +- 15 files changed, 381 insertions(+), 381 deletions(-) (limited to 'kcontrol/konq') diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 4bb782eeb..af6c12cc4 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -18,13 +18,13 @@ // Behaviour options for konqueror -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include @@ -38,43 +38,43 @@ #include "behaviour.h" -KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *parent, const char * ) +KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent, const char * ) : KCModule(parent, "kcmkonq"), g_pConfig(config), groupname(group) { - QLabel * label; + TQLabel * label; setQuickHelp( i18n("

Konqueror Behavior

You can configure how Konqueror behaves as a file manager here.")); - QVBoxLayout *lay = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - QVGroupBox * miscGb = new QVGroupBox(i18n("Misc Options"), this); + TQVGroupBox * miscGb = new TQVGroupBox(i18n("Misc Options"), this); lay->addWidget( miscGb ); - QHBox *hbox = new QHBox(miscGb); - QVBox *vbox = new QVBox(hbox); + TQHBox *hbox = new TQHBox(miscGb); + TQVBox *vbox = new TQVBox(hbox); // ---- - winPixmap = new QLabel(hbox); - winPixmap->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - winPixmap->setPixmap(QPixmap(locate("data", + winPixmap = new TQLabel(hbox); + winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); + winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); winPixmap->setFixedSize( winPixmap->sizeHint() ); // ---- - cbNewWin = new QCheckBox(i18n("Open folders in separate &windows"), vbox); - QWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when " + cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox); + TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when " "you open a folder, rather than showing that folder's contents in the current window.")); - connect(cbNewWin, SIGNAL(clicked()), this, SLOT(changed())); - connect(cbNewWin, SIGNAL(toggled(bool)), SLOT(updateWinPixmap(bool))); + connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool))); // ---- - cbListProgress = new QCheckBox( i18n( "&Show network operations in a single window" ), vbox ); - connect(cbListProgress, SIGNAL(clicked()), this, SLOT(changed())); + cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox ); + connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbListProgress, i18n("Checking this option will group the" + TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the" " progress information for all network file transfers into a single window" " with a list. When the option is not checked, all transfers appear in a" " separate window.") ); @@ -82,83 +82,83 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *pa // -- - cbShowTips = new QCheckBox( i18n( "Show file &tips" ), vbox ); - connect(cbShowTips, SIGNAL(clicked()), this, SLOT(changed())); + cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox ); + connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a " + TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a " "small popup window with additional information about that file")); - connect(cbShowTips, SIGNAL(toggled(bool)), SLOT(slotShowTips(bool))); + connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool))); /* - //connect(cbShowTips, SIGNAL(toggled(bool)), sbToolTip, SLOT(setEnabled(bool))); - //connect(cbShowTips, SIGNAL(toggled(bool)), fileTips, SLOT(setEnabled(bool))); + //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool))); + //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool))); fileTips->setBuddy(sbToolTip); - QString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some " + TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some " "additional information about that file. Here, you can set how many items of information " "are displayed"); - QWhatsThis::add( fileTips, tipstr ); - QWhatsThis::add( sbToolTip, tipstr ); + TQWhatsThis::add( fileTips, tipstr ); + TQWhatsThis::add( sbToolTip, tipstr ); */ - QHBox *hboxpreview = new QHBox(vbox); - QWidget* spacer = new QWidget( hboxpreview ); + TQHBox *hboxpreview = new TQHBox(vbox); + TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); - cbShowPreviewsInTips = new QCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); - connect(cbShowPreviewsInTips, SIGNAL(clicked()), this, SLOT(changed())); + cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); + connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the " + TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the " "popup window to contain a larger preview for the file, when moving the mouse over it.")); - cbRenameDirectlyIcon = new QCheckBox(i18n("Rename icons in&line"), vbox); - QWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be " + cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox); + TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be " "renamed by clicking directly on the icon name. ")); - connect(cbRenameDirectlyIcon, SIGNAL(clicked()), this, SLOT(changed())); + connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QHBoxLayout *hlay = new QHBoxLayout( lay ); + TQHBoxLayout *hlay = new TQHBoxLayout( lay ); - label = new QLabel(i18n("Home &URL:"), this); + label = new TQLabel(i18n("Home &URL:"), this); hlay->addWidget( label ); homeURL = new KURLRequester(this); homeURL->setMode(KFile::Directory); homeURL->setCaption(i18n("Select Home Folder")); hlay->addWidget( homeURL ); - connect(homeURL, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); + connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); label->setBuddy(homeURL); - QString homestr = i18n("This is the URL (e.g. a folder or a web page) where " + TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where " "Konqueror will jump to when the \"Home\" button is pressed. " "This is usually your home folder, symbolized by a 'tilde' (~)."); - QWhatsThis::add( label, homestr ); - QWhatsThis::add( homeURL, homestr ); + TQWhatsThis::add( label, homestr ); + TQWhatsThis::add( homeURL, homestr ); - lay->addItem(new QSpacerItem(0,20,QSizePolicy::Fixed,QSizePolicy::Fixed)); + lay->addItem(new TQSpacerItem(0,20,TQSizePolicy::Fixed,TQSizePolicy::Fixed)); - cbShowDeleteCommand = new QCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this ); + cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this ); lay->addWidget( cbShowDeleteCommand ); - connect(cbShowDeleteCommand, SIGNAL(clicked()), this, SLOT(changed())); + connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed " + TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed " "on the desktop and in the file manager's context menus. " "You can always delete files by holding the Shift key " "while calling 'Move to Trash'.")); - QButtonGroup *bg = new QVButtonGroup( i18n("Ask Confirmation For"), this ); + TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this ); bg->layout()->setSpacing( KDialog::spacingHint() ); - QWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask" + TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask" " for a confirmation when you \"delete\" a file." "
  • Move To Trash: moves the file to your trash folder," " from where it can be recovered very easily.
    • " "
  • Delete: simply deletes the file.
    • " "
") ); - connect(bg, SIGNAL( clicked( int ) ), SLOT( changed() )); + connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() )); - cbMoveToTrash = new QCheckBox( i18n("&Move to trash"), bg ); + cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg ); - cbDelete = new QCheckBox( i18n("D&elete"), bg ); + cbDelete = new TQCheckBox( i18n("D&elete"), bg ); lay->addWidget(bg); @@ -234,7 +234,7 @@ void KBehaviourOptions::save() g_pConfig->setGroup( groupname ); g_pConfig->writeEntry( "AlwaysNewWin", cbNewWin->isChecked() ); - g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? QString("~") : homeURL->url() ); + g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? TQString("~") : homeURL->url() ); g_pConfig->writeEntry( "ShowFileTips", cbShowTips->isChecked() ); g_pConfig->writeEntry( "ShowPreviewsInFileTips", cbShowPreviewsInTips->isChecked() ); @@ -265,7 +265,7 @@ void KBehaviourOptions::save() } // Send signal to konqueror - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); @@ -275,10 +275,10 @@ void KBehaviourOptions::save() void KBehaviourOptions::updateWinPixmap(bool b) { if (b) - winPixmap->setPixmap(QPixmap(locate("data", + winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/overlapping.png"))); else - winPixmap->setPixmap(QPixmap(locate("data", + winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); } diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index 9db3a36ba..2cfcb95fb 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -37,7 +37,7 @@ class KBehaviourOptions : public KCModule { Q_OBJECT public: - KBehaviourOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0); + KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KBehaviourOptions(); virtual void load(); virtual void load( bool useDefaults ); @@ -51,25 +51,25 @@ protected slots: private: KConfig *g_pConfig; - QString groupname; + TQString groupname; - QCheckBox *cbNewWin; - QCheckBox *cbListProgress; + TQCheckBox *cbNewWin; + TQCheckBox *cbListProgress; - QLabel *winPixmap; + TQLabel *winPixmap; KURLRequester *homeURL; - QVButtonGroup *bgOneProcess; - //QLabel *fileTips; - //QSpinBox *sbToolTip; - QCheckBox *cbShowTips; - QCheckBox *cbShowPreviewsInTips; - QCheckBox *cbRenameDirectlyIcon; + TQVButtonGroup *bgOneProcess; + //TQLabel *fileTips; + //TQSpinBox *sbToolTip; + TQCheckBox *cbShowTips; + TQCheckBox *cbShowPreviewsInTips; + TQCheckBox *cbRenameDirectlyIcon; - QCheckBox *cbMoveToTrash; - QCheckBox *cbDelete; - QCheckBox *cbShowDeleteCommand; + TQCheckBox *cbMoveToTrash; + TQCheckBox *cbDelete; + TQCheckBox *cbShowDeleteCommand; }; #endif // __BEHAVIOUR_H__ diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index 5ab82579d..cb1b5c47e 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -16,9 +16,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include @@ -30,11 +30,11 @@ #include "previews.h" #include "browser.h" -KBrowserOptions::KBrowserOptions(KConfig *config, QString group, QWidget *parent, const char *name) +KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) : KCModule( parent, "kcmkonq" ) { - QVBoxLayout *layout = new QVBoxLayout(this); - QTabWidget *tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + TQTabWidget *tab = new TQTabWidget(this); layout->addWidget(tab); appearance = new KonqFontOptions(config, group, false, tab, name); @@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(KConfig *config, QString group, QWidget *parent tab->addTab(kuick, i18n("&Quick Copy && Move")); } - connect(appearance, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); - connect(behavior, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); - connect(previews, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); + connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); if (kuick) - connect(kuick, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); + connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(tab, SIGNAL(currentChanged(QWidget *)), - this, SIGNAL(quickHelpChanged())); + connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), + this, TQT_SIGNAL(quickHelpChanged())); m_tab = tab; } @@ -95,15 +95,15 @@ void KBrowserOptions::save() kuick->save(); } -QString KBrowserOptions::quickHelp() const +TQString KBrowserOptions::quickHelp() const { - QWidget *w = m_tab->currentPage(); + TQWidget *w = m_tab->currentPage(); if (w->inherits("KCModule")) { KCModule *m = static_cast(w); return m->quickHelp(); } - return QString::null; + return TQString::null; } #include "browser.moc" diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h index 26727de1b..f8856fd74 100644 --- a/kcontrol/konq/browser.h +++ b/kcontrol/konq/browser.h @@ -31,12 +31,12 @@ class KBrowserOptions : public KCModule { Q_OBJECT public: - KBrowserOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0); + KBrowserOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: @@ -44,7 +44,7 @@ private: KCModule *behavior; KCModule *previews; KCModule *kuick; - QTabWidget *m_tab; + TQTabWidget *m_tab; }; #endif diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index c2478b587..98275995c 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT KCModule *create_virtualdesktops(QWidget *parent, const char * /*name*/) + KDE_EXPORT KCModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) { return new KDesktopConfig(parent, "kcmkonq"); } @@ -51,7 +51,7 @@ extern "C" // be able to TAB through those line edits fast. So don't send me mails // asking why I did not implement a more intelligent/smaller GUI. -KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) +KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) : KCModule(parent, "kcmkonq") { @@ -59,24 +59,24 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) Q_ASSERT(maxDesktops % 2 == 0); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // number group - QGroupBox *number_group = new QGroupBox(this); + TQGroupBox *number_group = new TQGroupBox(this); - QHBoxLayout *lay = new QHBoxLayout(number_group, + TQHBoxLayout *lay = new TQHBoxLayout(number_group, KDialog::marginHint(), KDialog::spacingHint()); - QLabel *label = new QLabel(i18n("N&umber of desktops: "), number_group); + TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group); _numInput = new KIntNumInput(4, number_group); _numInput->setRange(1, maxDesktops, 1, true); - connect(_numInput, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int))); - connect(_numInput, SIGNAL(valueChanged(int)), SLOT( changed() )); + connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); label->setBuddy( _numInput ); - QString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." ); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( _numInput, wtstr ); + TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( _numInput, wtstr ); lay->addWidget(label); lay->addWidget(_numInput); @@ -85,25 +85,25 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) layout->addWidget(number_group); // name group - QGroupBox *name_group = new QGroupBox(i18n("Desktop &Names"), this); + TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); name_group->setColumnLayout(4, Horizontal); for(int i = 0; i < (maxDesktops/2); i++) { - _nameLabel[i] = new QLabel(i18n("Desktop %1:").arg(i+1), name_group); + _nameLabel[i] = new TQLabel(i18n("Desktop %1:").arg(i+1), name_group); _nameInput[i] = new KLineEdit(name_group); - _nameLabel[i+(maxDesktops/2)] = new QLabel(i18n("Desktop %1:").arg(i+(maxDesktops/2)+1), name_group); + _nameLabel[i+(maxDesktops/2)] = new TQLabel(i18n("Desktop %1:").arg(i+(maxDesktops/2)+1), name_group); _nameInput[i+(maxDesktops/2)] = new KLineEdit(name_group); - QWhatsThis::add( _nameLabel[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); - QWhatsThis::add( _nameInput[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); - QWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); - QWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); - - connect(_nameInput[i], SIGNAL(textChanged(const QString&)), - SLOT( changed() )); - connect(_nameInput[i+(maxDesktops/2)], SIGNAL(textChanged(const QString&)), - SLOT( changed() )); + TQWhatsThis::add( _nameLabel[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); + TQWhatsThis::add( _nameInput[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) ); + TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); + TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); + + connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT( changed() )); + connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT( changed() )); } for(int i = 1; i < maxDesktops; i++) @@ -111,8 +111,8 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/) layout->addWidget(name_group); - _wheelOption = new QCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); - connect(_wheelOption,SIGNAL(toggled(bool)), SLOT( changed() )); + _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); + connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); layout->addWidget(_wheelOption); layout->addStretch(1); @@ -135,7 +135,7 @@ void KDesktopConfig::load( bool useDefaults ) if (qt_xdisplay()) konq_screen_number = DefaultScreen(qt_xdisplay()); - QCString groupname; + TQCString groupname; if (konq_screen_number == 0) groupname = "Desktops"; else @@ -148,8 +148,8 @@ void KDesktopConfig::load( bool useDefaults ) kwinconfig->setGroup("Desktops"); for(int i = 1; i <= maxDesktops; i++) { - QString key_name(QString("Name_") + QString::number(i)); - QString name = QString::fromUtf8(info.desktopName(i)); + TQString key_name(TQString("Name_") + TQString::number(i)); + TQString name = TQString::fromUtf8(info.desktopName(i)); if (name.isEmpty()) // Get name from configuration if none is set in the WM. { name = kwinconfig->readEntry(key_name, i18n("Desktop %1").arg(i)); @@ -166,7 +166,7 @@ void KDesktopConfig::load( bool useDefaults ) delete kwinconfig; kwinconfig = 0; - QString configfile; + TQString configfile; if (konq_screen_number == 0) configfile = "kdesktoprc"; else @@ -210,7 +210,7 @@ void KDesktopConfig::save() if (qt_xdisplay()) konq_screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -224,7 +224,7 @@ void KDesktopConfig::save() // Tell kdesktop about the new config file if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h index 291d5dd8f..548af65b0 100644 --- a/kcontrol/konq/desktop.h +++ b/kcontrol/konq/desktop.h @@ -35,7 +35,7 @@ class KDesktopConfig : public KCModule Q_OBJECT public: - KDesktopConfig(QWidget *parent = 0L, const char *name = 0L); + KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L); void load(); void load( bool useDefaults ); @@ -47,9 +47,9 @@ class KDesktopConfig : public KCModule private: KIntNumInput *_numInput; - QLabel *_nameLabel[maxDesktops]; + TQLabel *_nameLabel[maxDesktops]; KLineEdit *_nameInput[maxDesktops]; - QCheckBox *_wheelOption; + TQCheckBox *_wheelOption; bool _wheelOptionImmutable; bool _labelImmutable[maxDesktops]; }; diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index e8052bfb0..7a7f50a76 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -22,14 +22,14 @@ #include "desktopbehavior_impl.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -46,13 +46,13 @@ const int customMenu1ID = 5; const int customMenu2ID = 6; -DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, QWidget *parent, const char * ) +DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - QVBoxLayout* layout = new QVBoxLayout(this); + TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); layout->addWidget(m_behavior); - connect(m_behavior, SIGNAL(changed()), this, SLOT(changed())); + connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); } void DesktopBehaviorModule::changed() @@ -63,59 +63,59 @@ void DesktopBehaviorModule::changed() class DesktopBehaviorPreviewItem : public QCheckListItem { public: - DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, QListView *parent, + DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent, const KService::Ptr &plugin, bool on) - : QCheckListItem(parent, plugin->name(), CheckBox), + : TQCheckListItem(parent, plugin->name(), CheckBox), m_rootOpts(rootOpts) { m_pluginName = plugin->desktopEntryName(); setOn(on); } - DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, QListView *parent, + DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent, bool on) - : QCheckListItem(parent, i18n("Sound Files"), CheckBox), + : TQCheckListItem(parent, i18n("Sound Files"), CheckBox), m_rootOpts(rootOpts) { m_pluginName = "audio/"; setOn(on); } - const QString &pluginName() const { return m_pluginName; } + const TQString &pluginName() const { return m_pluginName; } protected: virtual void stateChange( bool ) { m_rootOpts->changed(); } private: DesktopBehavior *m_rootOpts; - QString m_pluginName; + TQString m_pluginName; }; class DesktopBehaviorMediaItem : public QCheckListItem { public: - DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, QListView *parent, - const QString name, const QString mimetype, bool on) - : QCheckListItem(parent, name, CheckBox), + DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent, + const TQString name, const TQString mimetype, bool on) + : TQCheckListItem(parent, name, CheckBox), m_rootOpts(rootOpts),m_mimeType(mimetype){setOn(on);} - const QString &mimeType() const { return m_mimeType; } + const TQString &mimeType() const { return m_mimeType; } protected: virtual void stateChange( bool ) { m_rootOpts->changed(); } private: DesktopBehavior *m_rootOpts; - QString m_mimeType; + TQString m_mimeType; }; static const int choiceCount=7; static const char * s_choices[7] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "BookmarksMenu", "CustomMenu1", "CustomMenu2" }; -DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * ) +DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * ) : DesktopBehaviorBase( parent, "kcmkonq" ), g_pConfig(config) { - QString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3; + TQString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3; /* * The text on this form depends on the mouse setting, which can be right @@ -124,14 +124,14 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(QString::fromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); - connect(desktopMenuGroup, SIGNAL(clicked(int)), this, SIGNAL(changed())); - connect(iconsEnabledBox, SIGNAL(clicked()), this, SLOT(enableChanged())); - connect(showHiddenBox, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(vrootBox, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(autoLineupIconsBox, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(toolTipBox, SIGNAL(clicked()), this, SIGNAL(changed())); + connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); + connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); + connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); strMouseButton1 = i18n("&Left button:"); strButtonTxt1 = i18n( "You can choose what happens when" @@ -150,10 +150,10 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * leftLabel->setText( strMouseButton1 ); leftLabel->setBuddy( leftComboBox ); fillMenuCombo( leftComboBox ); - connect(leftEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed())); - connect(leftComboBox, SIGNAL(activated(int)), this, SIGNAL(changed())); - connect(leftComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged())); - QString wtstr = strButtonTxt1 + + connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); + connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); + connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + TQString wtstr = strButtonTxt1 + i18n("
  • No action: as you might guess, nothing happens!
    • " "
  • Window list menu: a menu showing all windows on all" " virtual desktops pops up. You can click on the desktop name to switch" @@ -167,14 +167,14 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * "
  • Application menu: the \"K\" menu pops up. This might be" " useful for quickly accessing applications if you like to keep the" " panel (also known as \"Kicker\") hidden from view.
"); - QWhatsThis::add( leftLabel, wtstr ); - QWhatsThis::add( leftComboBox, wtstr ); + TQWhatsThis::add( leftLabel, wtstr ); + TQWhatsThis::add( leftComboBox, wtstr ); middleLabel->setBuddy( middleComboBox ); fillMenuCombo( middleComboBox ); - connect(middleEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed())); - connect(middleComboBox, SIGNAL(activated(int)), this, SIGNAL(changed())); - connect(middleComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged())); + connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); + connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); + connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); wtstr = i18n("You can choose what happens when" " you click the middle button of your pointing device on the desktop:" "
  • No action: as you might guess, nothing happens!
    • " @@ -190,15 +190,15 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * "
  • Application menu: the \"K\" menu pops up. This might be" " useful for quickly accessing applications if you like to keep the" " panel (also known as \"Kicker\") hidden from view.
"); - QWhatsThis::add( middleLabel, wtstr ); - QWhatsThis::add( middleComboBox, wtstr ); + TQWhatsThis::add( middleLabel, wtstr ); + TQWhatsThis::add( middleComboBox, wtstr ); rightLabel->setText( strMouseButton3 ); rightLabel->setBuddy( rightComboBox ); fillMenuCombo( rightComboBox ); - connect(rightEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed())); - connect(rightComboBox, SIGNAL(activated(int)), this, SIGNAL(changed())); - connect(rightComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged())); + connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); + connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); + connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); wtstr = strButtonTxt3 + i18n("
  • No action: as you might guess, nothing happens!
    • " "
  • Window list menu: a menu showing all windows on all" @@ -213,12 +213,12 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * "
  • Application menu: the \"K\" menu pops up. This might be" " useful for quickly accessing applications if you like to keep the" " panel (also known as \"Kicker\") hidden from view.
"); - QWhatsThis::add( rightLabel, wtstr ); - QWhatsThis::add( rightComboBox, wtstr ); + TQWhatsThis::add( rightLabel, wtstr ); + TQWhatsThis::add( rightComboBox, wtstr ); if (m_bHasMedia) { - connect(enableMediaBox, SIGNAL(clicked()), this, SLOT(enableChanged())); + connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); } else { @@ -233,10 +233,10 @@ void DesktopBehavior::fillMediaListView() mediaListView->clear(); mediaListView->setRootIsDecorated(false); KMimeType::List mimetypes = KMimeType::allMimeTypes(); - QValueListIterator it2(mimetypes.begin()); + TQValueListIterator it2(mimetypes.begin()); g_pConfig->setGroup( "Media" ); enableMediaBox->setChecked(g_pConfig->readBoolEntry("enabled",false)); - QString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); + TQString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { @@ -254,7 +254,7 @@ void DesktopBehavior::saveMediaListView() g_pConfig->setGroup( "Media" ); g_pConfig->writeEntry("enabled",enableMediaBox->isChecked()); - QStringList exclude; + TQStringList exclude; for (DesktopBehaviorMediaItem *it=static_cast(mediaListView->firstChild()); it; it=static_cast(it->nextSibling())) { @@ -264,7 +264,7 @@ void DesktopBehavior::saveMediaListView() } -void DesktopBehavior::fillMenuCombo( QComboBox * combo ) +void DesktopBehavior::fillMenuCombo( TQComboBox * combo ) { combo->insertItem( i18n("No Action") ); combo->insertItem( i18n("Window List Menu") ); @@ -289,7 +289,7 @@ void DesktopBehavior::load( bool useDefaults ) //bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN); KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); previewListView->clear(); - QStringList previews = g_pConfig->readListEntry("Preview"); + TQStringList previews = g_pConfig->readListEntry("Preview"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); @@ -314,7 +314,7 @@ void DesktopBehavior::load( bool useDefaults ) // g_pConfig->setGroup( "Mouse Buttons" ); - QString s; + TQString s; s = g_pConfig->readEntry( "Left", "" ); for ( int c = 0 ; c < choiceCount ; c ++ ) if (s == s_choices[c]) @@ -344,7 +344,7 @@ void DesktopBehavior::save() { g_pConfig->setGroup( "Desktop Icons" ); g_pConfig->writeEntry("ShowHidden", showHiddenBox->isChecked()); - QStringList previews; + TQStringList previews; for ( DesktopBehaviorPreviewItem *item = static_cast( previewListView->firstChild() ); item; item = static_cast( item->nextSibling() ) ) @@ -380,10 +380,10 @@ void DesktopBehavior::save() // Tell kdesktop about the new config file if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; int konq_screen_number = KApplication::desktop()->primaryScreen(); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -432,7 +432,7 @@ void DesktopBehavior::editButtonPressed() if (sender() == rightEditButton) i = rightComboBox->currentItem(); - QString cfgFile; + TQString cfgFile; if (i == customMenu1ID) cfgFile = "kdesktop_custom_menu1"; if (i == customMenu2ID) @@ -453,7 +453,7 @@ void DesktopBehavior::editButtonPressed() } } -QString DesktopBehavior::quickHelp() const +TQString DesktopBehavior::quickHelp() const { return i18n("

Behavior

\n" "This module allows you to choose various options\n" diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index 0417e8994..851df09f2 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -29,12 +29,12 @@ class DesktopBehavior : public DesktopBehaviorBase { Q_OBJECT public: - DesktopBehavior(KConfig *config, QWidget *parent = 0L, const char *name = 0L ); + DesktopBehavior(KConfig *config, TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; friend class DesktopBehaviorPreviewItem; friend class DesktopBehaviorMediaItem; @@ -53,7 +53,7 @@ private: void saveMediaListView(); // Combo for the menus - void fillMenuCombo( QComboBox * combo ); + void fillMenuCombo( TQComboBox * combo ); typedef enum { NOTHING = 0, WINDOWLISTMENU, DESKTOPMENU, APPMENU, BOOKMARKSMENU=12 } menuChoice; bool m_bHasMedia; @@ -64,7 +64,7 @@ class DesktopBehaviorModule : public KCModule Q_OBJECT public: - DesktopBehaviorModule(KConfig *config, QWidget *parent = 0L, const char *name = 0L ); + DesktopBehaviorModule(KConfig *config, TQWidget *parent = 0L, const char *name = 0L ); virtual void load() { m_behavior->load(); emit KCModule::changed( false ); } virtual void save() { m_behavior->save(); emit KCModule::changed( false ); } virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); } diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 66cc3962c..98c804adc 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -19,10 +19,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -40,16 +40,16 @@ //----------------------------------------------------------------------------- -KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, QWidget *parent, const char* /*name*/) +KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/) : KCModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop) { - QLabel *label; - QString wtstr; + TQLabel *label; + TQString wtstr; int row = 0; int LASTLINE = m_bDesktop ? 8 : 10; // this can be different :) #define LASTCOLUMN 2 - QGridLayout *lay = new QGridLayout(this,LASTLINE+1,LASTCOLUMN+1, 0, + TQGridLayout *lay = new TQGridLayout(this,LASTLINE+1,LASTCOLUMN+1, 0, KDialog::spacingHint()); lay->setRowStretch(LASTLINE,10); lay->setColStretch(LASTCOLUMN,10); @@ -57,132 +57,132 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, Q row++; m_pStandard = new KFontCombo( this ); - label = new QLabel( m_pStandard, i18n("&Standard font:"), this ); + label = new TQLabel( m_pStandard, i18n("&Standard font:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pStandard,row,row,1,1); wtstr = i18n("This is the font used to display text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pStandard, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pStandard, wtstr ); row++; - connect( m_pStandard, SIGNAL( activated(const QString&) ), - SLOT( slotStandardFont(const QString&) ) ); - connect( m_pStandard, SIGNAL( activated(const QString&) ), - SLOT(changed() ) ); - connect( m_pStandard, SIGNAL( textChanged(const QString&) ), - SLOT( slotStandardFont(const QString&) ) ); - connect( m_pStandard, SIGNAL( textChanged(const QString&) ), - SLOT(changed() ) ); - - m_pSize = new QSpinBox( 4,18,1,this ); - label = new QLabel( m_pSize, i18n("Font si&ze:"), this ); + connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), + TQT_SLOT(changed() ) ); + connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), + TQT_SLOT(changed() ) ); + + m_pSize = new TQSpinBox( 4,18,1,this ); + label = new TQLabel( m_pSize, i18n("Font si&ze:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pSize,row,row,1,1); - connect( m_pSize, SIGNAL( valueChanged(int) ), - this, SLOT( slotFontSize(int) ) ); + connect( m_pSize, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT( slotFontSize(int) ) ); row+=2; wtstr = i18n("This is the font size used to display text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pSize, wtstr ); - int hAlign = QApplication::reverseLayout() ? AlignRight : AlignLeft; + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pSize, wtstr ); + int hAlign = TQApplication::reverseLayout() ? AlignRight : AlignLeft; // #define COLOR_BUTTON_COL 1 m_pNormalText = new KColorButton( normalTextColor, this ); - label = new QLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); + label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); lay->addWidget(label,row,0); lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,hAlign); wtstr = i18n("This is the color used to display text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pNormalText, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pNormalText, wtstr ); - connect( m_pNormalText, SIGNAL( changed( const QColor & ) ), - SLOT( slotNormalTextColorChanged( const QColor & ) ) ); + connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ), + TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) ); /* row++; - label = new QLabel( i18n("Highlighted text color:"), this ); + label = new TQLabel( i18n("Highlighted text color:"), this ); lay->addWidget(label,row,0); m_pHighlightedText = new KColorButton( highlightedTextColor, this ); lay->addWidget(m_pHighlightedText,row,COLOR_BUTTON_COL,hAlign); wtstr = i18n("This is the color used to display selected text in Konqueror windows."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pHighlightedText, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pHighlightedText, wtstr ); - connect( m_pHighlightedText, SIGNAL( changed( const QColor & ) ), - SLOT( slotHighlightedTextColorChanged( const QColor & ) ) ); + connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ), + TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) ); */ row++; if ( m_bDesktop ) { - m_cbTextBackground = new QCheckBox( i18n("&Text background color:"), this ); + m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this ); lay->addWidget(m_cbTextBackground,row,0); - connect( m_cbTextBackground, SIGNAL( clicked() ), - SLOT( slotTextBackgroundClicked() ) ); + connect( m_cbTextBackground, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,hAlign); wtstr = i18n("This is the color used behind the text for the icons on the desktop."); - QWhatsThis::add( label, wtstr ); - QWhatsThis::add( m_pTextBackground, wtstr ); + TQWhatsThis::add( label, wtstr ); + TQWhatsThis::add( m_pTextBackground, wtstr ); - connect( m_pTextBackground, SIGNAL( changed( const QColor & ) ), - SLOT( slotTextBackgroundColorChanged( const QColor & ) ) ); + connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ), + TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) ); row++; } else { - m_pNbLines = new QSpinBox( 1, 10, 1, this ); - QLabel* label = new QLabel( m_pNbLines, i18n("H&eight for icon text:"), this ); + m_pNbLines = new TQSpinBox( 1, 10, 1, this ); + TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbLines, row, 1 ); - connect( m_pNbLines, SIGNAL( valueChanged(int) ), - this, SLOT( changed() ) ); - connect( m_pNbLines, SIGNAL( valueChanged(int) ), - SLOT( slotPNbLinesChanged(int)) ); + connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT( changed() ) ); + connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( slotPNbLinesChanged(int)) ); - QString thwt = i18n("This is the maximum number of lines that can be" + TQString thwt = i18n("This is the maximum number of lines that can be" " used to draw icon text. Long file names are" " truncated at the end of the last line."); - QWhatsThis::add( label, thwt ); - QWhatsThis::add( m_pNbLines, thwt ); + TQWhatsThis::add( label, thwt ); + TQWhatsThis::add( m_pNbLines, thwt ); row++; // width for the items in multicolumn icon view - m_pNbWidth = new QSpinBox( 1, 100000, 1, this ); + m_pNbWidth = new TQSpinBox( 1, 100000, 1, this ); - label = new QLabel( m_pNbWidth, i18n("&Width for icon text:"), this ); + label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbWidth, row, 1 ); - connect( m_pNbWidth, SIGNAL( valueChanged(int) ), - this, SLOT( changed() ) ); - connect( m_pNbWidth, SIGNAL( valueChanged(int) ), - SLOT( slotPNbWidthChanged(int)) ); + connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT( changed() ) ); + connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( slotPNbWidthChanged(int)) ); thwt = i18n( "This is the maximum width for the icon text when konqueror " "is used in multi column view mode." ); - QWhatsThis::add( label, thwt ); - QWhatsThis::add( m_pNbWidth, thwt ); + TQWhatsThis::add( label, thwt ); + TQWhatsThis::add( m_pNbWidth, thwt ); row++; } - cbUnderline = new QCheckBox(i18n("&Underline filenames"), this); + cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign); - connect(cbUnderline, SIGNAL(clicked()), this, SLOT(changed())); + connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - QWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" + TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" " being underlined, so that they look like links on a web page. Note:" " to complete the analogy, make sure that single click activation is" " enabled in the mouse control module.") ); @@ -191,11 +191,11 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, Q { row++; - m_pSizeInBytes = new QCheckBox(i18n("Display file sizes in b&ytes"), this); + m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign ); - connect( m_pSizeInBytes, SIGNAL(clicked()), this, SLOT(changed()) ); + connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); - QWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" + TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" " being displayed in bytes. Otherwise file sizes are" " being displayed in kilobytes or megabytes if appropriate.") ); } @@ -213,7 +213,7 @@ void KonqFontOptions::slotFontSize(int i) changed(); } -void KonqFontOptions::slotStandardFont(const QString& n ) +void KonqFontOptions::slotStandardFont(const TQString& n ) { m_stdName = n; } @@ -239,12 +239,12 @@ void KonqFontOptions::load( bool useDefaults ) g_pConfig->setGroup(groupname); - QFont stdFont = g_pConfig->readFontEntry( "StandardFont" ); + TQFont stdFont = g_pConfig->readFontEntry( "StandardFont" ); m_stdName = stdFont.family(); m_fSize = stdFont.pointSize(); - // we have to use QFontInfo, in case the font was specified with a pixel size + // we have to use TQFontInfo, in case the font was specified with a pixel size if ( m_fSize == -1 ) - m_fSize = QFontInfo(stdFont).pointSize(); + m_fSize = TQFontInfo(stdFont).pointSize(); normalTextColor = KGlobalSettings::textColor(); normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor ); @@ -308,13 +308,13 @@ void KonqFontOptions::save() { g_pConfig->setGroup(groupname); - QFont stdFont( m_stdName, m_fSize ); + TQFont stdFont( m_stdName, m_fSize ); g_pConfig->writeEntry( "StandardFont", stdFont ); g_pConfig->writeEntry( "NormalTextColor", normalTextColor ); //g_pConfig->writeEntry( "HighlightedTextColor", highlightedTextColor ); if ( m_bDesktop ) - g_pConfig->writeEntry( "ItemTextBackground", m_cbTextBackground->isChecked() ? textBackgroundColor : QColor()); + g_pConfig->writeEntry( "ItemTextBackground", m_cbTextBackground->isChecked() ? textBackgroundColor : TQColor()); else { g_pConfig->writeEntry( "TextHeight", m_pNbLines->value() ); @@ -329,14 +329,14 @@ void KonqFontOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); // Tell kdesktop about the new config file int konq_screen_number = KApplication::desktop()->primaryScreen(); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -350,7 +350,7 @@ void KonqFontOptions::slotTextBackgroundClicked() changed(); } -void KonqFontOptions::slotNormalTextColorChanged( const QColor &col ) +void KonqFontOptions::slotNormalTextColorChanged( const TQColor &col ) { if ( normalTextColor != col ) { @@ -360,7 +360,7 @@ void KonqFontOptions::slotNormalTextColorChanged( const QColor &col ) } /* -void KonqFontOptions::slotHighlightedTextColorChanged( const QColor &col ) +void KonqFontOptions::slotHighlightedTextColorChanged( const TQColor &col ) { if ( highlightedTextColor != col ) { @@ -370,7 +370,7 @@ void KonqFontOptions::slotHighlightedTextColorChanged( const QColor &col ) } */ -void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col ) +void KonqFontOptions::slotTextBackgroundColorChanged( const TQColor &col ) { if ( textBackgroundColor != col ) { @@ -379,7 +379,7 @@ void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col ) } } -QString KonqFontOptions::quickHelp() const +TQString KonqFontOptions::quickHelp() const { return i18n("

Appearance

You can configure how Konqueror looks as a file manager here."); } diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index 18473c18d..8b77f9c75 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -34,8 +34,8 @@ #ifndef __KONQFONT_OPTIONS_H__ #define __KONQFONT_OPTIONS_H__ -#include -#include +#include +#include #include @@ -53,8 +53,8 @@ class KonqFontOptions : public KCModule { Q_OBJECT public: - KonqFontOptions(KConfig *config, QString group, bool desktop, QWidget *parent=0, const char *name=0); - QString quickHelp() const; + KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0); + TQString quickHelp() const; virtual void load(); virtual void load( bool readDefaults ); @@ -63,12 +63,12 @@ public: public slots: void slotFontSize(int i); - void slotStandardFont(const QString& n); + void slotStandardFont(const TQString& n); void slotTextBackgroundClicked(); - void slotNormalTextColorChanged( const QColor &col ); - //void slotHighlightedTextColorChanged( const QColor &col ); - void slotTextBackgroundColorChanged( const QColor &col ); + void slotNormalTextColorChanged( const TQColor &col ); + //void slotHighlightedTextColorChanged( const TQColor &col ); + void slotTextBackgroundColorChanged( const TQColor &col ); private slots: void slotPNbLinesChanged(int value); @@ -80,33 +80,33 @@ private: private: KConfig *g_pConfig; - QString groupname; + TQString groupname; bool m_bDesktop; /* - QRadioButton* m_pSmall; - QRadioButton* m_pMedium; - QRadioButton* m_pLarge; + TQRadioButton* m_pSmall; + TQRadioButton* m_pMedium; + TQRadioButton* m_pLarge; */ KFontCombo* m_pStandard; - QSpinBox* m_pSize; + TQSpinBox* m_pSize; int m_fSize; - QString m_stdName; + TQString m_stdName; KColorButton* m_pBg; KColorButton* m_pNormalText; //KColorButton* m_pHighlightedText; - QCheckBox* m_cbTextBackground; + TQCheckBox* m_cbTextBackground; KColorButton* m_pTextBackground; - QColor normalTextColor; - //QColor highlightedTextColor; - QColor textBackgroundColor; - - QSpinBox* m_pNbLines; - QSpinBox* m_pNbWidth; - QCheckBox* cbUnderline; - QCheckBox* m_pSizeInBytes; + TQColor normalTextColor; + //TQColor highlightedTextColor; + TQColor textBackgroundColor; + + TQSpinBox* m_pNbLines; + TQSpinBox* m_pNbWidth; + TQCheckBox* cbUnderline; + TQCheckBox* m_pSizeInBytes; }; #endif diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index dc9a08380..e79fbd9ce 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -33,10 +33,10 @@ #include #include -static QCString configname() +static TQCString configname() { int desktop = KApplication::desktop()->primaryScreen(); - QCString name; + TQCString name; if (desktop == 0) name = "kdesktoprc"; else @@ -48,48 +48,48 @@ static QCString configname() extern "C" { - KDE_EXPORT KCModule *create_browser(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_browser(TQWidget *parent, const char *name) { KConfig *config = new KConfig("konquerorrc", false, true); return new KBrowserOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_behavior(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_behavior(TQWidget *parent, const char *name) { KConfig *config = new KConfig("konquerorrc", false, true); return new KBehaviourOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_appearance(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_appearance(TQWidget *parent, const char *name) { KConfig *config = new KConfig("konquerorrc", false, true); return new KonqFontOptions(config, "FMSettings", false, parent, name); } - KDE_EXPORT KCModule *create_previews(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_previews(TQWidget *parent, const char *name) { return new KPreviewOptions(parent, name); } - KDE_EXPORT KCModule *create_dbehavior(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_dbehavior(TQWidget *parent, const char* /*name*/) { KConfig *config = new KConfig(configname(), false, false); return new DesktopBehaviorModule(config, parent); } - KDE_EXPORT KCModule *create_dappearance(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_dappearance(TQWidget *parent, const char* /*name*/) { KConfig *config = new KConfig(configname(), false, false); return new KonqFontOptions(config, "FMSettings", true, parent); } - KDE_EXPORT KCModule *create_dpath(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_dpath(TQWidget *parent, const char* /*name*/) { //KConfig *config = new KConfig(configname(), false, false); return new DesktopPathConfig(parent); } - KDE_EXPORT KCModule *create_ddesktop(QWidget *parent, const char* /*name*/) + KDE_EXPORT KCModule *create_ddesktop(TQWidget *parent, const char* /*name*/) { return new KDesktopConfig(parent, "VirtualDesktops"); } diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 20d9a4499..0e3ea0861 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -19,10 +19,10 @@ // File previews configuration // -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -42,12 +42,12 @@ class PreviewCheckListItem : public QCheckListItem { public: - PreviewCheckListItem( QListView *parent, const QString &text ) - : QCheckListItem( parent, text, CheckBoxController ) + PreviewCheckListItem( TQListView *parent, const TQString &text ) + : TQCheckListItem( parent, text, CheckBoxController ) {} - PreviewCheckListItem( QListViewItem *parent, const QString &text ) - : QCheckListItem( parent, text, CheckBox ) + PreviewCheckListItem( TQListViewItem *parent, const TQString &text ) + : TQCheckListItem( parent, text, CheckBox ) {} protected: @@ -57,12 +57,12 @@ class PreviewCheckListItem : public QCheckListItem } }; -KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) +KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) : KCModule( parent, "kcmkonq" ) { - QVBoxLayout *lay = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - lay->addWidget( new QLabel( i18n("

Allow previews, \"Folder Icons Reflect Contents\", and " + lay->addWidget( new TQLabel( i18n("

Allow previews, \"Folder Icons Reflect Contents\", and " "retrieval of meta-data on protocols:

"), this ) ); setQuickHelp( i18n("

Preview Options

Here you can modify the behavior " @@ -81,7 +81,7 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) listView->addColumn( i18n( "Select Protocols" ) ); listView->setFullWidth( true ); - QHBoxLayout *hbox = new QHBoxLayout( lay ); + TQHBoxLayout *hbox = new TQHBoxLayout( lay ); hbox->addWidget( listView ); hbox->addStretch(); @@ -90,9 +90,9 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) PreviewCheckListItem *inetItems = new PreviewCheckListItem( listView, i18n( "Internet Protocols" ) ); - QStringList protocolList = KProtocolInfo::protocols(); + TQStringList protocolList = KProtocolInfo::protocols(); protocolList.sort(); - QStringList::Iterator it = protocolList.begin(); + TQStringList::Iterator it = protocolList.begin(); KURL url; url.setPath("/"); @@ -102,7 +102,7 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) url.setProtocol( *it ); if ( KProtocolInfo::supportsListing( url ) ) { - QCheckListItem *item; + TQCheckListItem *item; if ( KProtocolInfo::protocolClass( *it ) == ":local" ) item = new PreviewCheckListItem( localItems, ( *it ) ); else @@ -115,13 +115,13 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) listView->setOpen( localItems, true ); listView->setOpen( inetItems, true ); - QWhatsThis::add( listView, + TQWhatsThis::add( listView, i18n("This option makes it possible to choose when the file previews, " "smart folder icons, and meta-data in the File Manager should be activated.\n" "In the list of protocols that appear, select which ones are fast " "enough for you to allow previews to be generated.") ); - QLabel *label = new QLabel( i18n( "&Maximum file size:" ), this ); + TQLabel *label = new TQLabel( i18n( "&Maximum file size:" ), this ); lay->addWidget( label ); m_maxSize = new KDoubleNumInput( this ); @@ -130,24 +130,24 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ ) m_maxSize->setPrecision( 1 ); label->setBuddy( m_maxSize ); lay->addWidget( m_maxSize ); - connect( m_maxSize, SIGNAL( valueChanged(double) ), SLOT( changed() ) ); + connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) ); - m_boostSize = new QCheckBox(i18n("&Increase size of previews relative to icons"), this); - connect( m_boostSize, SIGNAL( toggled(bool) ), SLOT( changed() ) ); + m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this); + connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); lay->addWidget(m_boostSize); - m_useFileThumbnails = new QCheckBox(i18n("&Use thumbnails embedded in files"), this); - connect( m_useFileThumbnails, SIGNAL( toggled(bool) ), SLOT( changed() ) ); + m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this); + connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); lay->addWidget(m_useFileThumbnails); - QWhatsThis::add( m_useFileThumbnails, + TQWhatsThis::add( m_useFileThumbnails, i18n("Select this to use thumbnails that are found inside some " "file types (e.g. JPEG). This will increase speed and reduce " "disk usage. Deselect it if you have files that have been processed " "by programs which create inaccurate thumbnails, such as ImageMagick.") ); - lay->addWidget( new QWidget(this), 10 ); + lay->addWidget( new TQWidget(this), 10 ); load(); } @@ -160,10 +160,10 @@ void KPreviewOptions::load(bool useDefaults) // *** load and apply to GUI *** KGlobal::config()->setReadDefaults(useDefaults); KConfigGroup group( KGlobal::config(), "PreviewSettings" ); - QPtrListIterator it( m_items ); + TQPtrListIterator it( m_items ); for ( ; it.current() ; ++it ) { - QString protocol( it.current()->text() ); + TQString protocol( it.current()->text() ); if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) // file should be enabled in case is not defined because if not so // than preview's lost when size is changed from default one @@ -192,9 +192,9 @@ void KPreviewOptions::defaults() void KPreviewOptions::save() { KConfigGroup group( KGlobal::config(), "PreviewSettings" ); - QPtrListIterator it( m_items ); + TQPtrListIterator it( m_items ); for ( ; it.current() ; ++it ) { - QString protocol( it.current()->text() ); + TQString protocol( it.current()->text() ); group.writeEntry( protocol, it.current()->isOn(), true, true ); } // config key is in bytes, numinput is in MB @@ -205,7 +205,7 @@ void KPreviewOptions::save() // Send signal to konqueror // Warning. In case something is added/changed here, keep kfmclient in sync - QByteArray data; + TQByteArray data; if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index b91e7b563..0e8d112f2 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -31,7 +31,7 @@ Configuration of the maximum image size */ -#include +#include #include @@ -44,7 +44,7 @@ class KPreviewOptions : public KCModule { Q_OBJECT public: - KPreviewOptions( QWidget *parent = 0L, const char *name = 0L ); + KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void save(); virtual void defaults(); @@ -56,10 +56,10 @@ public slots: void changed(); private: - QPtrList m_items; + TQPtrList m_items; KDoubleNumInput *m_maxSize; - QCheckBox *m_boostSize; - QCheckBox *m_useFileThumbnails; + TQCheckBox *m_boostSize; + TQCheckBox *m_useFileThumbnails; }; #endif diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 1a14c68e3..f4111cfda 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -14,12 +14,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -43,10 +43,10 @@ //----------------------------------------------------------------------------- -DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * ) +DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - QLabel * tmpLabel; + TQLabel * tmpLabel; #undef RO_LASTROW #undef RO_LASTCOL @@ -54,7 +54,7 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * ) #define RO_LASTCOL 2 int row = 0; - QGridLayout *lay = new QGridLayout(this, RO_LASTROW+1, RO_LASTCOL+1, + TQGridLayout *lay = new TQGridLayout(this, RO_LASTROW+1, RO_LASTCOL+1, 0, KDialog::spacingHint()); lay->setRowStretch(RO_LASTROW,10); // last line grows @@ -71,48 +71,48 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * ) // Desktop Paths row++; - tmpLabel = new QLabel(i18n("Des&ktop path:"), this); + tmpLabel = new TQLabel(i18n("Des&ktop path:"), this); lay->addWidget(tmpLabel, row, 0); urDesktop = new KURLRequester(this); urDesktop->setMode( KFile::Directory ); tmpLabel->setBuddy( urDesktop ); lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL); - connect(urDesktop, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); - QString wtstr = i18n("This folder contains all the files" + connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + TQString wtstr = i18n("This folder contains all the files" " which you see on your desktop. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well."); - QWhatsThis::add( tmpLabel, wtstr ); - QWhatsThis::add( urDesktop, wtstr ); + TQWhatsThis::add( tmpLabel, wtstr ); + TQWhatsThis::add( urDesktop, wtstr ); row++; - tmpLabel = new QLabel(i18n("A&utostart path:"), this); + tmpLabel = new TQLabel(i18n("A&utostart path:"), this); lay->addWidget(tmpLabel, row, 0); urAutostart = new KURLRequester(this); urAutostart->setMode( KFile::Directory ); tmpLabel->setBuddy( urAutostart ); lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL); - connect(urAutostart, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); + connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); wtstr = i18n("This folder contains applications or" " links to applications (shortcuts) that you want to have started" " automatically whenever KDE starts. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well."); - QWhatsThis::add( tmpLabel, wtstr ); - QWhatsThis::add( urAutostart, wtstr ); + TQWhatsThis::add( tmpLabel, wtstr ); + TQWhatsThis::add( urAutostart, wtstr ); row++; - tmpLabel = new QLabel(i18n("D&ocuments path:"), this); + tmpLabel = new TQLabel(i18n("D&ocuments path:"), this); lay->addWidget(tmpLabel, row, 0); urDocument = new KURLRequester(this); urDocument->setMode( KFile::Directory ); tmpLabel->setBuddy( urDocument ); lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL); - connect(urDocument, SIGNAL(textChanged(const QString &)), this, SLOT(changed())); + connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); wtstr = i18n("This folder will be used by default to " "load or save documents from or to."); - QWhatsThis::add( tmpLabel, wtstr ); - QWhatsThis::add( urDocument, wtstr ); + TQWhatsThis::add( tmpLabel, wtstr ); + TQWhatsThis::add( urDocument, wtstr ); // -- Bottom -- Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above @@ -133,10 +133,10 @@ void DesktopPathConfig::load( bool useDefaults ) config.setGroup("Paths"); urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() )); - KConfig xdguserconfig( QDir::homeDirPath()+"/.config/user-dirs.dirs" ); + KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); - urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , QDir::homeDirPath() + "/Desktop" ).remove( "\"" )); - urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", QDir::homeDirPath()).remove( "\"" )); + urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , TQDir::homeDirPath() + "/Desktop" ).remove( "\"" )); + urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", TQDir::homeDirPath()).remove( "\"" )); emit changed( useDefaults ); } @@ -149,7 +149,7 @@ void DesktopPathConfig::defaults() void DesktopPathConfig::save() { KConfig *config = KGlobal::config(); - KConfig *xdgconfig = new KConfig( QDir::homeDirPath()+"/.config/user-dirs.dirs" ); + KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); KConfigGroupSaver cgs( config, "Paths" ); bool pathChanged = false; @@ -178,7 +178,7 @@ void DesktopPathConfig::save() // * Not inside destination -> move first // !!! kdDebug() << "desktopURL=" << desktopURL.url() << endl; - QString urlDesktop = urDesktop->url(); + TQString urlDesktop = urDesktop->url(); if ( !urlDesktop.endsWith( "/" )) urlDesktop+="/"; @@ -227,8 +227,8 @@ void DesktopPathConfig::save() if ( !newDocumentURL.equals( documentURL, true ) ) { bool pathOk = true; - QString path = urDocument->url(); - if (!QDir(path).exists()) + TQString path = urDocument->url(); + if (!TQDir(path).exists()) { if (!KStandardDirs::makeDir(path)) { @@ -257,10 +257,10 @@ void DesktopPathConfig::save() // Tell kdesktop about the new config file if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data; + TQByteArray data; int konq_screen_number = KApplication::desktop()->primaryScreen(); - QCString appname; + TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; else @@ -268,7 +268,7 @@ void DesktopPathConfig::save() kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } -bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QString & type ) +bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type ) { if (!src.isLocalFile() || !dest.isLocalFile()) return true; @@ -278,14 +278,14 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr arg(type).arg(src.path()).arg(dest.path()), i18n("Confirmation Required"),i18n("Move"),KStdGuiItem::cancel() ) == KMessageBox::Yes ) { - bool destExists = QFile::exists(dest.path()); + bool destExists = TQFile::exists(dest.path()); if (destExists) { m_copyToDest = dest; m_copyFromSrc = src; KIO::ListJob* job = KIO::listDir( src ); - connect( job, SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), - this, SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); + connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), + this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); qApp->enter_loop(); if (m_ok) @@ -296,7 +296,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr else { KIO::Job * job = KIO::move( src, dest ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // wait for job qApp->enter_loop(); } @@ -324,7 +324,7 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li } KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); - connect( moveJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); qApp->enter_loop(); } qApp->exit_loop(); diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 3a7b7ee3f..482c4a765 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -13,7 +13,7 @@ #define __ROOT_OPTIONS_H -#include +#include #include #include @@ -37,7 +37,7 @@ class DesktopPathConfig : public KCModule { Q_OBJECT public: - DesktopPathConfig(QWidget *parent = 0L, const char *name = 0L ); + DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); @@ -52,7 +52,7 @@ private: KURLRequester *urAutostart; KURLRequester *urDocument; - bool moveDir( const KURL & src, const KURL & dest, const QString & type ); + bool moveDir( const KURL & src, const KURL & dest, const TQString & type ); bool m_ok; KURL m_copyToDest; // used when the destination directory already exists KURL m_copyFromSrc; -- cgit v1.2.1