summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/ksplashml/index.docbook20
-rw-r--r--kate/app/kateconfigdialog.cpp12
-rw-r--r--kate/app/kateexternaltools.cpp12
-rw-r--r--kate/app/katefilelist.cpp4
-rw-r--r--kate/app/katefileselector.cpp6
-rw-r--r--kate/app/kategrepdialog.cpp16
-rw-r--r--kate/app/katemdi.cpp6
-rw-r--r--kate/app/kateviewspace.cpp12
-rw-r--r--kate/app/kateviewspacecontainer.cpp4
-rw-r--r--kate/utils/messageview.cpp2
-rw-r--r--kcontrol/access/kaccess.cpp4
-rw-r--r--kcontrol/access/kcmaccess.cpp18
-rw-r--r--kcontrol/background/bgadvanced.cpp4
-rw-r--r--kcontrol/background/bgdialog.cpp2
-rw-r--r--kcontrol/background/bgrender.cpp8
-rw-r--r--kcontrol/bell/bell.cpp2
-rw-r--r--kcontrol/colors/colorscm.cpp2
-rw-r--r--kcontrol/colors/widgetcanvas.cpp2
-rw-r--r--kcontrol/crypto/crypto.cpp14
-rw-r--r--kcontrol/css/kcmcss.cpp8
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp8
-rw-r--r--kcontrol/dnssd/kcmdnssd.cpp4
-rw-r--r--kcontrol/filetypes/filetypedetails.cpp2
-rw-r--r--kcontrol/hwmanager/hwdevicetray.cpp8
-rw-r--r--kcontrol/icons/icons.cpp24
-rw-r--r--kcontrol/joystick/poswidget.cpp10
-rw-r--r--kcontrol/kcontrol/moduletreeview.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp2
-rw-r--r--kcontrol/kded/kcmkded.cpp2
-rw-r--r--kcontrol/keys/main.cpp6
-rw-r--r--kcontrol/keys/modifiers.cpp4
-rw-r--r--kcontrol/keys/treeview.cpp2
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp2
-rw-r--r--kcontrol/konq/desktop.cpp2
-rw-r--r--kcontrol/konq/fontopts.cpp10
-rw-r--r--kcontrol/konqhtml/appearance.cpp2
-rw-r--r--kcontrol/konqhtml/domainlistview.cpp4
-rw-r--r--kcontrol/konqhtml/filteropts.cpp2
-rw-r--r--kcontrol/konqhtml/jsopts.cpp2
-rw-r--r--kcontrol/konqhtml/jspolicies.cpp4
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp2
-rw-r--r--kcontrol/launch/kcmlaunch.cpp4
-rw-r--r--kcontrol/locale/klocalesample.cpp2
-rw-r--r--kcontrol/randr/tderandrmodule.cpp2
-rw-r--r--kcontrol/randr/tderandrtray.cpp4
-rw-r--r--kcontrol/samba/kcmsambalog.cpp2
-rw-r--r--kcontrol/screensaver/scrnsave.cpp4
-rw-r--r--kcontrol/style/kcmstyle.cpp10
-rw-r--r--kcontrol/tdefontinst/lib/FcEngine.cpp4
-rw-r--r--kcontrol/tdefontinst/viewpart/FontPreview.cpp2
-rw-r--r--kcontrol/tdeio/uagentproviderdlg.cpp4
-rw-r--r--kcontrol/tdm/tdm-appear.cpp10
-rw-r--r--kcontrol/tdm/tdm-users.cpp10
-rw-r--r--kcontrol/usbview/kcmusb.cpp2
-rw-r--r--kcontrol/xinerama/kcmxinerama.cpp2
-rw-r--r--kdesktop/kdesktop.kcfg2
-rw-r--r--kdesktop/kdesktopapp.cpp2
-rw-r--r--kdesktop/kdesktopapp.h4
-rw-r--r--kdesktop/kdesktopbindings.cpp20
-rw-r--r--kdesktop/kdiconview.cpp4
-rw-r--r--kdesktop/krootwm.cpp6
-rw-r--r--kdesktop/lock/autologout.cpp2
-rw-r--r--kdesktop/lock/infodlg.cpp4
-rw-r--r--kdesktop/lock/lockdlg.cpp20
-rw-r--r--kdesktop/lock/lockprocess.cpp8
-rw-r--r--kdesktop/lock/main.h2
-rw-r--r--kdesktop/lock/querydlg.cpp4
-rw-r--r--kdesktop/lock/sakdlg.cpp2
-rw-r--r--kdesktop/main.cpp2
-rw-r--r--kdesktop/minicli.cpp2
-rw-r--r--kdesktop/pixmapserver.h4
-rw-r--r--kdesktop/startupid.cpp2
-rw-r--r--kdesktop/tdefileividesktop.h2
-rw-r--r--kfind/kdatecombo.cpp6
-rw-r--r--kfind/kfinddlg.cpp2
-rw-r--r--kfind/kftabdlg.cpp4
-rw-r--r--khotkeys/kcontrol/gesturerecorder.cpp4
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp2
-rw-r--r--kicker/applets/clock/clock.cpp20
-rw-r--r--kicker/applets/clock/datepicker.cpp2
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/launcher/flowgridmanager.cpp16
-rw-r--r--kicker/applets/launcher/flowgridmanager.h8
-rw-r--r--kicker/applets/launcher/quickbutton.cpp8
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp8
-rw-r--r--kicker/applets/lockout/lockout.cpp12
-rw-r--r--kicker/applets/media/mediaapplet.cpp8
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp16
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp4
-rw-r--r--kicker/applets/run/runapplet.cpp4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp50
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp8
-rw-r--r--kicker/applets/trash/trashapplet.cpp4
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp12
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp18
-rw-r--r--kicker/extensions/kasbar/kasbar.h14
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp8
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp10
-rw-r--r--kicker/extensions/kasbar/kaspopup.cpp2
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.cpp4
-rw-r--r--kicker/extensions/kasbar/kasresources.cpp8
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp2
-rw-r--r--kicker/extensions/kasbar/kastasker.h6
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp6
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp2
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp4
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp2
-rw-r--r--kicker/kicker/core/applethandle.cpp22
-rw-r--r--kicker/kicker/core/container_applet.cpp6
-rw-r--r--kicker/kicker/core/container_base.cpp2
-rw-r--r--kicker/kicker/core/container_button.cpp6
-rw-r--r--kicker/kicker/core/container_extension.cpp44
-rw-r--r--kicker/kicker/core/containerarea.cpp40
-rw-r--r--kicker/kicker/core/containerarealayout.cpp36
-rw-r--r--kicker/kicker/core/kickerbindings.cpp4
-rw-r--r--kicker/kicker/core/panelextension.cpp2
-rw-r--r--kicker/kicker/core/userrectsel.cpp4
-rw-r--r--kicker/kicker/core/usersizesel.cpp4
-rw-r--r--kicker/kicker/ui/addapplet.cpp18
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.cpp8
-rw-r--r--kicker/kicker/ui/appletop_mnu.cpp2
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp4
-rw-r--r--kicker/kicker/ui/hidebutton.cpp20
-rw-r--r--kicker/kicker/ui/hidebutton.h4
-rw-r--r--kicker/kicker/ui/itemview.cpp8
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp8
-rw-r--r--kicker/kicker/ui/kickoff_bar.cpp2
-rw-r--r--kicker/kicker/ui/service_mnu.cpp4
-rw-r--r--kicker/libkicker/global.cpp10
-rw-r--r--kicker/libkicker/global.h2
-rw-r--r--kicker/libkicker/kickertip.cpp12
-rw-r--r--kicker/libkicker/kshadowengine.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp18
-rw-r--r--kicker/libkicker/panelbutton.h4
-rw-r--r--kicker/libkicker/panner.cpp18
-rw-r--r--kicker/libkicker/panner.h4
-rw-r--r--kicker/libkicker/simplebutton.cpp18
-rw-r--r--kicker/libkicker/simplebutton.h12
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp2
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cpp24
-rw-r--r--kicker/taskbar/taskbar.cpp4
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp2
-rw-r--r--kicker/taskbar/taskcontainer.cpp28
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp2
-rw-r--r--klipper/klipperbindings.cpp6
-rw-r--r--klipper/klipperpopup.cpp26
-rw-r--r--klipper/toplevel.cpp6
-rw-r--r--kmenuedit/kmenuedit.cpp2
-rw-r--r--kmenuedit/treeview.cpp2
-rw-r--r--konqueror/iconview/konq_iconview.cpp6
-rw-r--r--konqueror/keditbookmarks/listview.cpp6
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp2
-rw-r--r--konqueror/konq_combo.cpp14
-rw-r--r--konqueror/konq_frame.cpp8
-rw-r--r--konqueror/konq_guiclients.cpp2
-rw-r--r--konqueror/konq_mainwindow.cpp24
-rw-r--r--konqueror/konq_misc.cpp4
-rw-r--r--konqueror/konq_view.cpp6
-rw-r--r--konqueror/konq_viewmgr.cpp12
-rw-r--r--konqueror/konq_viewmgr.h4
-rw-r--r--konqueror/listview/konq_listviewitems.cpp6
-rw-r--r--konqueror/listview/konq_listviewwidget.cpp6
-rw-r--r--konqueror/listview/konq_textviewitem.cpp4
-rw-r--r--konqueror/listview/konq_textviewwidget.cpp20
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp6
-rw-r--r--konqueror/sidebar/web_module/web_module.h4
-rw-r--r--konsole/konsole/TEWidget.cpp42
-rw-r--r--konsole/konsole/TEmuVt102.cpp14
-rw-r--r--konsole/konsole/keytrans.cpp266
-rw-r--r--konsole/konsole/konsole.cpp30
-rw-r--r--konsole/other/README.KeyTab2
-rw-r--r--konsole/other/linux.keytab2
-rw-r--r--konsole/other/solaris.keytab2
-rw-r--r--konsole/other/vt100.keytab2
-rw-r--r--konsole/other/vt420pc.keytab2
-rw-r--r--kpager/desktop.cpp16
-rw-r--r--ksmserver/shutdown.cpp2
-rw-r--r--ksmserver/shutdowndlg.cpp16
-rw-r--r--ksplashml/kcmksplash/installer.cpp6
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp10
-rw-r--r--ksplashml/themeengine/redmond/previewredmond.cpp10
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp4
-rw-r--r--ksplashml/themeengine/unified/themeunified.cpp2
-rw-r--r--ksysguard/gui/KSysGuardApplet.cpp4
-rw-r--r--ksysguard/gui/SensorBrowser.cpp2
-rw-r--r--ksysguard/gui/SensorDisplayLib/BarGraph.cpp4
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp8
-rw-r--r--ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp2
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp12
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.cpp4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp8
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.cpp6
-rw-r--r--ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp2
-rw-r--r--ksysguard/gui/WorkSheetSettings.cpp8
-rw-r--r--ksysguard/gui/ksgrd/HostConnector.cpp4
-rw-r--r--ksysguard/gui/ksgrd/StyleSettings.cpp2
-rw-r--r--ksysguard/gui/ksysguard.cpp2
-rw-r--r--ksystraycmd/ksystraycmd.cpp2
-rw-r--r--kxkb/kxkbtraywindow.h2
-rw-r--r--kxkb/pixmap.cpp18
-rw-r--r--libkonq/konq_bgnddlg.cpp4
-rw-r--r--libkonq/konq_iconviewwidget.cpp6
-rw-r--r--libkonq/konq_operations.cpp2
-rw-r--r--nsplugins/kcm_nsplugins.cpp4
-rw-r--r--tdeioslave/cgi/kcmcgi/kcmcgi.cpp2
-rw-r--r--tdeioslave/fish/fish.cpp2
-rw-r--r--tdeioslave/man/man2html.cpp2
-rw-r--r--tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp4
-rw-r--r--tdeioslave/trash/tdeio_trash.cpp2
-rw-r--r--tdeioslave/trash/trashimpl.cpp4
-rw-r--r--tdeprint/kjobviewer/kjobviewer.cpp2
-rw-r--r--tdeprint/tdeprintfax/faxctrl.cpp2
-rw-r--r--tdeprint/tdeprintfax/tdeprintfax.cpp20
-rw-r--r--tdm/kfrontend/kfdialog.cpp6
-rw-r--r--tdm/kfrontend/kgapp.cpp8
-rw-r--r--tdm/kfrontend/kgapp.h2
-rw-r--r--tdm/kfrontend/kgreeter.cpp6
-rw-r--r--tdm/kfrontend/kgverify.cpp8
-rw-r--r--tdm/kfrontend/sakdlg.cpp2
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp12
-rw-r--r--tdm/kfrontend/themer/tdmitem.cpp2
-rw-r--r--twin/bridge.cpp2
-rw-r--r--twin/clients/plastik/plastik.h4
-rw-r--r--twin/clients/plastik/plastikclient.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/preview.cpp2
-rw-r--r--twin/tools/decobenchmark/preview.cpp2
231 files changed, 968 insertions, 968 deletions
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index 377d2925d..45846b761 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -940,8 +940,8 @@ void Theme2k::readSettings()
cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
- TQColor DefaultTBgColor( Qt::darkBlue );
- TQColor DefaultTFgColor( Qt::white );
+ TQColor DefaultTBgColor( TQt::darkBlue );
+ TQColor DefaultTFgColor( TQt::white );
mTBgColor = cfg->readColorEntry( "Title Background Color",
&DefaultTBgColor );
@@ -949,8 +949,8 @@ void Theme2k::readSettings()
&DefaultTFgColor );
mStatusColor = cfg->readColorEntry("Status Text Color", &mTBgColor );
- TQColor DefaultRot1( Qt::darkBlue );
- TQColor DefaultRot2( Qt::cyan );
+ TQColor DefaultRot1( TQt::darkBlue );
+ TQColor DefaultRot2( TQt::cyan );
mRotColor1 = cfg->readColorEntry( "Rotator Color 1", &DefaultRot1 );
mRotColor2 = cfg->readColorEntry( "Rotator Color 2", &DefaultRot2 );
@@ -1134,7 +1134,7 @@ void Theme2k::initUi()
lbl->setPaletteForegroundColor( mTFgColor );
QLabel *logo = new QLabel( vbox );
- logo->setPalette( Qt::white );
+ logo->setPalette( TQt::white );
TQString px( locate( "appdata", mTheme->themeDir() +
(mLogoFile.isNull()?TQString("/Logo.png"):mLogoFile) ) );
@@ -1180,8 +1180,8 @@ void Theme2k::readSettings()
cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
- TQColor DefaultTBgColor( Qt::darkBlue );
- TQColor DefaultTFgColor( Qt::white );
+ TQColor DefaultTBgColor( TQt::darkBlue );
+ TQColor DefaultTFgColor( TQt::white );
mTBgColor = cfg->readColorEntry( "Title Background Color",
&DefaultTBgColor );
@@ -1189,8 +1189,8 @@ void Theme2k::readSettings()
&DefaultTFgColor );
mStatusColor = cfg->readColorEntry("Status Text Color", &mTBgColor );
- TQColor DefaultRot1( Qt::darkBlue );
- TQColor DefaultRot2( Qt::cyan );
+ TQColor DefaultRot1( TQt::darkBlue );
+ TQColor DefaultRot2( TQt::cyan );
mRotColor1 = cfg->readColorEntry( "Rotator Color 1", &DefaultRot1 );
mRotColor2 = cfg->readColorEntry( "Rotator Color 2", &DefaultRot2 );
@@ -1296,7 +1296,7 @@ void RotWidget::paintEvent( QPaintEvent *pe )
bitBlt( this, r.x(), r.y(), m_stepPixmap.at( m_step ), r.x(), r.y(),
r.width(), r.height() );
else
- p.fillRect( rect(), Qt::black );
+ p.fillRect( rect(), TQt::black );
p.end();
}
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 883730c08..6fcd4e483 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -102,7 +102,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
config->setGroup("General");
// GROUP with the one below: "Appearance"
- TQButtonGroup *bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Appearance"), frGeneral );
+ TQButtonGroup *bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Appearance"), frGeneral );
lo->addWidget( bgStartup );
// show full path in title
@@ -127,7 +127,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
// GROUP with the one below: "Behavior"
- bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral );
+ bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Behavior"), frGeneral );
lo->addWidget( bgStartup );
// number of recent files
@@ -176,7 +176,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
this, TQT_SLOT( slotChanged() ) );
// GROUP with the one below: "Meta-informations"
- bgStartup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Meta-Information"), frGeneral );
+ bgStartup = new TQButtonGroup( 2, TQt::Horizontal, i18n("Meta-Information"), frGeneral );
lo->addWidget( bgStartup );
// save meta infos
@@ -214,7 +214,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
lo->setSpacing(KDialog::spacingHint());
// GROUP with the one below: "Startup"
- bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Elements of Sessions"), frSessions );
+ bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Elements of Sessions"), frSessions );
lo->addWidget( bgStartup );
// restore view config
@@ -228,7 +228,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
TQRadioButton *rb1, *rb2, *rb3;
- sessions_start = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Startup"), frSessions );
+ sessions_start = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Startup"), frSessions );
lo->add (sessions_start);
sessions_start->setRadioButtonExclusive( true );
@@ -249,7 +249,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
- sessions_exit = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
+ sessions_exit = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
lo->add (sessions_exit);
sessions_exit->setRadioButtonExclusive( true );
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 0b592b03a..fcd0cf807 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -438,7 +438,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leName = new TQLineEdit( w );
lo->addWidget( leName, 1, 2 );
l = new TQLabel( leName, i18n("&Label:"), w );
- l->setAlignment( l->alignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|TQt::AlignRight );
lo->addWidget( l, 1, 1 );
if ( tool ) leName->setText( tool->name );
TQWhatsThis::add( leName, i18n(
@@ -453,7 +453,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
teCommand = new TQTextEdit( w );
lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
l = new TQLabel( teCommand, i18n("S&cript:"), w );
- l->setAlignment( Qt::AlignTop|Qt::AlignRight );
+ l->setAlignment( TQt::AlignTop|TQt::AlignRight );
lo->addWidget( l, 2, 1 );
if ( tool ) teCommand->setText( tool->command );
TQWhatsThis::add( teCommand, i18n(
@@ -476,7 +476,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leExecutable = new TQLineEdit( w );
lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
l = new TQLabel( leExecutable, i18n("&Executable:"), w );
- l->setAlignment( l->alignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|TQt::AlignRight );
lo->addWidget( l, 3, 1 );
if ( tool ) leExecutable->setText( tool->tryexec );
TQWhatsThis::add( leExecutable, i18n(
@@ -487,7 +487,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leMimetypes = new TQLineEdit( w );
lo->addWidget( leMimetypes, 4, 2 );
l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
- l->setAlignment( l->alignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|TQt::AlignRight );
lo->addWidget( l, 4, 1 );
if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
TQWhatsThis::add( leMimetypes, i18n(
@@ -505,7 +505,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
cmbSave = new TQComboBox(w);
lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
l = new TQLabel( cmbSave, i18n("&Save:"), w );
- l->setAlignment( l->alignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|TQt::AlignRight );
lo->addWidget( l, 5, 1 );
TQStringList sl;
sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -520,7 +520,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leCmdLine = new TQLineEdit( w );
lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
- l->setAlignment( l->alignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|TQt::AlignRight );
lo->addWidget( l, 6, 1 );
if ( tool ) leCmdLine->setText( tool->cmdname );
TQWhatsThis::add( leCmdLine, i18n(
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index dda4310ca..5379d665d 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -267,7 +267,7 @@ void KateFileList::slotActivateView( TQListViewItem *item )
if (info && info->modifiedOnDisc) {
// Simulate mouse button release, otherwise the paused DND operation
// will reactivate as soon as the mouse re-enters the list view!
- TQMouseEvent e(TQEvent::MouseButtonRelease, m_lastMouseDownPos, Qt::LeftButton, 0);
+ TQMouseEvent e(TQEvent::MouseButtonRelease, m_lastMouseDownPos, TQt::LeftButton, 0);
contentsMouseReleaseEvent(&e);
}
@@ -659,7 +659,7 @@ KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList *
int spacing = KDialog::spacingHint();
lo1->setSpacing( spacing );
- TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Background Shading"), this );
+ TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Background Shading"), this );
lo1->addWidget( gb );
TQWidget *g = new TQWidget( gb );
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index b275ac7d7..65e2fd1e1 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -532,7 +532,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
lo->setSpacing( spacing );
// Toolbar - a lot for a little...
- TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
+ TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this );
acSel = new TDEActionSelector( gbToolbar );
acSel->setAvailableLabel( i18n("A&vailable actions:") );
acSel->setSelectedLabel( i18n("S&elected actions:") );
@@ -543,7 +543,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
// Sync
- TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this );
+ TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this );
cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync );
cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync );
lo->addWidget( gbSync );
@@ -566,7 +566,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) );
// Session
- TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this );
+ TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this );
cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession );
cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession );
lo->addWidget( gbSession );
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 70f067100..ddeda4cd4 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -101,7 +101,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
lPattern->setFixedSize(lPattern->sizeHint());
- loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
+ loInput->addWidget(lPattern, 0, 0, TQt::AlignRight | TQt::AlignVCenter);
TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
loInput->addLayout( loPattern, 0, 1 );
@@ -128,7 +128,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
lTemplate->setFixedSize(lTemplate->sizeHint());
- loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
+ loInput->addWidget(lTemplate, 1, 0, TQt::AlignRight | TQt::AlignVCenter);
TQBoxLayout *loTemplate = new TQHBoxLayout(4);
loInput->addLayout(loTemplate, 1, 1);
@@ -147,7 +147,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
lFiles->setFixedSize(lFiles->sizeHint());
- loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
+ loInput->addWidget(lFiles, 2, 0, TQt::AlignRight | TQt::AlignVCenter);
TQBoxLayout *loFiles = new TQHBoxLayout( 2 );
loInput->addLayout( loFiles, 2, 1 );
@@ -168,7 +168,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
lDir->setFixedSize(lDir->sizeHint());
- loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
+ loInput->addWidget(lDir, 3, 0, TQt::AlignRight | TQt::AlignVCenter);
TQBoxLayout *loDir = new TQHBoxLayout(3);
loInput->addLayout(loDir, 3, 1);
@@ -189,7 +189,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
loDir->addWidget(cbRecursive);
- KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
+ KButtonBox *actionbox = new KButtonBox(this, TQt::Vertical);
layout->addWidget(actionbox, 0, 2);
actionbox->addStretch();
btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"edit-find")));
@@ -397,7 +397,7 @@ void GrepTool::slotSearch()
TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
// actually it should be checked whether the process was started successfully
- lbResult->setCursor( TQCursor(Qt::WaitCursor) );
+ lbResult->setCursor( TQCursor(TQt::WaitCursor) );
btnClear->setEnabled( false );
btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
@@ -532,8 +532,8 @@ void GrepTool::setDirName(const TQString &dir){
bool GrepTool::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::KeyPress && (
- ((TQKeyEvent*)e)->key() == Qt::Key_Return ||
- ((TQKeyEvent*)e)->key() == Qt::Key_Enter ) )
+ ((TQKeyEvent*)e)->key() == TQt::Key_Return ||
+ ((TQKeyEvent*)e)->key() == TQt::Key_Enter ) )
{
slotSearch();
return true;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index eb459fc1d..0f4ae25b1 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -286,7 +286,7 @@ Sidebar::~Sidebar ()
void Sidebar::setSplitter (Splitter *sp)
{
m_splitter = sp;
- m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
+ m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? TQt::Horizontal : TQt::Vertical, m_splitter);
m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_ownSplit->setChildrenCollapsible( false );
m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
@@ -672,7 +672,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
- m_hSplitter = new Splitter (Qt::Horizontal, hb);
+ m_hSplitter = new Splitter (TQt::Horizontal, hb);
m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
@@ -682,7 +682,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
- m_vSplitter = new Splitter (Qt::Vertical, vb);
+ m_vSplitter = new Splitter (TQt::Vertical, vb);
m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 7278d7d2a..64e941583 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -311,29 +311,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
{
m_lineColLabel = new TQLabel( this );
addWidget( m_lineColLabel, 0, false );
- m_lineColLabel->setAlignment( Qt::AlignCenter );
+ m_lineColLabel->setAlignment( TQt::AlignCenter );
m_lineColLabel->installEventFilter( this );
m_modifiedLabel = new TQLabel( TQString(" "), this );
addWidget( m_modifiedLabel, 0, false );
- m_modifiedLabel->setAlignment( Qt::AlignCenter );
+ m_modifiedLabel->setAlignment( TQt::AlignCenter );
m_modifiedLabel->installEventFilter( this );
m_insertModeLabel = new TQLabel( i18n(" INS "), this );
addWidget( m_insertModeLabel, 0, false );
- m_insertModeLabel->setAlignment( Qt::AlignCenter );
+ m_insertModeLabel->setAlignment( TQt::AlignCenter );
m_insertModeLabel->installEventFilter( this );
m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
addWidget( m_selectModeLabel, 0, false );
- m_selectModeLabel->setAlignment( Qt::AlignCenter );
+ m_selectModeLabel->setAlignment( TQt::AlignCenter );
m_selectModeLabel->installEventFilter( this );
m_fileNameLabel=new KSqueezedTextLabel( this );
addWidget( m_fileNameLabel, 1, true );
m_fileNameLabel->setMinimumSize( 0, 0 );
m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
- m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+ m_fileNameLabel->setAlignment( /*TQt::AlignRight*/TQt::AlignLeft );
m_fileNameLabel->installEventFilter( this );
installEventFilter( this );
@@ -412,7 +412,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
if ( m_viewSpace->currentView() )
m_viewSpace->currentView()->setFocus();
- if ( ((TQMouseEvent*)e)->button()==Qt::RightButton)
+ if ( ((TQMouseEvent*)e)->button()==TQt::RightButton)
showMenu();
return true;
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 359033b87..f681180a0 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -453,7 +453,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast("TQSplitter")) )
psizes = ps->sizes();
- Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
+ TQt::Orientation o = isHoriz ? TQt::Vertical : TQt::Horizontal;
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
@@ -716,7 +716,7 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
{
config->setGroup( group );
- KateMDI::Splitter* s = new KateMDI::Splitter((Qt::Orientation)config->readNumEntry("Orientation"), parent);
+ KateMDI::Splitter* s = new KateMDI::Splitter((TQt::Orientation)config->readNumEntry("Orientation"), parent);
TQStringList children = config->readListEntry( "Children" );
for (TQStringList::Iterator it=children.begin(); it!=children.end(); ++it)
diff --git a/kate/utils/messageview.cpp b/kate/utils/messageview.cpp
index 40155f959..53c0191a9 100644
--- a/kate/utils/messageview.cpp
+++ b/kate/utils/messageview.cpp
@@ -25,7 +25,7 @@ Kate::MessageView::MessageView( TQWidget *parent, const char *name )
: Kate::DockViewBase( parent, name )
{
m_view = new TQTextBrowser( this );
- // m_view->setFormat( Qt::richText ); // should be!!
+ // m_view->setFormat( TQt::richText ); // should be!!
connect( m_view, TQT_SIGNAL( linkClicked( const TQString & ) ),
TQT_SIGNAL( linkClicked( const TQString & ) ) );
}
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5e506470c..2cb9281df 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -132,7 +132,7 @@ void KAccessApp::readSettings()
_artsBellFile = config->readPathEntry("ArtsBellFile");
_visibleBell = config->readBoolEntry("VisibleBell", false);
_visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false);
- TQColor def(Qt::red);
+ TQColor def(TQt::red);
_visibleBellColor = config->readColorEntry("VisibleBellColor", &def);
_visibleBellPause = config->readNumEntry("VisibleBellPause", 500);
@@ -579,7 +579,7 @@ void KAccessApp::createDialogContents() {
pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
label1->setPixmap(pixmap);
- lay->addWidget( label1, 0, Qt::AlignCenter );
+ lay->addWidget( label1, 0, TQt::AlignCenter );
lay->addSpacing(KDialog::spacingHint());
TQVBoxLayout * vlay = new TQVBoxLayout(lay);
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index ccdb74f81..e38615ebb 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -245,7 +245,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
KDialogBase::spacingHint());
TQGroupBox *grp = new TQGroupBox(i18n("Audible Bell"), bell);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
@@ -288,7 +288,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
// visible bell ----------------------------------------
grp = new TQGroupBox(i18n("Visible Bell"), bell);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -350,7 +350,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
vbox = new TQVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint());
grp = new TQGroupBox(i18n("S&ticky Keys"), modifiers);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -374,7 +374,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addWidget(stickyKeysBeep);
grp = new TQGroupBox(i18n("Locking Keys"), modifiers);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -412,7 +412,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
vbox = new TQVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint());
grp = new TQGroupBox(i18n("Slo&w Keys"), filters);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -444,7 +444,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addWidget(slowKeysRejectBeep);
grp = new TQGroupBox(i18n("Bounce Keys"), filters);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -488,7 +488,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
vbox = new TQVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint());
grp = new TQGroupBox(i18n("Activation Gestures"), features);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -518,7 +518,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addWidget(timeoutDelay);
grp = new TQGroupBox(i18n("Notification"), features);
- grp->setColumnLayout( 0, Qt::Horizontal );
+ grp->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -614,7 +614,7 @@ void KAccessConfig::load( bool useDefaults )
visibleBell->setChecked(config->readBoolEntry("VisibleBell", false));
invertScreen->setChecked(config->readBoolEntry("VisibleBellInvert", true));
flashScreen->setChecked(!invertScreen->isChecked());
- TQColor def(Qt::red);
+ TQColor def(TQt::red);
colorButton->setColor(config->readColorEntry("VisibleBellColor", &def));
durationSlider->setValue(config->readNumEntry("VisibleBellPause", 500));
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 2a80db02d..3194c2859 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -175,7 +175,7 @@ void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color)
else
{
dlg->m_cbSolidTextBackground->setChecked(false);
- dlg->m_colorTextBackground->setColor(Qt::white);
+ dlg->m_colorTextBackground->setColor(TQt::white);
dlg->m_colorTextBackground->setEnabled(false);
}
dlg->m_colorTextBackground->blockSignals(false);
@@ -434,7 +434,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
m_RefreshEdit->setSuffix(i18n(" min"));
m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
lbl->setBuddy(m_RefreshEdit);
- grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);
+ grid->addWidget(m_RefreshEdit, 5, 1, TQt::AlignLeft);
m_Program = program;
if (m_Program.isEmpty()) {
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index aaa6f3260..89847c9b2 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -443,7 +443,7 @@ void BGDialog::slotIdentifyScreens()
screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain);
- screenLabel->setAlignment(Qt::AlignCenter);
+ screenLabel->setAlignment(TQt::AlignCenter);
screenLabel->setNum(int(s + 1));
// BUGLET: we should not allow the identification to be entered again
// until the timer fires.
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index e6c8fcccd..ee67beb66 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -384,7 +384,7 @@ wp_load:
wpmode = NoWallpaper;
goto wp_out;
}
- m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither);
+ m_Wallpaper = m_Wallpaper.convertDepth(32, TQt::DiffuseAlphaDither);
// If we're previewing, scale the wallpaper down to make the preview
// look more like the real desktop.
@@ -628,7 +628,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
m_Image = m_Background.copy();
if (m_Image.depth() < 32)
- m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither);
+ m_Image = m_Image.convertDepth(32, TQt::DiffuseAlphaDither);
} else {
m_Image.create(w, h, 32);
@@ -1160,7 +1160,7 @@ void KVirtualBGRenderer::desktopResized()
{
delete m_pPixmap;
m_pPixmap = new TQPixmap(m_size);
- m_pPixmap->fill(Qt::black);
+ m_pPixmap->fill(TQt::black);
}
initRenderers();
@@ -1317,7 +1317,7 @@ void KVirtualBGRenderer::start()
// If are screen sizes do not properly tile the overall virtual screen
// size, then we want the untiled parts to be black for use in desktop
// previews, etc
- m_pPixmap->fill(Qt::black);
+ m_pPixmap->fill(TQt::black);
}
m_bFinished.fill(false);
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 5022ab420..8b24dac6b 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -71,7 +71,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
int row = 0;
TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this );
- box->setColumnLayout( 0, Qt::Horizontal );
+ box->setColumnLayout( 0, TQt::Horizontal );
layout->addWidget(box);
layout->addStretch();
TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 214462046..c767836fd 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -254,7 +254,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
groupLayout = new TQHBoxLayout;
groupLayout2->addLayout(groupLayout);
- sb = new TQSlider( Qt::Horizontal,group,"Slider" );
+ sb = new TQSlider( TQt::Horizontal,group,"Slider" );
sb->setRange( 0, 10 );
sb->setFocusPolicy( TQWidget::StrongFocus );
connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index b08ef6135..e93452caa 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets()
// Create a scrollbar and redirect drawing into a temp. pixmap to save a
// lot of fiddly drawing later.
- TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this );
+ TQScrollBar *vertScrollBar = new TQScrollBar( TQt::Vertical, this );
// TODO: vertScrollBar->setStyle( new TQMotifStyle() );
vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height());
vertScrollBar->setRange( 0, 0 );
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index f8558c866..71521af04 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -1540,7 +1540,7 @@ TQString iss = TQString();
TQPalette cspl;
iss = cert->getIssuer();
cspl = validFrom->palette();
- if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1548,7 +1548,7 @@ TQString iss = TQString();
validFrom->setPalette(cspl);
cspl = validUntil->palette();
- if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1558,7 +1558,7 @@ TQString iss = TQString();
validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires())
- : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
+ : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(TQt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
@@ -1778,7 +1778,7 @@ TQString iss;
TQPalette cspl;
KSSLCertificate *cert = pkcs->getCertificate();
cspl = yValidFrom->palette();
- if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1786,7 +1786,7 @@ TQString iss;
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
- if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1818,7 +1818,7 @@ TQString iss;
KSSLCertificate *cert = pkcs->getCertificate();
iss = cert->getIssuer();
cspl = yValidFrom->palette();
- if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1826,7 +1826,7 @@ TQString iss;
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
- if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index e2e043f76..65748686a 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -342,13 +342,13 @@ void CSSConfig::slotPreview()
if (customDialog->blackOnWhite->isChecked())
{
- back = Qt::white;
- fore = Qt::black;
+ back = TQt::white;
+ fore = TQt::black;
}
else if (customDialog->whiteOnBlack->isChecked())
{
- back = Qt::black;
- fore = Qt::white;
+ back = TQt::black;
+ fore = TQt::white;
}
else
{
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 4c96fabf1..e8a7ac528 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -914,16 +914,16 @@ void KDisplayConfig::identifyMonitors () {
if (!randr_screen_info->outputs[i]->cur_crtc) {
continue;
}
- idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM | Qt::WDestructiveClose);
+ idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WX11BypassWM | TQt::WDestructiveClose);
widgetList.append(idWidget);
idWidget->resize(150, 100);
- idWidget->setAlignment(Qt::AlignCenter);
+ idWidget->setAlignment(TQt::AlignCenter);
TQFont font = idWidget->font();
font.setBold( true );
font.setPointSize(24);
idWidget->setFont( font );
- idWidget->setPaletteForegroundColor(Qt::white);
- idWidget->setPaletteBackgroundColor(Qt::black);
+ idWidget->setPaletteForegroundColor(TQt::white);
+ idWidget->setPaletteBackgroundColor(TQt::black);
idWidget->show();
KDialog::centerOnScreen(idWidget, i);
TQTimer::singleShot(3000, idWidget, SLOT(close()));
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index d1fe3269c..d442552e3 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd()
void KCMDnssd::save()
{
- setCursor(TQCursor(Qt::BusyCursor));
+ setCursor(TQCursor(TQt::BusyCursor));
TDECModule::save();
if (geteuid()==0 && m_wdchanged) saveMdnsd();
domain->setFileWriteMode(0644); // this should be readable for everyone
@@ -112,7 +112,7 @@ void KCMDnssd::save()
proc->start(TDEProcess::Block);
}
}
- setCursor(TQCursor(Qt::ArrowCursor));
+ setCursor(TQCursor(TQt::ArrowCursor));
}
void KCMDnssd::load()
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index c4f3ce7bb..589677b58 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -76,7 +76,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
gb = new TQGroupBox(i18n("Description"), firstWidget);
firstLayout->addWidget(gb);
- gb->setColumnLayout(1, Qt::Horizontal);
+ gb->setColumnLayout(1, TQt::Horizontal);
description = new KLineEdit(gb);
connect(description, TQT_SIGNAL(textChanged(const TQString &)),
TQT_SLOT(updateDescription(const TQString &)));
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 405b562b6..8aade89ca 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -154,7 +154,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
initMenus();
setPixmap(KSystemTray::loadIcon("hwinfo"));
- setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+ setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitApp()));
TQToolTip::add(this, i18n("Device monitor"));
@@ -225,16 +225,16 @@ void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e)
{
switch (e->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
populateLMBMenu();
d->m_LMBMenu->popup(e->globalPos());
break;
- case Qt::MidButton:
+ case TQt::MidButton:
TQTimer::singleShot(0, this, TQT_SLOT(slotHardwareConfig()));
break;
- case Qt::RightButton:
+ case TQt::RightButton:
contextMenuAboutToShow(d->m_RMBMenu);
d->m_RMBMenu->popup(e->globalPos());
break;
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 667ecaa22..c271d4419 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -81,27 +81,27 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
// Size
TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
lbl->setFixedSize(lbl->sizeHint());
- grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
+ grid->addWidget(lbl, 0, 0, TQt::AlignLeft);
mpSizeBox = new TQComboBox(m_pTab1);
connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
lbl->setBuddy(mpSizeBox);
- grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft);
+ grid->addWidget(mpSizeBox, 0, 1, TQt::AlignLeft);
mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1);
connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool)));
- grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft);
+ grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, TQt::AlignLeft);
mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1);
connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool)));
- grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft);
+ grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, TQt::AlignLeft);
mpRoundedCheck = new TQCheckBox(i18n("Rounded text selection"), m_pTab1);
connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool)));
- grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, Qt::AlignLeft);
+ grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, TQt::AlignLeft);
mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1);
connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffect(bool)));
- grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, Qt::AlignLeft);
+ grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft);
top->activate();
@@ -123,13 +123,13 @@ TDEIconConfig::~TDEIconConfig()
TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
{
TQLabel *lab = new TQLabel(str, parent);
- lay->addWidget(lab, 1, i, Qt::AlignCenter);
+ lay->addWidget(lab, 1, i, TQt::AlignCenter);
mpPreview[i] = new TQLabel(parent);
mpPreview[i]->setAlignment(AlignCenter);
mpPreview[i]->setMinimumSize(105, 105);
lay->addWidget(mpPreview[i], 2, i);
TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
- lay->addWidget(push, 3, i, Qt::AlignCenter);
+ lay->addWidget(push, 3, i, TQt::AlignCenter);
return push;
}
@@ -689,7 +689,7 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
lbl = new TQLabel(i18n("&Effect:"), page);
lbl->setFixedSize(lbl->sizeHint());
- top->addWidget(lbl, 0, 0, Qt::AlignLeft);
+ top->addWidget(lbl, 0, 0, TQt::AlignLeft);
mpEffectBox = new TQListBox(page);
mpEffectBox->insertItem(i18n("No Effect"));
mpEffectBox->insertItem(i18n("To Gray"));
@@ -699,12 +699,12 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
mpEffectBox->insertItem(i18n("To Monochrome"));
mpEffectBox->setMinimumWidth( 100 );
connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int)));
- top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft);
+ top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, TQt::AlignLeft);
lbl->setBuddy(mpEffectBox);
mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page);
connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool)));
- top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft);
+ top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft);
frame = new TQGroupBox(i18n("Preview"), page);
top->addMultiCellWidget(frame, 0, 1, 1, 1);
@@ -724,7 +724,7 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup);
grid->addWidget(mpEffectLabel, 1, 0);
- mpEffectSlider = new TQSlider(0, 100, 5, 10, Qt::Horizontal, mpEffectGroup);
+ mpEffectSlider = new TQSlider(0, 100, 5, 10, TQt::Horizontal, mpEffectGroup);
mpEffectLabel->setBuddy( mpEffectSlider );
connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int)));
grid->addWidget(mpEffectSlider, 1, 1);
diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp
index af8609070..5eb249f58 100644
--- a/kcontrol/joystick/poswidget.cpp
+++ b/kcontrol/joystick/poswidget.cpp
@@ -32,7 +32,7 @@ PosWidget::PosWidget(TQWidget *parent, const char *name)
{
setMinimumSize(XY_WIDTH, XY_WIDTH);
setMaximumSize(XY_WIDTH, XY_WIDTH);
- setPaletteBackgroundColor(Qt::white);
+ setPaletteBackgroundColor(TQt::white);
}
//-----------------------------------------------------------------
@@ -42,7 +42,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
TQPainter paint(this);
paint.drawRect(0, 0, width(), height());
- paint.setPen(Qt::gray);
+ paint.setPen(TQt::gray);
// draw a center grid
paint.drawLine(XY_WIDTH/2, 1,
@@ -52,7 +52,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
XY_WIDTH - 2, XY_WIDTH/2);
// draw the current position marker
- paint.setPen(Qt::blue);
+ paint.setPen(TQt::blue);
paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -111,7 +111,7 @@ void PosWidget::eraseOld()
//paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1);
// erase previous cross (don't use eraseRect() so that trace flags will be not destroyed so much)
- paint.setPen(Qt::white);
+ paint.setPen(TQt::white);
paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -121,7 +121,7 @@ void PosWidget::eraseOld()
if ( trace ) // show previous position with a smaller black cross
{
- paint.setPen(Qt::black);
+ paint.setPen(TQt::black);
paint.drawLine(x - 2, y - 2,
x + 2, y + 2);
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index fd0bda8aa..4b25e4be3 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -340,7 +340,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
if (offset > 0)
{
TQPixmap pixmap(offset, offset);
- pixmap.fill(Qt::color0);
+ pixmap.fill(TQt::color0);
pixmap.setMask(pixmap.createHeuristicMask());
TQBitmap mask( pixmap.size(), true );
pixmap.setMask( mask );
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 519ec91df..c9a8a6763 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -86,7 +86,7 @@ TopLevel::TopLevel(const char* name)
}
// create the layout box
- _splitter = new TQSplitter( Qt::Horizontal, this );
+ _splitter = new TQSplitter( TQt::Horizontal, this );
TQFrame* leftFrame = new TQFrame ( _splitter );
TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame );
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index f6fcd2e5a..a560183eb 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -96,7 +96,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
_lvStartup->setAllColumnsShowFocus(true);
_lvStartup->header()->setStretchEnabled(true, 2);
- KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal);
+ KButtonBox *buttonBox = new KButtonBox( gb, TQt::Horizontal);
_pbStart = buttonBox->addButton( i18n("Start"));
_pbStop = buttonBox->addButton( i18n("Stop"));
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index d002b667f..eccc5210a 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -181,9 +181,9 @@ extern "C"
kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
// this should match the included files above
#define NOSLOTS
-#define SHIFT Qt::SHIFT
-#define CTRL Qt::CTRL
-#define ALT Qt::ALT
+#define SHIFT TQt::SHIFT
+#define CTRL TQt::CTRL
+#define ALT TQt::ALT
#include "../../klipper/klipperbindings.cpp"
#include "../../twin/twinbindings.cpp"
#define KICKER_ALL_BINDINGS
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 084bf040d..349bd492d 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -172,7 +172,7 @@ void ModifiersModule::initGUI()
TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() );
pLayoutTop->setColStretch( 1, 1 );
- TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("TDE Modifiers"), this );
+ TQGroupBox* pGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("TDE Modifiers"), this );
pLayoutTop->addWidget( pGroup, 0, 0 );
TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup );
@@ -226,7 +226,7 @@ void ModifiersModule::initGUI()
//------------------
pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 );
- pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
+ pGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("X Modifier Mapping"), this );
pLayoutTop->addWidget( pGroup, 4, 0 );
m_plstXMods = new TDEListView( pGroup );
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 36d0e3bf4..06d01e317 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -122,7 +122,7 @@ AppTreeView::~AppTreeView()
void AppTreeView::fill()
{
- TQApplication::setOverrideCursor(Qt::WaitCursor);
+ TQApplication::setOverrideCursor(TQt::WaitCursor);
clear();
fillBranch(TQString::null, 0);
TQApplication::restoreOverrideCursor();
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 63cdb35a9..5fdb22983 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -696,7 +696,7 @@ void PositionTab::showIdentify()
screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain);
- screenLabel->setAlignment(Qt::AlignCenter);
+ screenLabel->setAlignment(TQt::AlignCenter);
screenLabel->setNum(s + 1);
// BUGLET: we should not allow the identification to be entered again
// until the timer fires.
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 5d5305b09..d7af32f8b 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -86,7 +86,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
// name group
TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
- name_group->setColumnLayout(4, Qt::Horizontal);
+ name_group->setColumnLayout(4, TQt::Horizontal);
for(int i = 0; i < (maxDesktops/2); i++)
{
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 9dcb68e55..94f866b1a 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -94,7 +94,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
m_pNormalText = new KColorButton( normalTextColor, 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,(Qt::AlignmentFlags)hAlign);
+ lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
wtstr = i18n("This is the color used to display text in Konqueror windows.");
TQWhatsThis::add( label, wtstr );
@@ -129,7 +129,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
TQT_SLOT( slotTextBackgroundClicked() ) );
m_pTextBackground = new KColorButton( textBackgroundColor, this );
- lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(Qt::AlignmentFlags)hAlign);
+ lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
wtstr = i18n("This is the color used behind the text for the icons on the desktop.");
TQWhatsThis::add( label, wtstr );
@@ -179,7 +179,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
}
cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
- lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(Qt::AlignmentFlags)hAlign);
+ lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign);
connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
@@ -192,7 +192,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
row++;
m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
- lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(Qt::AlignmentFlags)hAlign );
+ lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign );
connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
@@ -263,7 +263,7 @@ void KonqFontOptions::load( bool useDefaults )
m_pTextBackground->setColor( textBackgroundColor );
// Don't keep an invalid color around, otherwise checking the checkbox still gives invalid.
if ( !textBackgroundColor.isValid() )
- textBackgroundColor = Qt::black;
+ textBackgroundColor = TQt::black;
}
else
{
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 30272c3f6..c921ef64d 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
int r = 0;
int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons
- TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this );
+ TQGroupBox* gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Font Si&ze"), this );
lay->addMultiCellWidget(gb, r, r, E, W);
TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") );
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index fcddac791..e6521b3b8 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -35,11 +35,11 @@
DomainListView::DomainListView(TDEConfig *config,const TQString &title,
TQWidget *parent,const char *name) :
TQGroupBox(title, parent, name), config(config) {
- setColumnLayout(0, Qt::Vertical);
+ setColumnLayout(0, TQt::Vertical);
layout()->setSpacing(0);
layout()->setMargin(0);
TQGridLayout* thisLayout = new TQGridLayout(layout());
- thisLayout->setAlignment(Qt::AlignTop);
+ thisLayout->setAlignment(TQt::AlignTop);
thisLayout->setSpacing(KDialog::spacingHint());
thisLayout->setMargin(KDialog::marginHint());
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 9a2ae9efe..6603c06ca 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -55,7 +55,7 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group,
mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this);
topLayout->addWidget( mKillCheck );
- TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this );
+ TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("URL Expressions to Filter"), this );
topLayout->addWidget( topBox );
mListBox = new TQListBox( topBox );
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index da5af132d..ebbf7c4aa 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -45,7 +45,7 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 );
// the global checkbox
- TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this );
+ TQGroupBox* globalGB = new TQGroupBox( 2, TQt::Vertical, i18n( "Global Settings" ), this );
toplevel->addWidget( globalGB );
enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB );
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 1debc0ace..07a0cbea6 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -132,11 +132,11 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
bool is_per_domain = !policies->isGlobal();
- setColumnLayout(0, Qt::Vertical);
+ setColumnLayout(0, TQt::Vertical);
layout()->setSpacing(0);
layout()->setMargin(0);
TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
- this_layout->setAlignment(Qt::AlignTop);
+ this_layout->setAlignment(TQt::AlignTop);
this_layout->setSpacing(3);
this_layout->setMargin(11);
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index f8e1ad10a..547182f2d 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -62,7 +62,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB );
enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB);
- priority = new TQSlider(5, 100, 5, 100, Qt::Horizontal, globalGB);
+ priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB);
connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) );
connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 1b7875e7f..33f78e18e 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -56,7 +56,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
"notification. In this case, the cursor stops blinking after the time\n"
"given in the section 'Startup indication timeout'"));
- GroupBox1->setColumnLayout(0, Qt::Vertical );
+ GroupBox1->setColumnLayout(0, TQt::Vertical );
GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox1 );
@@ -96,7 +96,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
"notification. In this case, the button disappears after the time\n"
"given in the section 'Startup indication timeout'"));
- GroupBox2->setColumnLayout( 0, Qt::Vertical );
+ GroupBox2->setColumnLayout( 0, TQt::Vertical );
GroupBox2->layout()->setSpacing( 0 );
GroupBox2->layout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox2 );
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index 1f34e9c89..4e09726b4 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -46,7 +46,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale,
// Whatever the color scheme is, we want black text
TQColorGroup a = palette().active();
- a.setColor(TQColorGroup::Foreground, Qt::black);
+ a.setColor(TQColorGroup::Foreground, TQt::black);
TQPalette pal(a, a, a);
m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:"));
diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp
index 11263bbf4..39e00980d 100644
--- a/kcontrol/randr/tderandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -121,7 +121,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int)));
rateLabel->setBuddy( m_refreshRates );
- m_rotationGroup = new TQButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
+ m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
topLayout->addWidget(m_rotationGroup);
m_rotationGroup->setRadioButtonExclusive(true);
TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen."));
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 647f0eca7..6a65662a7 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -61,7 +61,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
TDEPopupMenu *help = m_help->menu();
help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
setPixmap(KSystemTray::loadIcon("randr"));
- setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+ setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
TQToolTip::add(this, i18n("Screen resize & rotate"));
my_parent = parent;
@@ -147,7 +147,7 @@ void KRandRSystemTray::showEvent ( TQShowEvent * )
void KRandRSystemTray::mousePressEvent(TQMouseEvent* e)
{
// Popup the context menu with left-click
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
contextMenuAboutToShow(contextMenu());
contextMenu()->popup(e->globalPos());
e->accept();
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index fb7eea1b7..cb6b40c99 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -59,7 +59,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
subLayout->addWidget(&showConnClose,1,0);
subLayout->addWidget(&showFileOpen,0,1);
subLayout->addWidget(&showFileClose,1,1);
- mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
+ mainLayout->addWidget(&updateButton,0,TQt::AlignLeft);
TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
" your samba log file in a friendly layout. Check that the correct log"
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index cd30fa1a1..67a93a5e2 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -140,7 +140,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint());
mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this );
- mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
+ mSaverGroup->setColumnLayout( 0, TQt::Horizontal );
vLayout->addWidget(mSaverGroup);
vLayout->setStretchFactor( mSaverGroup, 10 );
TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
@@ -170,7 +170,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") );
mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
- mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
+ mSettingsGroup->setColumnLayout( 0, TQt::Vertical );
leftColumnLayout->addWidget( mSettingsGroup );
TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() );
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 49ca332dd..cc052e4c3 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -156,12 +156,12 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
// Add Page1 (Style)
// -----------------
gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
- gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
+ gbWidgetStyle->setColumnLayout( 0, TQt::Vertical );
gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
- gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
+ gbWidgetStyleLayout->setAlignment( TQt::AlignTop );
hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -205,7 +205,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbWidgetStyleLayout->addSpacing(10);
TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
- gbPreview->setColumnLayout( 0, Qt::Vertical );
+ gbPreview->setColumnLayout( 0, TQt::Vertical );
gbPreview->layout()->setMargin( 0 );
gbPreview->layout()->setSpacing( KDialog::spacingHint() );
gbPreview->setFlat( true );
@@ -304,7 +304,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
sliderBox = new TQVBox( menuContainer );
sliderBox->setSpacing( KDialog::spacingHint() );
sliderBox->setMargin( 0 );
- slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox );
+ slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, TQt::Horizontal, sliderBox );
slOpacity->setTickmarks( TQSlider::Below );
slOpacity->setTickInterval( 10 );
TQHBox* box1 = new TQHBox( sliderBox );
@@ -813,7 +813,7 @@ void KCMStyle::loadStyle( TDEConfig& config )
// they use QPopupMenus for the drop-down list!
// ##### Since Trolltech likes to seemingly copy & paste code,
- // TQStringList::findItem() doesn't have a Qt::StringComparisonMode field.
+ // TQStringList::findItem() doesn't have a TQt::StringComparisonMode field.
// We roll our own (yuck)
cfgStyle = cfgStyle.lower();
int item = 0;
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 1956a34a6..987a44174 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -491,7 +491,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
x=offset, y=offset;
pix.resize(w, h);
- pix.fill(Qt::white);
+ pix.fill(TQt::white);
TQPainter painter(&pix);
@@ -580,7 +580,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
painter.setFont(TDEGlobalSettings::generalFont());
- painter.setPen(Qt::black);
+ painter.setPen(TQt::black);
y=painter.fontMetrics().height();
drawText(painter, x, y, w-offset, title);
y+=4;
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 41367d586..ff2eaae77 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -65,7 +65,7 @@ void CFontPreview::showFont()
if(!itsCurrentUrl.isEmpty() &&
itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false))
{
- setEraseColor(Qt::white);
+ setEraseColor(TQt::white);
update();
emit status(true);
}
diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 5e5cbd233..821d2e8e4 100644
--- a/kcontrol/tdeio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
@@ -45,8 +45,8 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
{
int key = e->key();
TQString keycode = e->text();
- if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
- (cursorPosition() > 0 && key == Qt::Key_Minus) ||
+ if ( (key >= TQt::Key_Escape && key <= TQt::Key_Help) || key == TQt::Key_Period ||
+ (cursorPosition() > 0 && key == TQt::Key_Minus) ||
(!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
{
KLineEdit::keyPressEvent(e);
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index a1ee6bda4..21745ef5d 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -130,7 +130,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
logobutton->installEventFilter(this); // for drag and drop
connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked()));
hglay->addWidget(logoLabel, 1, 0);
- hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter);
+ hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter);
hglay->addRowSpacing(1, 110);
wtstr = i18n("Click here to choose an image that TDM will display. "
"You can also drag and drop an image onto this button "
@@ -145,7 +145,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
grid->addLayout(hglay, 2, 1);
label = new TQLabel(i18n("Position:"), group);
- hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter);
+ hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter);
TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
hglay->addWidget(xLineLabel, 0, 1);
@@ -226,7 +226,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
// The Language group box
- group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this);
+ group = new TQGroupBox(0, TQt::Vertical, i18n("Locale"), this);
vbox->addWidget(group);
langcombo = new KLanguageButton(group);
@@ -243,7 +243,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
TQWhatsThis::add( langcombo, wtstr );
// The SAK group box
- group = new TQGroupBox(0, Qt::Vertical, i18n("Secure Attention Key"), this);
+ group = new TQGroupBox(0, TQt::Vertical, i18n("Secure Attention Key"), this);
vbox->addWidget(group);
sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
@@ -262,7 +262,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
TQWhatsThis::add( sakbox, wtstr );
// Keyboard group box
- group = new TQGroupBox(0, Qt::Vertical, i18n("Keyboard"), this);
+ group = new TQGroupBox(0, TQt::Vertical, i18n("Keyboard"), this);
vbox->addWidget(group);
kbdledbox = new TQCheckBox(i18n("Sync keyboard led status"), group);
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index c7e155565..4b7b64ba3 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -93,7 +93,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
TQString wtstr;
- minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this );
+ minGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("System U&IDs"), this );
TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by TDM and this setup dialog."
" Note that users with the UID 0 (typically root) are not affected by this and must be"
" explicitly hidden in \"Not hidden\" mode."));
@@ -114,7 +114,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
- usrGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("Users"), this );
+ usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this );
connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) );
connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup );
@@ -154,7 +154,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
TQT_SLOT(slotChanged()) );
- faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
+ faceGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("User Image Source"), this );
TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users."
" \"Admin\" represents the global folder; these are the pictures you can set below."
" \"User\" means that TDM should read the user's $HOME/.face.icon file."
@@ -191,8 +191,8 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
hlpl->addWidget( userlabel, 0, 0 );
// hlpl->addSpacing( KDialog::spacingHint() );
hlpl->addWidget( usercombo, 0, 1 );
- hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter );
- hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter );
+ hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, TQt::AlignHCenter );
+ hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, TQt::AlignHCenter );
TQHBoxLayout *main = new TQHBoxLayout( this, 10 );
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index b58647a9e..223a201d1 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -36,7 +36,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQGroupBox *gbox = new TQGroupBox(i18n("USB Devices"), this);
- gbox->setColumnLayout( 0, Qt::Horizontal );
+ gbox->setColumnLayout( 0, TQt::Horizontal );
vbox->addWidget(gbox);
TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index d32adc1b8..f5d74a191 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -223,7 +223,7 @@ TQWidget *KCMXinerama::indicator(int dpy) {
si->setFont(fnt);
si->setFrameStyle(TQFrame::Panel);
si->setFrameShadow(TQFrame::Plain);
- si->setAlignment(Qt::AlignCenter);
+ si->setAlignment(TQt::AlignCenter);
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 71e008562..183fcc417 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -123,7 +123,7 @@
</group>
<group name="FMSettings">
<entry key="NormalTextColor" type="Color"> <!--SHARED-->
- <default>Qt::white</default>
+ <default>TQt::white</default>
<label>Normal text color used for icon labels</label>
<whatsthis></whatsthis>
</entry>
diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp
index ba05dc655..35f763f9c 100644
--- a/kdesktop/kdesktopapp.cpp
+++ b/kdesktop/kdesktopapp.cpp
@@ -27,7 +27,7 @@ KUniqueApplication()
#endif
}
-KDesktopApp::KDesktopApp(Display * dpy, Qt::HANDLE visual, Qt::HANDLE colormap):
+KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap):
KUniqueApplication(dpy, visual, colormap)
{
#ifdef COMPOSITE
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 39bcf13f4..465598a3d 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -38,8 +38,8 @@ class KDesktopApp : public KUniqueApplication
TQ_OBJECT
public:
KDesktopApp();
- KDesktopApp(Display * dpy, Qt::HANDLE visual = 0,
- Qt::HANDLE colormap = 0);
+ KDesktopApp(Display * dpy, TQt::HANDLE visual = 0,
+ TQt::HANDLE colormap = 0);
#ifdef COMPOSITE
bool x11EventFilter (XEvent *);
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 91bddb5b3..fe751db4f 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -17,34 +17,34 @@
if (kapp->authorize("run_command"))
{
#endif
- DEF( I18N_NOOP("Run Command"), ALT+Qt::Key_F2, WIN+Qt::Key_Return, slotExecuteCommand() );
+ DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
#ifndef NOSLOTS
}
#endif
- DEF( I18N_NOOP("Show Taskmanager"), CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Pause, slotShowTaskManager() );
- DEF( I18N_NOOP("Show Window List"), ALT+Qt::Key_F5, WIN+Qt::Key_0, slotShowWindowList() );
- DEF( I18N_NOOP("Switch User"), ALT+CTRL+Qt::Key_Insert, WIN+Qt::Key_Insert, slotSwitchUser() );
+ DEF( I18N_NOOP("Show Taskmanager"), CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Pause, slotShowTaskManager() );
+ DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
+ DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
#ifndef NOSLOTS
if (kapp->authorize("lock_screen"))
{
#endif
- DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) );
+ DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) );
DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQT_SLOT(slotLock()) );
#ifndef NOSLOTS
}
if (kapp->authorize("start_screensaver"))
{
#endif
- DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+Qt::Key_S, WIN+Qt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) );
+ DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) );
#ifndef NOSLOTS
}
if (kapp->authorize("logout"))
{
#endif
- DEF( I18N_NOOP("Log Out"), ALT+CTRL+Qt::Key_Delete, WIN+Qt::Key_Escape, slotLogout() );
- DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_Delete, WIN+SHIFT+Qt::Key_Escape, slotLogoutNoCnf() );
- DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageDown, WIN+CTRL+SHIFT+Qt::Key_PageDown, slotHaltNoCnf() );
- DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageUp, WIN+CTRL+SHIFT+Qt::Key_PageUp, slotRebootNoCnf() );
+ DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
+ DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_Delete, WIN+SHIFT+TQt::Key_Escape, slotLogoutNoCnf() );
+ DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageDown, WIN+CTRL+SHIFT+TQt::Key_PageDown, slotHaltNoCnf() );
+ DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageUp, WIN+CTRL+SHIFT+TQt::Key_PageUp, slotRebootNoCnf() );
#ifndef NOSLOTS
}
#endif
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 409887784..a628aaa12 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -650,7 +650,7 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl;
// TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
- if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
+ if ( e->button() == TQt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
{
TQIconViewItem *item = findItem( e->pos() );
if ( !item )
@@ -731,7 +731,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it
{
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl;
- if ( _item && _button == Qt::MidButton ) {
+ if ( _item && _button == TQt::MidButton ) {
slotExecuted(_item);
}
}
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index 62ee673e0..f3c6170e7 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -609,15 +609,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
{
if (!desktopMenu) return; // initialisation not yet done
switch ( _button ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
if ( m_bShowMenuBar && menuBar )
menuBar->raise();
activateMenu( leftButtonChoice, _global );
break;
- case Qt::MidButton:
+ case TQt::MidButton:
activateMenu( middleButtonChoice, _global );
break;
- case Qt::RightButton:
+ case TQt::RightButton:
if (!kapp->authorize("action/kdesktop_rmb")) return;
activateMenu( rightButtonChoice, _global );
break;
diff --git a/kdesktop/lock/autologout.cpp b/kdesktop/lock/autologout.cpp
index 6e05c439d..1b63160f6 100644
--- a/kdesktop/lock/autologout.cpp
+++ b/kdesktop/lock/autologout.cpp
@@ -67,7 +67,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
unlockDialogLayout->addWidget( frame );
frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
- frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop);
+ frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, TQt::AlignCenter | TQt::AlignTop);
frameLayout->addWidget(greetLabel, 0, 1);
frameLayout->addWidget(mStatusLabel, 1, 1);
frameLayout->addWidget(infoLabel, 2, 1);
diff --git a/kdesktop/lock/infodlg.cpp b/kdesktop/lock/infodlg.cpp
index 3efaf060d..6fc604b43 100644
--- a/kdesktop/lock/infodlg.cpp
+++ b/kdesktop/lock/infodlg.cpp
@@ -97,7 +97,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
layStatus->addWidget( mStatusLabel );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
frameLayout->addLayout( layStatus, 1, 1 );
installEventFilter(this);
@@ -111,7 +111,7 @@ InfoDlg::~InfoDlg()
void InfoDlg::updateLabel(TQString &txt)
{
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
}
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index 890aa7c53..969dcb77a 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -200,7 +200,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
if (!m_lockStartDT.isNull()) {
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
frameLayout->addWidget( greetLabel, 1, 1 );
frameLayout->addWidget( lockDTLabel, 2, 1 );
frameLayout->addItem( greet->getLayoutItem(), 3, 1 );
@@ -210,7 +210,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
}
else {
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
frameLayout->addWidget( greetLabel, 1, 1 );
frameLayout->addItem( greet->getLayoutItem(), 2, 1 );
frameLayout->addLayout( layStatus, 3, 1 );
@@ -220,7 +220,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
}
else {
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, TQt::AlignTop );
frameLayout->addWidget( greetLabel, 0, 1 );
frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
frameLayout->addLayout( layStatus, 2, 1 );
@@ -329,12 +329,12 @@ void PasswordDlg::setLayoutText( const TQString &txt )
void PasswordDlg::updateLabel()
{
if (mUnlockingFailed) {
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
// mStatusLabel->show();
}
else if (mCapsLocked) {
- mStatusLabel->setPaletteForegroundColor(Qt::red);
+ mStatusLabel->setPaletteForegroundColor(TQt::red);
mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
// mStatusLabel->show();
}
@@ -715,9 +715,9 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
- grid->addWidget( label1, 0, 0, Qt::AlignCenter );
- grid->addWidget( label2, 0, 1, Qt::AlignCenter );
- grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+ grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+ grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+ grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
static_cast< LockProcess* >(parent())->execDialog( &dialog );
}
@@ -791,8 +791,8 @@ void PasswordDlg::slotStartNewSession()
TQGridLayout *grid = new TQGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() );
grid->setMargin( KDialog::marginHint() );
- grid->addWidget( label1, 0, 0, Qt::AlignCenter );
- grid->addWidget( label2, 0, 1, Qt::AlignCenter );
+ grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+ grid->addWidget( label2, 0, 1, TQt::AlignCenter );
TQCheckBox *cb = new TQCheckBox( i18n("&Do not ask again"), winFrame );
grid->addMultiCellWidget( cb, 1,1, 0,1 );
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index 3ebf80442..bbb6d3175 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -2046,7 +2046,7 @@ int LockProcess::execDialog( TQDialog *dlg )
void LockProcess::slotForcePaintBackground()
{
TQPixmap blankPixmap(mRootWidth, mRootHeight);
- blankPixmap.fill(Qt::black);
+ blankPixmap.fill(TQt::black);
slotPaintBackground(blankPixmap);
printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner. High system load or possibly a TDE bug!\n"); fflush(stdout);
}
@@ -2447,9 +2447,9 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
TQVBoxLayout *vbox = new TQVBoxLayout( &box );
vbox->addWidget( winFrame );
TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
- grid->addWidget( label1, 0, 0, Qt::AlignCenter );
- grid->addWidget( label2, 0, 1, Qt::AlignCenter );
- grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+ grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+ grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+ grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
execDialog( &box );
}
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index ec20b43c2..162542555 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -28,7 +28,7 @@ class MyApp : public TDEApplication {
TQ_OBJECT
public:
MyApp() : TDEApplication(), lastTick( 0 ) {}
- MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
+ MyApp(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
protected:
bool x11EventFilter( XEvent * );
diff --git a/kdesktop/lock/querydlg.cpp b/kdesktop/lock/querydlg.cpp
index 1fc5d260c..9d594ecba 100644
--- a/kdesktop/lock/querydlg.cpp
+++ b/kdesktop/lock/querydlg.cpp
@@ -111,7 +111,7 @@ QueryDlg::QueryDlg(LockProcess *parent)
layButtons->addWidget( ok );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
frameLayout->addLayout( layStatus, 0, 1 );
frameLayout->addLayout( layPin, 2, 1 );
frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
@@ -140,7 +140,7 @@ TQString QueryDlg::getEntry()
void QueryDlg::updateLabel(TQString &txt)
{
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
}
diff --git a/kdesktop/lock/sakdlg.cpp b/kdesktop/lock/sakdlg.cpp
index 803c77919..274826e69 100644
--- a/kdesktop/lock/sakdlg.cpp
+++ b/kdesktop/lock/sakdlg.cpp
@@ -142,7 +142,7 @@ void SAKDlg::reject()
void SAKDlg::updateLabel(TQString &txt)
{
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
}
diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp
index b54c03cb7..8892778da 100644
--- a/kdesktop/main.cpp
+++ b/kdesktop/main.cpp
@@ -247,7 +247,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
*qt_no_foreign_hack = true;
// else argb_visual = false ... ? *shrug*
if( argb_visual )
- myApp = new KDesktopApp( dpy, Qt::HANDLE( visual ), 0 );
+ myApp = new KDesktopApp( dpy, TQt::HANDLE( visual ), 0 );
else
XCloseDisplay( dpy );
}
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 0f49229a6..4b04ac3fe 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -375,7 +375,7 @@ void Minicli::reset()
void Minicli::keyPressEvent( TQKeyEvent* e )
{
- if ( e->key() == Qt::Key_Escape )
+ if ( e->key() == TQt::Key_Escape )
{
e->accept();
m_dlg->pbCancel->animateClick();
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index 876d19822..661d531ad 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -24,7 +24,7 @@
struct KPixmapInode
{
- Qt::HANDLE handle;
+ TQt::HANDLE handle;
Atom selection;
};
@@ -37,7 +37,7 @@ struct KPixmapData
struct TDESelectionInode
{
- Qt::HANDLE handle;
+ TQt::HANDLE handle;
TQString name;
};
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 4027b7e9a..d7b1cf75a 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -176,7 +176,7 @@ void StartupId::start_startupid( const TQString& icon_P )
{
const TQColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ]
- = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
+ = { TQt::black, TQt::darkGray, TQt::lightGray, TQt::white, TQt::white };
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h
index 46f77f636..0434a706e 100644
--- a/kdesktop/tdefileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -33,7 +33,7 @@
/*
* The dither flags used to display the shadow image
*/
-#define DITHER_FLAGS (Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::AvoidDither)
+#define DITHER_FLAGS (TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::AvoidDither)
class TQFont;
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 467f26792..05e6148a9 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -84,7 +84,7 @@ void KDateCombo::dateEnteredEvent(TQDate newDate)
void KDateCombo::mousePressEvent (TQMouseEvent * e)
{
- if (e->button() & Qt::LeftButton)
+ if (e->button() & TQt::LeftButton)
{
if (rect().contains( e->pos()))
{
@@ -113,12 +113,12 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
{
TQKeyEvent *k = (TQKeyEvent *)e;
//Press return == pick selected date and close the combo
- if((k->key()==Qt::Key_Return)||(k->key()==Qt::Key_Enter))
+ if((k->key()==TQt::Key_Return)||(k->key()==TQt::Key_Enter))
{
dateEnteredEvent(datePicker->date());
return true;
}
- else if (k->key()==Qt::Key_Escape)
+ else if (k->key()==TQt::Key_Escape)
{
popupFrame->hide();
return true;
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 29e3010b4..ff47a2776 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -31,7 +31,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
KStdGuiItem::saveAs())
{
TQWidget::setCaption( i18n("Find Files/Folders" ) );
- setButtonBoxOrientation(Qt::Vertical);
+ setButtonBoxOrientation(TQt::Vertical);
enableButton(Apply, true); // Enable "Find"
enableButton(User1, false); // Disable "Stop"
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index c2df7aa67..240b223bf 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -212,7 +212,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
grid1->addWidget(rb[0], 1, 1 );
grid1->addWidget(fromDate, 1, 2 );
- grid1->addWidget(andL, 1, 3, Qt::AlignHCenter );
+ grid1->addWidget(andL, 1, 3, TQt::AlignHCenter );
grid1->addWidget(toDate, 1, 4 );
grid1->addWidget(rb[1], 2, 1 );
@@ -330,7 +330,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
grid2->addWidget( textMetaKey, 4, 0 );
grid2->addWidget( metainfokeyEdit, 4, 1 );
- grid2->addWidget( textMetaInfo, 4, 2, Qt::AlignHCenter );
+ grid2->addWidget( textMetaInfo, 4, 2, TQt::AlignHCenter );
grid2->addWidget( metainfoEdit, 4, 3 );
metainfokeyEdit->setText("*");
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index 6e4395a5b..db946cf06 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder()
void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
{
- if (ev->button() == Qt::LeftButton)
+ if (ev->button() == TQt::LeftButton)
{
_mouseButtonDown = true;
stroke.reset();
@@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev)
{
- if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown))
+ if ((ev->button() == TQt::LeftButton) && (_mouseButtonDown))
{
TQPoint pos = ev->pos();
stroke.record(pos.x(), pos.y());
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index d4f7ff9d3..947a148b8 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -227,7 +227,7 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
lay->addWidget( lbl );
lay->addSpacing( 10 );
bt = new KKeyButton( this );
- lay->addWidget( bt, 0 , Qt::AlignHCenter );
+ lay->addWidget( bt, 0 , TQt::AlignHCenter );
lay->addStretch();
clear_data();
connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )),
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 536d62065..c4fd6476a 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -425,7 +425,7 @@ void DigitalClock::drawContents( TQPainter * p)
p->translate( +1, +1 );
TQLCDNumber::drawContents( p );
if (_prefs->digitalLCDStyle())
- pal.setColor( TQColorGroup::Foreground, Qt::black);
+ pal.setColor( TQColorGroup::Foreground, TQt::black);
else
pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal );
@@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * )
}
if (_prefs->analogLCDStyle()) {
- paint.setPen( TQPen(Qt::black, aaFactor) );
- paint.setBrush( Qt::black );
+ paint.setPen( TQPen(TQt::black, aaFactor) );
+ paint.setBrush( TQt::black );
} else {
paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) );
paint.setBrush( _prefs->analogForegroundColor() );
@@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p)
TQRect tr;
- if (_applet->getOrientation() == Qt::Vertical)
+ if (_applet->getOrientation() == TQt::Vertical)
{
p->rotate(90);
tr = TQRect(4, -2, height() - 8, -(width()) + 2);
@@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine()
int ClockApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const
int ClockApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev)
{
switch (ev->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
toggleCalendar();
break;
- case Qt::RightButton:
+ case TQt::RightButton:
openContextMenu();
break;
- case Qt::MidButton:
+ case TQt::MidButton:
nextZone();
TQToolTip::remove(_clock->widget());
break;
@@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout()
// this fixes problems triggered by having the date first
// because of the date format (e.g. YY/MM/DD) and then hiding
// the date
- if (orientation() == Qt::Horizontal && height() < 32)
+ if (orientation() == TQt::Horizontal && height() < 32)
{
bool mustShowDate = showDate || (zone->zoneIndex() != 0);
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index d6165306e..99b9fe33e 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e)
{
TQVBox::keyPressEvent(e);
- if (e->key() == Qt::Key_Escape)
+ if (e->key() == TQt::Key_Escape)
{
close();
}
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index aa9126b8c..85a4f3f19 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
if (z)
{
- return -z->offset(Qt::LocalTime);
+ return -z->offset(TQt::LocalTime);
}
return 0;
diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp
index 46c79a857..5172b4eee 100644
--- a/kicker/applets/launcher/flowgridmanager.cpp
+++ b/kicker/applets/launcher/flowgridmanager.cpp
@@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size,
TQSize p_space_size,
TQSize p_border_size,
TQSize p_frame_size,
- Qt::Orientation orient,
+ TQt::Orientation orient,
int num_items,
Slack slack_x,Slack slack_y)
{
@@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size)
return;
_pFrameSize=p_frame_size;
if (_pFrameSize.width()<=0) {
- _orientation=Qt::Vertical;
+ _orientation=TQt::Vertical;
}
if (_pFrameSize.height()<=0) {
- _orientation=Qt::Horizontal;
+ _orientation=TQt::Horizontal;
}
_dirty=true;
}
-void FlowGridManager::setOrientation(Qt::Orientation orient)
+void FlowGridManager::setOrientation(TQt::Orientation orient)
{ if (orient==_orientation)
return;
_orientation=orient; _dirty=true;
@@ -114,7 +114,7 @@ TQSize FlowGridManager::frameSize() const
TQPoint FlowGridManager::origin() const
{ _checkReconfigure(); return _origin;}
-Qt::Orientation FlowGridManager::orientation() const
+TQt::Orientation FlowGridManager::orientation() const
{ _checkReconfigure(); return _orientation;}
/*Slack FlowGridManager::slackX() const
@@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const
// return height if orientation is Horizontal
// return width if orientation is Vertical
int FlowGridManager::_getHH(TQSize size) const
-{ if (_orientation==Qt::Horizontal)
+{ if (_orientation==TQt::Horizontal)
return size.height();
return size.width();
}
@@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const
// return height if orientation is Vertical
// return width if orientation is Horizontal
int FlowGridManager::_getWH(TQSize size) const
-{ if (_orientation==Qt::Horizontal)
+{ if (_orientation==TQt::Horizontal)
return size.width();
return size.height();
}
// swap horizontal and vertical if orientation is Vertical, otherwise return arg
TQSize FlowGridManager::_swapHV(TQSize hv) const
-{ if (_orientation==Qt::Horizontal)
+{ if (_orientation==TQt::Horizontal)
return hv;
TQSize temp=hv;
temp.transpose();
diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h
index c801431b4..228210884 100644
--- a/kicker/applets/launcher/flowgridmanager.h
+++ b/kicker/applets/launcher/flowgridmanager.h
@@ -26,7 +26,7 @@ public:
TQSize p_space_size=TQSize(0,0),
TQSize p_border_size=TQSize(0,0),
TQSize frame_size=TQSize(0,0),
- Qt::Orientation orient=Qt::Horizontal,
+ TQt::Orientation orient=TQt::Horizontal,
int num_items=0,
Slack slack_x=ItemSlack,
Slack slack_y=ItemSlack);
@@ -36,7 +36,7 @@ public:
void setItemSize(TQSize item_size);
void setSpaceSize(TQSize space_size);
void setBorderSize(TQSize border_size);
- void setOrientation(Qt::Orientation orient);
+ void setOrientation(TQt::Orientation orient);
void setFrameSize(TQSize frame_size);
void setSlack(Slack slack_x, Slack slack_y);
void setConserveSpace(bool conserve);
@@ -49,7 +49,7 @@ public:
TQSize gridSpacing() const;
TQSize frameSize() const;
TQPoint origin() const;
- Qt::Orientation orientation() const;
+ TQt::Orientation orientation() const;
bool conserveSpace() const;
// Slack slackX() const;
@@ -76,7 +76,7 @@ protected:
TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;
Slack _slackX, _slackY;
bool _conserveSpace;
- Qt::Orientation _orientation;
+ TQt::Orientation _orientation;
int _numItems;
// results
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index e85732431..741eee46d 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)
void QuickButton::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
_popup->popup(e->globalPos());
- else if (e->button() == Qt::LeftButton) {
+ else if (e->button() == TQt::LeftButton) {
_dragPos = e->pos();
TQButton::mousePressEvent(e);
}
@@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)
void QuickButton::mouseMoveEvent(TQMouseEvent *e)
{
- if ((e->state() & Qt::LeftButton) == 0) return;
+ if ((e->state() & TQt::LeftButton) == 0) return;
TQPoint p(e->pos() - _dragPos);
if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
return;
@@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
dd->drag();
releaseKeyboard();
} else {
- setCursor(Qt::ForbiddenCursor);
+ setCursor(TQt::ForbiddenCursor);
}
}
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 82a0a35a8..ebdc9346d 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const
{
FlowGridManager temp_manager = *m_manager;
temp_manager.setFrameSize(TQSize(h,h));
- temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary
+ temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary
if (temp_manager.isValid())
{
return temp_manager.frameSize().width();
@@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const
{
FlowGridManager temp_manager=*m_manager;
temp_manager.setFrameSize(TQSize(w,w));
- temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary
+ temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary
if (temp_manager.isValid())
{
return temp_manager.frameSize().height();
@@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const
int QuickLauncher::dimension() const
{
- if (orientation()==Qt::Vertical)
+ if (orientation()==TQt::Vertical)
{
return size().width();
}
@@ -507,7 +507,7 @@ void QuickLauncher::about()
void QuickLauncher::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
m_popup->popup(e->globalPos());
}
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 75533202c..abe34c978 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
//setFrameStyle(Panel | Sunken);
setBackgroundOrigin( AncestorOrigin );
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
else
layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
@@ -117,13 +117,13 @@ void Lockout::checkLayout( int height ) const
TQBoxLayout::Direction direction = layout->direction();
if ( direction == TQBoxLayout::LeftToRight &&
- ( ( orientation() == Qt::Vertical && s.width() - 2 >= height ) ||
- ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) {
+ ( ( orientation() == TQt::Vertical && s.width() - 2 >= height ) ||
+ ( orientation() == TQt::Horizontal && s.width() - 2 < height ) ) ) {
layout->setDirection( TQBoxLayout::TopToBottom );
}
else if ( direction == TQBoxLayout::TopToBottom &&
- ( ( orientation() == Qt::Vertical && s.height() - 2 < height ) ||
- ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) {
+ ( ( orientation() == TQt::Vertical && s.height() - 2 < height ) ||
+ ( orientation() == TQt::Horizontal && s.height() - 2 >= height ) ) ) {
layout->setDirection( TQBoxLayout::LeftToRight );
}
}
@@ -194,7 +194,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
conf->setGroup("lockout");
TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
- if( me->button() == Qt::RightButton )
+ if( me->button() == TQt::RightButton )
{
if( o == lockButton )
{
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index c3b964ce1..b50aea3d8 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons()
MediumButton *button = *it;
button_size = std::max(button_size,
- orientation() == Qt::Vertical ?
+ orientation() == TQt::Vertical ?
button->heightForWidth(width()) :
button->widthForHeight(height()) );
// button->widthForHeight(height()) :
@@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons()
}
int kicker_size;
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
kicker_size = width();
}
@@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons()
++pack_count;
- if(orientation() == Qt::Vertical)
+ if(orientation() == TQt::Vertical)
{
if (pack_count < max_packed_buttons)
{
@@ -425,7 +425,7 @@ void MediaApplet::reloadList()
void MediaApplet::mousePressEvent(TQMouseEvent *e)
{
- if(e->button()==Qt::RightButton)
+ if(e->button()==TQt::RightButton)
{
TDEPopupMenu menu(this);
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ac0fa1340..7685f04d7 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
m_curDesk = 1;
}
- desktopLayoutOrientation = Qt::Horizontal;
+ desktopLayoutOrientation = TQt::Horizontal;
desktopLayoutX = -1;
desktopLayoutY = -1;
@@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk )
int KMiniPager::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const
int KMiniPager::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
return;
}
}
- NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
+ NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
NETRootInfo i( tqt_xdisplay(), 0 );
i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
}
void KMiniPager::resizeEvent(TQResizeEvent*)
{
- bool horiz = orientation() == Qt::Horizontal;
+ bool horiz = orientation() == TQt::Horizontal;
int deskNum = m_desktops.count();
int rowNum = m_settings->numberOfRows();
@@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
{
nDX = rowNum;
nDY = deskCols;
- updateDesktopLayout(Qt::Horizontal, -1, nDX);
+ updateDesktopLayout(TQt::Horizontal, -1, nDX);
}
else
{
nDX = deskCols;
nDY = rowNum;
- updateDesktopLayout(Qt::Horizontal, nDY, -1);
+ updateDesktopLayout(TQt::Horizontal, nDY, -1);
}
// 1 pixel spacing.
@@ -728,7 +728,7 @@ void KMiniPager::aboutToShowContextMenu()
rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
- showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"):
+ showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
i18n("&Columns"),
rowMenu);
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 6d3355769..71e3f465b 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -528,10 +528,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
// prevent LMB down -> RMB down -> LMB up sequence
- if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton)
+ if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton)
{
emit showMenu(e->globalPos(), m_desktop);
return;
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index aaadfc33d..1121cf45b 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -115,7 +115,7 @@ RunApplet::~RunApplet()
void RunApplet::resizeEvent(TQResizeEvent*)
{
- if(orientation() == Qt::Horizontal)
+ if(orientation() == TQt::Horizontal)
{
_btn->hide();
_input->reparent(this, TQPoint(0,0), true);
@@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command)
return;
hide:
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
_hbox->hide();
needsFocus(focusNeeded);
}
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 2fa4910cf..25a6de7de 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -119,7 +119,7 @@ void SystemTrayApplet::updateClockGeometry()
if (m_clockApplet)
{
m_clockApplet->setPosition(position());
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height());
}
@@ -253,7 +253,7 @@ void SystemTrayApplet::preferences()
connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings()));
connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished()));
- TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, Qt::Vertical);
+ TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical);
m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid);
m_showClockSettingCB->setChecked(m_showClockInTray);
@@ -432,11 +432,11 @@ void SystemTrayApplet::showExpandButton(bool show)
{
if (!m_expandButton)
{
- m_expandButton = new SimpleArrowButton(this, Qt::UpArrow, 0, KickerSettings::showDeepButtons());
+ m_expandButton = new SimpleArrowButton(this, TQt::UpArrow, 0, KickerSettings::showDeepButtons());
m_expandButton->installEventFilter(this);
refreshExpandButton();
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
m_expandButton->setFixedSize(width() - 4,
m_expandButton->sizeHint()
@@ -677,12 +677,12 @@ void SystemTrayApplet::refreshExpandButton()
return;
}
- Qt::ArrowType a;
+ TQt::ArrowType a;
- if (orientation() == Qt::Vertical)
- a = m_showHidden ? Qt::DownArrow : Qt::UpArrow;
+ if (orientation() == TQt::Vertical)
+ a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
else
- a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow;
+ a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
m_expandButton->setArrowType(a);
}
@@ -843,7 +843,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
else if (e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if (me->button() == Qt::RightButton)
+ if (me->button() == TQt::RightButton)
{
p = me->globalPos();
}
@@ -867,7 +867,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
int SystemTrayApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -886,7 +886,7 @@ int SystemTrayApplet::widthForHeight(int h) const
int SystemTrayApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -937,7 +937,7 @@ void SystemTrayApplet::layoutTray()
if (m_expandButton)
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
}
@@ -961,7 +961,7 @@ void SystemTrayApplet::layoutTray()
// This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
//
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
heightWidth = width() - ICON_MARGIN;
@@ -972,7 +972,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_leftSpacer,
0, 0,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 1;
if (showExpandButton)
@@ -980,7 +980,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_expandButton,
1, 1,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 2;
}
@@ -993,7 +993,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), col, line,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1011,7 +1011,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), col, line,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1024,7 +1024,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_rightSpacer,
col, col,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if (m_clockApplet) {
if (m_showClockInTray)
@@ -1035,7 +1035,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_clockApplet,
col+1, col+1,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
}
}
else // horizontal
@@ -1048,7 +1048,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_leftSpacer,
0, nbrOfLines - 1,
0, 0,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 1;
if (showExpandButton)
@@ -1056,7 +1056,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_expandButton,
0, nbrOfLines - 1,
1, 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 2;
}
@@ -1068,7 +1068,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), line, col,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1086,7 +1086,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), line, col,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1099,7 +1099,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_rightSpacer,
0, nbrOfLines - 1,
col, col,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if (m_clockApplet) {
if (m_showClockInTray)
@@ -1110,7 +1110,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_clockApplet,
0, nbrOfLines - 1,
col+1, col+1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
}
}
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 5673cb563..3e76d6a8d 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet()
int TaskbarApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
// FIXME KDE4: when either TaskBarContainer or Applet smartens up
// simplify this
- KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+ KPanelExtension::Position d = orientation() == TQt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
return container->sizeHint(d, TQSize(200, h)).width();
@@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const
int TaskbarApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
// FIXME KDE4: when either TaskBarContainer or Applet smartens up
// simplify this
- KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+ KPanelExtension::Position d = orientation() == TQt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
return container->sizeHint(d, TQSize(w, 200)).height();
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index f431b8aed..9665d21b9 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
int size = 1;
size = std::max( size,
- orientation() == Qt::Vertical ?
+ orientation() == TQt::Vertical ?
mButton->heightForWidth( width() ) :
mButton->widthForHeight( height() ) );
- if(orientation() == Qt::Vertical)
+ if(orientation() == TQt::Vertical)
{
mButton->resize( width(), size );
}
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 446991109..cbd336f6f 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers()
it != containers.constEnd();
++it)
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
(*it)->move(DockContainer::sz() * i, 0);
else
(*it)->move(0, DockContainer::sz() * i);
@@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
}
void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
// Store the position of the mouse clic.
mclic_pos = e->pos();
- } else if (e->button() == Qt::RightButton) {
+ } else if (e->button() == TQt::RightButton) {
int pos = findContainerAtPoint(e->pos());
if (pos != -1) containers.at(pos)->popupMenu(e->globalPos());
}
}
void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
- if (e->button() != Qt::LeftButton) return;
+ if (e->button() != TQt::LeftButton) return;
if (dragging_container) {
releaseMouse();
original_container->embed(dragging_container->embeddedWinId());
@@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
}
void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
- if (! (e->state() & Qt::LeftButton) ) return;
+ if (! (e->state() & TQt::LeftButton) ) return;
if (dragging_container == 0) {
// Check whether the user has moved far enough.
int delay = TQApplication::startDragDistance();
@@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
int pdrag1,pdrag2,psz;
pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2;
pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2;
- if (orientation() == Qt::Vertical) {
+ if (orientation() == TQt::Vertical) {
int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp;
psz = height();
} else psz = width();
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 1d15dc7c8..54dd1dfd6 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar()
box->setSpacing( spacingHint() );
box->setMargin( marginHint() );
- KasBar *bar = new KasBar( Qt::Horizontal, box );
+ KasBar *bar = new KasBar( TQt::Horizontal, box );
bar->setItemSize( KasBar::Large );
bar->setMasked( false );
@@ -131,7 +131,7 @@ void KasAboutDialog::addDemoBar()
ci->setCustomPopup( true );
connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) );
- KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+ KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
KasItem *i = 0;
KasClockItem *clk = new KasClockItem( groupbar );
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 87fc7c629..f28d2fd1f 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
: TQWidget( parent, name, f ),
master_(0),
orient( o ),
- direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+ direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
itemUnderMouse_( 0 ),
boxesPerLine_(10), // Temp value
inDrag( false ),
@@ -109,7 +109,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
: TQWidget( parent, name, f ),
master_(master),
orient( o ),
- direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+ direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
itemUnderMouse_( 0 ),
boxesPerLine_(10), // Temp value
inDrag( false ),
@@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir )
return;
if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) )
- orient = Qt::Horizontal;
+ orient = TQt::Horizontal;
else
- orient = Qt::Vertical;
+ orient = TQt::Vertical;
direction_ = dir;
emit directionChanged();
@@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o )
if ( orient == o )
return;
- if ( o == Qt::Horizontal )
+ if ( o == TQt::Horizontal )
setDirection( TQBoxLayout::LeftToRight );
else
setDirection( TQBoxLayout::TopToBottom );
@@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach )
TQSize KasBar::sizeHint( Orientation o, TQSize sz )
{
- if ( o == Qt::Horizontal )
+ if ( o == TQt::Horizontal )
setBoxesPerLine( sz.width() / itemExtent() );
else
setBoxesPerLine( sz.height() / itemExtent() );
@@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz )
++r;
TQSize s;
- if( o == Qt::Horizontal ) {
+ if( o == TQt::Horizontal ) {
s.setWidth( c*itemExtent() );
s.setHeight( r*itemExtent() );
}
@@ -434,7 +434,7 @@ void KasBar::updateLayout()
++r;
TQSize sz;
- if ( orient == Qt::Horizontal )
+ if ( orient == TQt::Horizontal )
sz = TQSize( c * itemExtent(), r * itemExtent() );
else
sz = TQSize( r * itemExtent(), c * itemExtent() );
@@ -449,7 +449,7 @@ void KasBar::updateLayout()
TQRegion mask;
KasItem *i;
- if ( orient == Qt::Horizontal ) {
+ if ( orient == TQt::Horizontal ) {
for ( i = items.first(); i; i = items.next() ) {
int x = (items.at() % c) * itemExtent();
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 7602591e7..5aad7392a 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -84,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget
friend class KasItem;
public:
- KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
- KasBar( Qt::Orientation o, KasBar *master,
+ KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
+ KasBar( TQt::Orientation o, KasBar *master,
TQWidget* parent=0, const char* name=0, WFlags f=0 );
virtual ~KasBar();
@@ -99,7 +99,7 @@ public:
KasBar *master() const { return master_; }
/** Creates a child bar of the kasbar. The child will inherit the appearance options. */
- virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+ virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
/** Factory method that returns the singleton resources object. */
virtual KasResources *resources();
@@ -136,8 +136,8 @@ public:
int maxBoxes() const { return maxBoxes_; }
uint boxesPerLine() const { return boxesPerLine_; }
- void setOrientation( Qt::Orientation o );
- Qt::Orientation orientation() const { return orient; }
+ void setOrientation( TQt::Orientation o );
+ TQt::Orientation orientation() const { return orient; }
void setDirection( Direction dir );
Direction direction() const { return direction_; }
@@ -147,7 +147,7 @@ public:
bool isDrag() const { return inDrag; }
- TQSize sizeHint( Qt::Orientation, TQSize max );
+ TQSize sizeHint( TQt::Orientation, TQSize max );
//
// Look and feel options
@@ -282,7 +282,7 @@ private:
TQPixmap offscreen;
KasBar *master_;
KasItemList items;
- Qt::Orientation orient;
+ TQt::Orientation orient;
Direction direction_;
KasItem *itemUnderMouse_;
uint boxesPerLine_;
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 51e281a4f..1dc85038c 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -88,7 +88,7 @@ int main( int argc, char **argv )
TDEConfig conf( "kasbarrc" );
if ( args->isSet("test") ) {
- kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+ kasbar = new KasBar( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
kasbar->setItemSize( KasBar::Large );
kasbar->append( new KasClockItem(kasbar) );
kasbar->append( new KasItem(kasbar) );
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
kasbar->addTestItems();
}
else {
- KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+ KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
kastasker->setConfig( &conf );
kastasker->setStandAlone( true );
kasbar = kastasker;
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 5d870dae6..1aa373d3c 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
TQSize KasBarExtension::detachedSize()
{
- if ( orientation() == Qt::Vertical )
+ if ( orientation() == TQt::Vertical )
return TQSize( kasbar->itemExtent()/2, 0 );
else
return TQSize( 0, kasbar->itemExtent()/2 );
@@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize()
TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
{
- Orientation o = Qt::Horizontal;
+ Orientation o = TQt::Horizontal;
if ( p == Left || p == Right )
- o = Qt::Vertical;
+ o = TQt::Vertical;
if ( detached_ ) {
- if ( o == Qt::Vertical )
+ if ( o == TQt::Vertical )
return TQSize( kasbar->itemExtent()/2, 0 );
else
return TQSize( 0, kasbar->itemExtent()/2 );
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index a14dff2ea..693f912c4 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -255,7 +255,7 @@ void KasGroupItem::updatePopup()
KasPopup *KasGroupItem::createPopup()
{
KasPopup *pop = new KasPopup( this );
- bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+ bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) );
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 2523ef18c..1967465f4 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -179,11 +179,11 @@ void KasItem::mouseEnter()
void KasItem::mouseReleaseEvent( TQMouseEvent *ev )
{
- if ( ev->button() == Qt::LeftButton )
+ if ( ev->button() == TQt::LeftButton )
emit leftButtonClicked( ev );
- else if ( ev->button() == Qt::RightButton )
+ else if ( ev->button() == TQt::RightButton )
emit rightButtonClicked( ev );
- else if ( ev->button() == Qt::MidButton )
+ else if ( ev->button() == TQt::MidButton )
emit middleButtonClicked( ev );
}
@@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p )
p->drawRect( 0, 0, extent(), extent());
}
else {
- pen = TQPen( Qt::white );
+ pen = TQPen( TQt::white );
p->setPen( pen );
p->drawRect(0, 0, extent(), extent());
}
}
else if ( kas->paintInactiveFrames() ) {
- p->setPen( attention_ ? resources()->attentionColor() : Qt::black );
+ p->setPen( attention_ ? resources()->attentionColor() : TQt::black );
p->drawRect(0, 0, extent(), extent());
}
}
diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp
index 0edc0a77a..33966bdb9 100644
--- a/kicker/extensions/kasbar/kaspopup.cpp
+++ b/kicker/extensions/kasbar/kaspopup.cpp
@@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h )
int x = pos.x();
int y = pos.y();
- if ( kasbar->orientation() == Qt::Horizontal ) {
+ if ( kasbar->orientation() == TQt::Horizontal ) {
if ( y < ( tqApp->desktop()->height() / 2 ) )
y = y + kasbar->itemExtent();
else
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 729fda525..6d5255082 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -227,7 +227,7 @@ void KasPrefsDialog::addBackgroundPage()
TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox );
int percent = (int) (kasbar->tintAmount() * 100.0);
- tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox );
+ tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox );
tintAmount->setTracking( true );
connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ),
kasbar, TQT_SLOT( setTintAmount( int ) ) );
@@ -261,7 +261,7 @@ void KasPrefsDialog::addThumbsPage()
"cause performance problems." ) );
TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
int percent = (int) (kasbar->thumbnailSize() * 100.0);
- thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox );
+ thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox );
connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
thumbSizeLabel->setBuddy( thumbSizeSlider );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 78b25e8c0..219c324fb 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -126,10 +126,10 @@ static const char *micro_shade[]={
KasResources::KasResources( KasBar *parent, const char *name )
: TQObject( parent, name ? name : "kasbar_resources" ),
kasbar( parent ),
- labelPenColor_( Qt::white ), labelBgColor_( Qt::black ),
- activePenColor_( Qt::black ), activeBgColor_( Qt::white ),
- inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ),
- progressColor_( Qt::green ), attentionColor_( Qt::red ),
+ labelPenColor_( TQt::white ), labelBgColor_( TQt::black ),
+ activePenColor_( TQt::black ), activeBgColor_( TQt::white ),
+ inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ),
+ progressColor_( TQt::green ), attentionColor_( TQt::red ),
startupFrames_()
{
}
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index d10805a78..11185c9e0 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf )
conf->setGroup("Layout");
setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) );
- setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) );
+ setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) );
setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) );
TQPoint pos(100, 100);
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index d07c865fb..c05c13bb6 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -89,14 +89,14 @@ class KDE_EXPORT KasTasker : public KasBar
public:
/** Create a KasTasker widget. */
- KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+ KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
/**
* Create a KasTasker widget that is slaved to another KasTasker. The
* created widget will inherit the settings of the parent, but will
* not connect to the signals of the TaskManager.
*/
- KasTasker( Qt::Orientation o, KasTasker *master,
+ KasTasker( TQt::Orientation o, KasTasker *master,
TQWidget *parent=0, const char *name=0, WFlags f=0 );
/** Cleans up. */
@@ -105,7 +105,7 @@ public:
/** Factory method that returns the default menu for items in the bar. */
virtual TDEPopupMenu *contextMenu();
- virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+ virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
/**
* Returns true if this is the top KasTasker. Note that it is possible for
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 7b5fe4ed5..32ef9de81 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
}
KPixmapEffect::gradient( titleBg,
- Qt::black, colorGroup().mid(),
+ TQt::black, colorGroup().mid(),
KPixmapEffect::DiagonalGradient );
connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );
@@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
TQString text = item->task()->visibleIconicName();
- p.setPen( Qt::white );
+ p.setPen( TQt::white );
if ( fontMetrics().width( text ) > width() - 4 )
p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter,
text );
@@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
//
// Draw border
//
- p.setPen( Qt::black );
+ p.setPen( TQt::black );
p.drawRect( 0, 0, width(), height() );
}
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 1a4f6924b..89b0c4028 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -73,7 +73,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
m_resizeHandle->setFrameShape(TQFrame::Panel);
m_resizeHandle->setFrameShadow(TQFrame::Raised);
m_resizeHandle->setFixedWidth(6);
- m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor));
+ m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor));
connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool)));
needLayoutUpdate(false);
m_resizeHandle->installEventFilter(this);
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 4606b27fb..dbb6c4195 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p )
m_container->popupDirectionChange(KPanelApplet::Right);
break;
case Floating:
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_container->popupDirectionChange(KPanelApplet::Down);
}
@@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme()
{
TQImage bgImage = m_bgImage;
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
if (KickerSettings::rotateBackground())
{
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index d1bab6f3b..54e91b97d 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -116,7 +116,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
if (rect().contains(mapFromGlobal(me->globalPos())))
{
if (m_pressedDuringPopup && m_popup && m_openTimer != -1
- && (me->button() & Qt::LeftButton) )
+ && (me->button() & TQt::LeftButton) )
return true;
}
}
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index d00ef13d9..5bcf059c9 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const
void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
{
- Qt::ArrowType a = Qt::UpArrow;
+ TQt::ArrowType a = TQt::UpArrow;
if (d == m_popupDirection || !m_menuButton)
{
@@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
{
case KPanelApplet::Up:
m_layout->setDirection(TQBoxLayout::BottomToTop);
- a = Qt::UpArrow;
+ a = TQt::UpArrow;
break;
case KPanelApplet::Down:
m_layout->setDirection(TQBoxLayout::TopToBottom);
- a = Qt::DownArrow;
+ a = TQt::DownArrow;
break;
case KPanelApplet::Left:
m_layout->setDirection(TQBoxLayout::RightToLeft);
- a = Qt::LeftArrow;
+ a = TQt::LeftArrow;
break;
case KPanelApplet::Right:
m_layout->setDirection(TQBoxLayout::LeftToRight);
- a = Qt::RightArrow;
+ a = TQt::RightArrow;
break;
}
@@ -225,7 +225,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
if (e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
- if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton)
+ if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton)
{
emit moveApplet(m_applet->mapFromGlobal(ev->globalPos()));
}
@@ -235,7 +235,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
if (m_menuButton && e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
- if (ev->button() == Qt::RightButton)
+ if (ev->button() == TQt::RightButton)
{
if (!m_menuButton->isDown())
{
@@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
{
int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
return TQSize(wh, 0);
}
@@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
TQSizePolicy AppletHandleDrag::sizePolicy() const
{
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
}
@@ -360,7 +360,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
TQStyle::SFlags flags = TQStyle::Style_Default;
flags |= TQStyle::Style_Enabled;
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
flags |= TQStyle::Style_Horizontal;
}
@@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const
int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
int width = height;
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
return TQSize(width, height);
}
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index d710a1ade..81f2139c5 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
_appletframe->setFrameStyle(TQFrame::NoFrame);
_appletframe->installEventFilter(this);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
_layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
}
@@ -191,7 +191,7 @@ void AppletContainer::resetLayout()
{
_handle->resetLayout();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
_layout->setDirection( TQBoxLayout::LeftToRight );
}
@@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config,
bool layoutOnly ) const
{
// immutability is checked by ContainerBase
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
config.writeEntry( "WidthForHeightHint", widthForHeight(height()) );
}
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index e3131b2ed..8a7cd6d3c 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name )
: TQWidget( parent, name )
, _dir(KPanelApplet::Up)
- , _orient(Qt::Horizontal)
+ , _orient(TQt::Horizontal)
, _alignment(KPanelExtension::LeftTop)
, _fspace(0)
, _moveOffset(TQPoint(0,0))
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index ac4c46733..529deb8b0 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -238,7 +238,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
switch (me->button())
{
- case Qt::MidButton:
+ case TQt::MidButton:
{
if (isImmutable())
{
@@ -252,7 +252,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
return true;
}
- case Qt::RightButton:
+ case TQt::RightButton:
{
if (!kapp->authorizeTDEAction("kicker_rmb") ||
isImmutable())
@@ -263,7 +263,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
TQPopupMenu* menu = opMenu();
connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
- (orientation() == Qt::Horizontal) ?
+ (orientation() == TQt::Horizontal) ?
TQPoint(0, 0) : me->pos());
Kicker::the()->setInsertionPoint(me->globalPos());
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 623deb786..4378e5a48 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons()
_layout->setEnabled(false);
}
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
int maxWidth = width();
@@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons()
_ltHB->setMaximumWidth(maxWidth);
_ltHB->setMaximumHeight(14);
_layout->remove(_ltHB);
- _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
+ _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft);
}
if (_rbHB)
@@ -1252,8 +1252,8 @@ int ExtensionContainer::arrangeHideButtons()
maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
}
- int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0;
- int leftAlignment = Qt::AlignRight;
+ int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0;
+ int leftAlignment = TQt::AlignRight;
if (_ltHB)
{
@@ -1262,11 +1262,11 @@ int ExtensionContainer::arrangeHideButtons()
_layout->remove(_ltHB);
if (kapp->reverseLayout())
{
- _layout->addWidget(_ltHB, 1, 2, (Qt::AlignmentFlags)vertAlignment);
+ _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
}
else
{
- _layout->addWidget(_ltHB, 1, 0, (Qt::AlignmentFlags)(leftAlignment | vertAlignment));
+ _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
}
}
@@ -1277,11 +1277,11 @@ int ExtensionContainer::arrangeHideButtons()
_layout->remove(_rbHB);
if (kapp->reverseLayout())
{
- _layout->addWidget(_rbHB, 1, 0, (Qt::AlignmentFlags)(leftAlignment | vertAlignment));
+ _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
}
else
{
- _layout->addWidget(_rbHB, 1, 2, (Qt::AlignmentFlags)vertAlignment);
+ _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
}
}
}
@@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace()
TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
TQRect h = geometry();
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
if (h.top() > 0)
{
@@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const
{
if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom)
{
- return Qt::Horizontal;
+ return TQt::Horizontal;
}
else
{
- return Qt::Vertical;
+ return TQt::Vertical;
}
}
@@ -1631,14 +1631,14 @@ void ExtensionContainer::resetLayout()
haveToArrangeButtons = true;
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
- _ltHB->setArrowType(Qt::LeftArrow);
+ _ltHB->setArrowType(TQt::LeftArrow);
_ltHB->setFixedSize(m_settings.hideButtonSize(), height());
}
else
{
- _ltHB->setArrowType(Qt::UpArrow);
+ _ltHB->setArrowType(TQt::UpArrow);
_ltHB->setFixedSize(width(), m_settings.hideButtonSize());
}
@@ -1662,14 +1662,14 @@ void ExtensionContainer::resetLayout()
haveToArrangeButtons = true;
}
- if ( orientation() == Qt::Horizontal)
+ if ( orientation() == TQt::Horizontal)
{
- _rbHB->setArrowType(Qt::RightArrow);
+ _rbHB->setArrowType(TQt::RightArrow);
_rbHB->setFixedSize(m_settings.hideButtonSize(), height());
}
else
{
- _rbHB->setArrowType(Qt::DownArrow);
+ _rbHB->setArrowType(TQt::DownArrow);
_rbHB->setFixedSize(width(), m_settings.hideButtonSize());
}
@@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout()
updateGeometry();
int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (m_extension)
{
@@ -2146,7 +2146,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
case TQEvent::MouseButtonPress:
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if ( me->button() == Qt::LeftButton )
+ if ( me->button() == TQt::LeftButton )
{
if (inResizeArea(me->pos()))
{
@@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
_is_lmb_down = true;
}
}
- else if (me->button() == Qt::RightButton)
+ else if (me->button() == TQt::RightButton)
{
showPanelMenu(me->globalPos());
return true; // don't crash!
@@ -2181,7 +2181,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
case TQEvent::MouseButtonRelease:
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if ( me->button() == Qt::LeftButton )
+ if ( me->button() == TQt::LeftButton )
{
_is_lmb_down = false;
}
@@ -2241,7 +2241,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
}
if (_is_lmb_down &&
- ((me->state() & Qt::LeftButton) == Qt::LeftButton) &&
+ ((me->state() & TQt::LeftButton) == TQt::LeftButton) &&
!Kicker::the()->isImmutable() &&
!m_settings.config()->isImmutable() &&
!ExtensionManager::the()->isMenuBar(this))
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 89878a50d..589b512e1 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig()
containers.append(new KMenuButtonContainer(m_opMenu, m_contents));
int dsize;
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
dsize = width();
}
@@ -850,7 +850,7 @@ void ContainerArea::resizeContents()
int w = width();
int h = height();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int newWidth = m_layout->widthForHeight(h);
if (newWidth > w)
@@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
return;
}
- if (ev->state() == Qt::LeftButton && !rect().contains(ev->pos()))
+ if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos()))
{
// leaveEvent() doesn't work, while grabbing the mouse
_autoScrollTimer.stop();
@@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
return;
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int oldX = _moveAC->x() + _moveAC->moveOffset().x();
int x = ev->pos().x() + contentsX();
@@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
preferedHeight = draggedContainer->heightForWidth(width());
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
_dragIndicator->setPreferredSize(TQSize(preferedWidth, height()));
}
@@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
--it;
BaseContainer* a = *it;
- if ((orientation() == Qt::Horizontal &&
+ if ((orientation() == TQt::Horizontal &&
a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) ||
- (orientation() == Qt::Vertical &&
+ (orientation() == TQt::Vertical &&
a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y()))
{
_dragMoveAC = a;
@@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
} while (it != m_containers.begin());
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
}
@@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
startContainerMove(_moveAC);
// Align the container to the mouse position.
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x());
}
@@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
return;
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
}
@@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
if (parent)
{
// Move container a
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int oldX = a->x();
int x = _dragIndicator->x();
m_layout->moveContainerSwitch(a, x - oldX);
}
- else if (orientation() == Qt::Vertical)
+ else if (orientation() == TQt::Vertical)
{
int oldY = a->y();
int y = _dragIndicator->y();
@@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev)
void ContainerArea::viewportResizeEvent(TQResizeEvent* ev)
{
Panner::viewportResizeEvent(ev);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_contents->resize(kMax(widthForHeight(ev->size().height()),
ev->size().width()),
@@ -1487,7 +1487,7 @@ void ContainerArea::setBackground()
{
TQImage bgImage = srcImage;
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
if (KickerSettings::rotateBackground())
{
@@ -1565,7 +1565,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
}
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (a)
{
@@ -1599,7 +1599,7 @@ void ContainerArea::moveDragIndicator(int pos)
// Move _dragIndicator to position pos, restricted by availableSpace.
// Resize _dragIndicator if necessary.
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (availableSpace.size().width() <
_dragIndicator->preferredSize().width())
@@ -1680,9 +1680,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
}
_pos = p;
- Qt::Orientation o = (p == KPanelExtension::Top ||
+ TQt::Orientation o = (p == KPanelExtension::Top ||
p == KPanelExtension::Bottom) ?
- Qt::Horizontal : Qt::Vertical;
+ TQt::Horizontal : TQt::Vertical;
bool orientationChanged = (orientation() != o);
m_layout->setEnabled(false);
@@ -1696,7 +1696,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
// when that gets called AFTER we've been moved
// it's not always safe to do the resize here, as scroll buttons
// from the panner may get in our way. =/
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
resizeContents(0, height());
}
@@ -1742,7 +1742,7 @@ void ContainerArea::autoScroll()
{
if(!_moveAC) return;
- if(orientation() == Qt::Horizontal) {
+ if(orientation() == TQt::Horizontal) {
if(_moveAC->pos().x() <= 80)
scrollBy(-10, 0);
else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80)
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index 11d834630..9ee3b8835 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio)
m_freeSpaceRatio = ratio;
}
-Qt::Orientation ContainerAreaLayoutItem::orientation() const
+TQt::Orientation ContainerAreaLayoutItem::orientation() const
{
return m_layout->orientation();
}
@@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r)
int ContainerAreaLayoutItem::widthForHeightR(int h) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return widthForHeight(h);
}
@@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const
int ContainerAreaLayoutItem::widthR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().width();
}
@@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const
int ContainerAreaLayoutItem::heightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().height();
}
@@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const
int ContainerAreaLayoutItem::leftR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (TQApplication::reverseLayout())
return m_layout->geometry().right() - geometry().right();
@@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const
int ContainerAreaLayoutItem::rightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (TQApplication::reverseLayout())
return m_layout->geometry().right() - geometry().left();
@@ -206,7 +206,7 @@ int ContainerAreaLayoutItem::rightR() const
ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
: TQLayout(parent),
- m_orientation(Qt::Horizontal),
+ m_orientation(TQt::Horizontal),
m_stretchEnabled(true)
{
}
@@ -251,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio
return;
}
- int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
+ int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
Item* current = *currentIt;
Item* next = *nextIt;
@@ -387,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const
{
const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return TQSize(widthForHeight(size), size);
}
@@ -401,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const
{
const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return TQSize(widthForHeight(size), size);
}
@@ -521,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con
void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
{
- const bool horizontal = orientation() == Qt::Horizontal;
+ const bool horizontal = orientation() == TQt::Horizontal;
const bool reverseLayout = TQApplication::reverseLayout();
if (horizontal && reverseLayout)
@@ -658,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance)
{
- const bool horizontal = orientation() == Qt::Horizontal;
+ const bool horizontal = orientation() == TQt::Horizontal;
const bool reverseLayout = TQApplication::reverseLayout();
// Get the iterator 'it' pointing to the layoutitem representing 'a'.
@@ -729,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it,
TQRect ContainerAreaLayout::transform(const TQRect& r) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (TQApplication::reverseLayout())
{
@@ -750,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const
int ContainerAreaLayout::widthForHeightR(int h) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return widthForHeight(h);
}
@@ -762,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const
int ContainerAreaLayout::widthR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().width();
}
@@ -774,7 +774,7 @@ int ContainerAreaLayout::widthR() const
int ContainerAreaLayout::heightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().height();
}
@@ -786,7 +786,7 @@ int ContainerAreaLayout::heightR() const
int ContainerAreaLayout::leftR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
return geometry().left();
else
return geometry().top();
@@ -794,7 +794,7 @@ int ContainerAreaLayout::leftR() const
int ContainerAreaLayout::rightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
return geometry().right();
else
return geometry().bottom();
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index 46cfa432d..b8d774fdb 100644
--- a/kicker/kicker/core/kickerbindings.cpp
+++ b/kicker/kicker/core/kickerbindings.cpp
@@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef LAUNCH_MENU
keys->insert("Program:kicker", i18n("Panel"));
- DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu,
+ DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu,
MenuManager::the(), kmenuAccelActivated());
#endif
#ifdef SHOW_DESKTOP
- DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D,
+ DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D,
this, slotToggleShowDesktop());
#endif
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 93bd2356b..9e8d7130a 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
if ( e->type() == TQEvent::MouseButtonPress )
{
TQMouseEvent* me = (TQMouseEvent*) e;
- if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb"))
+ if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb"))
{
Kicker::the()->setInsertionPoint(me->globalPos());
opMenu()->exec(me->globalPos());
diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp
index d48c43aad..04a2a4afd 100644
--- a/kicker/kicker/core/userrectsel.cpp
+++ b/kicker/kicker/core/userrectsel.cpp
@@ -46,7 +46,7 @@ UserRectSel::~UserRectSel()
void UserRectSel::mouseReleaseEvent(TQMouseEvent * e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
tqApp->exit_loop();
}
@@ -89,7 +89,7 @@ void UserRectSel::paintCurrent()
for (i = 0; i < 4; i++)
{
_frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
- _frame[i]->setPaletteBackgroundColor(Qt::black);
+ _frame[i]->setPaletteBackgroundColor(TQt::black);
}
for (i = 4; i < 8; i++)
{
diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp
index 107a2527a..de18e7fe4 100644
--- a/kicker/kicker/core/usersizesel.cpp
+++ b/kicker/kicker/core/usersizesel.cpp
@@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel()
void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
tqApp->exit_loop();
}
@@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent()
for (i = 0; i < 4; i++)
{
_frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
- _frame[i]->setPaletteBackgroundColor(Qt::black);
+ _frame[i]->setPaletteBackgroundColor(TQt::black);
}
for (i = 4; i < 8; i++)
{
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index cf63bd697..205f5a43d 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -85,7 +85,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
if (e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if (me->button() & Qt::LeftButton)
+ if (me->button() & TQt::LeftButton)
{
m_dragStart = me->pos();
}
@@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
void AppletWidget::keyPressEvent(TQKeyEvent *e)
{
- if (e->key() == Qt::Key_Enter ||
- e->key() == Qt::Key_Return)
+ if (e->key() == TQt::Key_Enter ||
+ e->key() == TQt::Key_Return)
{
emit doubleClicked(this);
}
- else if (e->key() == Qt::Key_Up)
+ else if (e->key() == TQt::Key_Up)
{
TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0);
TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0);
TQApplication::sendEvent(this, &fakedKeyPress);
TQApplication::sendEvent(this, &fakedKeyRelease);
}
- else if (e->key() == Qt::Key_Down)
+ else if (e->key() == TQt::Key_Down)
{
- TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0);
+ TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0);
TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
TQApplication::sendEvent(this, &fakedKeyPress);
TQApplication::sendEvent(this, &fakedKeyRelease);
@@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e)
void AppletWidget::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
emit clicked(this);
m_dragStart = e->pos();
@@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e)
void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton &&
+ if (e->button() == TQt::LeftButton &&
!m_dragStart.isNull() &&
(e->pos() - m_dragStart).manhattanLength() >
TDEGlobalSettings::dndEventDelay())
@@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e)
void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e)
{
- if (!e->button() == Qt::LeftButton)
+ if (!e->button() == TQt::LeftButton)
{
AppletItem::mouseDoubleClickEvent(e);
return;
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 77bccbb0a..1226c9b37 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask()
{
TQPainter maskPainter(&m_mask);
- m_mask.fill(Qt::black);
+ m_mask.fill(TQt::black);
- maskPainter.setBrush(Qt::white);
- maskPainter.setPen(Qt::white);
+ maskPainter.setBrush(TQt::white);
+ maskPainter.setPen(TQt::white);
maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
1600 / m_mask.rect().height());
setMask(m_mask);
@@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal()
// draw background
TQPainter bufferPainter(&m_pixmap);
- bufferPainter.setPen(Qt::black);
+ bufferPainter.setPen(TQt::black);
bufferPainter.setBrush(colorGroup().background());
bufferPainter.drawRoundRect(0, 0, width, height,
1600 / width, 1600 / height);
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index a037909b6..f1aa98023 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e)
{
- if (e->key() == Qt::Key_Escape)
+ if (e->key() == TQt::Key_Escape)
{
emit escapePressed();
}
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index c5b76569c..2082c4bb5 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
{
TQPopupMenu::mouseMoveEvent(e);
- if (!(e->state() & Qt::LeftButton)) return;
+ if (!(e->state() & TQt::LeftButton)) return;
if(_lastpress == TQPoint(-1, -1)) return;
// DND delay
@@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev )
void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
{
- TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton);
+ TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton);
TQPopupMenu::mouseMoveEvent(&mev);
}
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 031aed93e..795535976 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -34,7 +34,7 @@
HideButton::HideButton(TQWidget *parent, const char *name)
: TQButton(parent, name),
m_highlight(false),
- m_arrow(Qt::LeftArrow)
+ m_arrow(TQt::LeftArrow)
{
setBackgroundOrigin(AncestorOrigin);
@@ -49,22 +49,22 @@ HideButton::HideButton(TQWidget *parent, const char *name)
void HideButton::drawButton(TQPainter *p)
{
- if (m_arrow == Qt::LeftArrow)
+ if (m_arrow == TQt::LeftArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(width()-1, 0, width()-1, height());
}
- else if (m_arrow == Qt::RightArrow)
+ else if (m_arrow == TQt::RightArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(0, 0, 0, height());
}
- else if (m_arrow == Qt::UpArrow)
+ else if (m_arrow == TQt::UpArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(0, height()-1, width(), height()-1);
}
- else if (m_arrow == Qt::DownArrow)
+ else if (m_arrow == TQt::DownArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(0, 0, width(), 0);
@@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix)
generateIcons();
}
-void HideButton::setArrowType(Qt::ArrowType arrow)
+void HideButton::setArrowType(TQt::ArrowType arrow)
{
m_arrow = arrow;
switch (arrow)
{
- case Qt::LeftArrow:
+ case TQt::LeftArrow:
setPixmap(SmallIcon("1leftarrow"));
break;
- case Qt::RightArrow:
+ case TQt::RightArrow:
setPixmap(SmallIcon("1rightarrow"));
break;
- case Qt::UpArrow:
+ case TQt::UpArrow:
setPixmap(SmallIcon("1uparrow"));
break;
- case Qt::DownArrow:
+ case TQt::DownArrow:
default:
setPixmap(SmallIcon("1downarrow"));
break;
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index 9a36d0df3..c8c754857 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -29,7 +29,7 @@ class HideButton : public TQButton
public:
HideButton(TQWidget *parent, const char *name = 0);
- void setArrowType(Qt::ArrowType arrow);
+ void setArrowType(TQt::ArrowType arrow);
void setPixmap(const TQPixmap &pix);
protected:
@@ -44,7 +44,7 @@ class HideButton : public TQButton
bool m_highlight;
TQPixmap m_normalIcon;
TQPixmap m_activeIcon;
- Qt::ArrowType m_arrow;
+ TQt::ArrowType m_arrow;
protected slots:
void slotSettingsChanged( int category );
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 58be287bb..64576a71f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
if (m_mouseMoveSelects) {
if(i && i->isEnabled() && !i->isSelected() &&
// FIXME: This is wrong if you drag over the items.
- (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+ (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
TDEListView::setSelected(i, true);
else if (!i && selectedItem())
TDEListView::setSelected(selectedItem(), false);
}
if ( link_cursor )
- setCursor( Qt::PointingHandCursor );
+ setCursor( TQt::PointingHandCursor );
else
unsetCursor();
@@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
if(i && i->isEnabled() && !i->isSelected() &&
// FIXME: This is wrong if you drag over the items.
- (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+ (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
TDEListView::setSelected(i, true);
else if (!i && selectedItem())
TDEListView::setSelected(selectedItem(), false);
@@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject()
mask = *pix.mask();
else {
mask.resize(pix.size());
- mask.fill(Qt::color1);
+ mask.fill(TQt::color1);
}
bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP );
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index ca2fc065e..aa3aa6b60 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -743,8 +743,8 @@ void KMenu::paintSearchTab( bool active )
m_tabBar->deactivateTabs(true);
- p.setBrush( Qt::white );
- p.setPen( Qt::NoPen );
+ p.setBrush( TQt::white );
+ p.setPen( TQt::NoPen );
if ( m_orientation == BottomUp ) {
search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height()));
@@ -2001,7 +2001,7 @@ void KMenu::createNewProgramList()
m_seenPrograms = KickerSettings::firstSeenApps();
m_newInstalledPrograms.clear();
- m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
+ m_currentDate = TQDate::currentDate().toString(TQt::ISODate);
bool initialize = (m_seenPrograms.count() == 0);
@@ -2063,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath)
else {
++it_find;
if (*(it_find)!="-") {
- TQDate date = TQDate::fromString(*(it_find),Qt::ISODate);
+ TQDate date = TQDate::fromString(*(it_find),TQt::ISODate);
if (date.daysTo(TQDate::currentDate())<3) {
if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
m_newInstalledPrograms+=s->storageId();
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index c13bffe14..266de18fb 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event)
void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
{
- if ( e->button() != Qt::LeftButton ) {
+ if ( e->button() != TQt::LeftButton ) {
e->ignore();
return;
}
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 57b027a34..10510ca6f 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev)
void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
{
- if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable())
+ if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable())
{
int id = idAt( ev->pos() );
@@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
if (Kicker::the()->isKioskImmutable())
return;
- if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton )
+ if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton )
return;
TQPoint p = ev->pos() - startPos_;
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 8c45d519d..224cf427a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p)
{
switch (p)
{
- case Qt::DownArrow:
+ case TQt::DownArrow:
return KPanelApplet::Down;
break;
- case Qt::LeftArrow:
+ case TQt::LeftArrow:
return KPanelApplet::Left;
break;
- case Qt::RightArrow:
+ case TQt::RightArrow:
return KPanelApplet::Right;
break;
- case Qt::UpArrow:
+ case TQt::UpArrow:
default:
return KPanelApplet::Up;
break;
@@ -464,7 +464,7 @@ TQIconSet menuIconSet(const TQString& icon)
void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha)
{
static TQPixmap pix;
- static TQColor last_color = Qt::black;
+ static TQColor last_color = TQt::black;
static int last_alpha = 0;
if (pix.isNull() || last_color != color || last_alpha != alpha)
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 663987174..61ba2f0ea 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -57,7 +57,7 @@ KDE_EXPORT void colorize(TQImage& image);
/**
* Blend a color rectangle on a painter
*/
-KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40);
+KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
/**
* Blend two colours together to get a colour halfway in between
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 99c81ce6d..b3716a871 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -283,10 +283,10 @@ void KickerTip::plainMask()
{
TQPainter maskPainter(&m_mask);
- m_mask.fill(Qt::color0);
+ m_mask.fill(TQt::color0);
- maskPainter.setBrush(Qt::color1);
- maskPainter.setPen(Qt::NoPen);
+ maskPainter.setBrush(TQt::color1);
+ maskPainter.setPen(TQt::NoPen);
//maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
drawRoundRect(maskPainter, m_mask.rect());
setMask(m_mask);
@@ -297,10 +297,10 @@ void KickerTip::dissolveMask()
{
TQPainter maskPainter(&m_mask);
- m_mask.fill(Qt::color0);
+ m_mask.fill(TQt::color0);
- maskPainter.setBrush(Qt::color1);
- maskPainter.setPen(Qt::NoPen);
+ maskPainter.setBrush(TQt::color1);
+ maskPainter.setPen(TQt::NoPen);
//maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
drawRoundRect(maskPainter, m_mask.rect());
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index a933026d5..76f1b9d87 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -236,7 +236,7 @@ void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const T
// draw text
pixPainter.begin(&textPixmap);
- pixPainter.setPen(Qt::white);
+ pixPainter.setPen(TQt::white);
pixPainter.setFont(p.font()); // get the font from the root painter
pixPainter.drawText(tr, tf, str);
pixPainter.end();
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index b7b7ba457..b8091e020 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
m_arrowDirection(KPanelExtension::Bottom),
m_popupDirection(KPanelApplet::Up),
m_iconAlignment(AlignCenter),
- m_orientation(Qt::Horizontal),
+ m_orientation(TQt::Horizontal),
m_size((TDEIcon::StdSizes)-1),
m_fontPercent(0.40),
m_forceStandardCursor(forceStandardCursor)
@@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d)
setArrowDirection(KickerLib::directionToPopupPosition(d));
}
-void PanelButton::setIconAlignment(Qt::AlignmentFlags align)
+void PanelButton::setIconAlignment(TQt::AlignmentFlags align)
{
m_iconAlignment = align;
update();
@@ -305,7 +305,7 @@ int PanelButton::widthForHeight(int height) const
// we only paint the text when horizontal, so make sure we're horizontal
// before adding the text in here
- if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty())
+ if (orientation() == TQt::Horizontal && !m_buttonText.isEmpty())
{
TQFont f(font());
//f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16)));
@@ -483,7 +483,7 @@ void PanelButton::dropEvent(TQDropEvent* e)
void PanelButton::mouseMoveEvent(TQMouseEvent *e)
{
- if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0)
+ if (!m_isLeftMouseButtonDown || (e->state() & TQt::LeftButton) == 0)
{
return;
}
@@ -501,7 +501,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e)
void PanelButton::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_lastLeftMouseButtonPress = e->pos();
m_isLeftMouseButtonDown = true;
@@ -511,7 +511,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e)
void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_isLeftMouseButtonDown = false;
@@ -645,7 +645,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
else if (m_iconAlignment & AlignBottom)
y = (height() - icon.height());
- if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal)
+ if (!m_buttonText.isEmpty() && orientation() == TQt::Horizontal)
{
int h = height();
int w = width();
@@ -749,7 +749,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
break;
case KPanelExtension::Floating:
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
e = TQStyle::PE_ArrowDown;
r.moveBy(0, height() - arrowSize);
@@ -795,7 +795,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
if (proposed_size < 0)
{
- proposed_size = (orientation() == Qt::Horizontal) ? height() : width();
+ proposed_size = (orientation() == TQt::Horizontal) ? height() : width();
}
// determine the upper limit on the size. Normally, this is panelSize,
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 5df1c62b6..cea132680 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -263,7 +263,7 @@ public slots:
protected:
- void setIconAlignment(Qt::AlignmentFlags align);
+ void setIconAlignment(TQt::AlignmentFlags align);
/**
* Subclasses must implement this to define the name of the button which is
* used to identify this button for saving and loading. It must be unique
@@ -406,7 +406,7 @@ private:
TQPixmap m_iconz; // mouse over
KPanelExtension::Position m_arrowDirection;
KPanelApplet::Direction m_popupDirection;
- Qt::AlignmentFlags m_iconAlignment;
+ TQt::AlignmentFlags m_iconAlignment;
Orientation m_orientation;
int m_size;
double m_fontPercent;
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index 580d0e088..a868747fb 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name )
// layout
_layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
_layout->addWidget(_clipper, 1);
- setOrientation(Qt::Horizontal);
+ setOrientation(TQt::Horizontal);
}
Panner::~Panner()
@@ -97,12 +97,12 @@ void Panner::createScrollButtons()
void Panner::setupButtons()
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (_luSB)
{
- _luSB->setArrowType(Qt::LeftArrow);
- _rdSB->setArrowType(Qt::RightArrow);
+ _luSB->setArrowType(TQt::LeftArrow);
+ _rdSB->setArrowType(TQt::RightArrow);
_luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
_rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
TQToolTip::add(_luSB, i18n("Scroll left"));
@@ -115,8 +115,8 @@ void Panner::setupButtons()
{
if (_luSB)
{
- _luSB->setArrowType(Qt::UpArrow);
- _rdSB->setArrowType(Qt::DownArrow);
+ _luSB->setArrowType(TQt::UpArrow);
+ _rdSB->setArrowType(TQt::DownArrow);
_luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
_rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
TQToolTip::add(_luSB, i18n("Scroll up"));
@@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* )
void Panner::scrollRightDown()
{
- if(orientation() == Qt::Horizontal) // scroll right
+ if(orientation() == TQt::Horizontal) // scroll right
scrollBy( _step, 0 );
else // scroll down
scrollBy( 0, _step );
@@ -159,7 +159,7 @@ void Panner::scrollRightDown()
void Panner::scrollLeftUp()
{
- if(orientation() == Qt::Horizontal) // scroll left
+ if(orientation() == TQt::Horizontal) // scroll left
scrollBy( -_step, 0 );
else // scroll up
scrollBy( 0, -_step );
@@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons()
_updateScrollButtonsTimer->stop();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
delta = contentsWidth() - width();
}
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index efdb6bde5..36305bb0c 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -41,8 +41,8 @@ public:
TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
- Qt::Orientation orientation() const { return _orient; }
- virtual void setOrientation(Qt::Orientation orientation);
+ TQt::Orientation orientation() const { return _orient; }
+ virtual void setOrientation(TQt::Orientation orientation);
TQWidget *viewport() const { return _viewport; }
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 12d5085d4..8d438d7ce 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -42,7 +42,7 @@
SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor)
: TQButton(parent, name),
m_highlight(false),
- m_orientation(Qt::Horizontal),
+ m_orientation(TQt::Horizontal),
m_forceStandardCursor(forceStandardCursor)
{
setBackgroundOrigin( AncestorOrigin );
@@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix)
update();
}
-void SimpleButton::setOrientation(Qt::Orientation orientation)
+void SimpleButton::setOrientation(TQt::Orientation orientation)
{
m_orientation = orientation;
update();
@@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
}
-SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor)
: SimpleButton(parent, name, forceStandardCursor),
m_forceStandardCursor(forceStandardCursor)
{
@@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const
return TQSize( 12, 12 );
}
-void SimpleArrowButton::setArrowType(Qt::ArrowType a)
+void SimpleArrowButton::setArrowType(TQt::ArrowType a)
{
if (_arrow != a)
{
@@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a)
}
}
-Qt::ArrowType SimpleArrowButton::arrowType() const
+TQt::ArrowType SimpleArrowButton::arrowType() const
{
return _arrow;
}
@@ -255,10 +255,10 @@ void SimpleArrowButton::drawButton( TQPainter *p )
TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft;
switch (_arrow)
{
- case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
- case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
- case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
- case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
+ case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
+ case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
+ case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
+ case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
}
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index b34bd4efd..7f1718273 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -33,7 +33,7 @@ class KDE_EXPORT SimpleButton : public TQButton
public:
SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
void setPixmap(const TQPixmap &pix);
- void setOrientation(Qt::Orientation orientaton);
+ void setOrientation(TQt::Orientation orientaton);
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
@@ -55,7 +55,7 @@ class KDE_EXPORT SimpleButton : public TQButton
TQPixmap m_normalIcon;
TQPixmap m_activeIcon;
TQPixmap m_disabledIcon;
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
bool m_forceStandardCursor;
class SimpleButtonPrivate;
SimpleButtonPrivate* d;
@@ -66,7 +66,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
TQ_OBJECT
public:
- SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
+ SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
virtual ~SimpleArrowButton() {};
TQSize sizeHint() const;
@@ -74,13 +74,13 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
virtual void enterEvent( TQEvent *e );
virtual void leaveEvent( TQEvent *e );
virtual void drawButton(TQPainter *p);
- Qt::ArrowType arrowType() const;
+ TQt::ArrowType arrowType() const;
public slots:
- void setArrowType(Qt::ArrowType a);
+ void setArrowType(TQt::ArrowType a);
private:
- Qt::ArrowType _arrow;
+ TQt::ArrowType _arrow;
bool m_forceStandardCursor;
bool _inside;
};
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 3d9369fc6..2ab6afc2c 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
{
KPanelMenu::mouseMoveEvent(ev);
- if ((ev->state() & Qt::LeftButton) != Qt::LeftButton)
+ if ((ev->state() & TQt::LeftButton) != TQt::LeftButton)
{
return;
}
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index df6854efc..ae4137017 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -111,7 +111,7 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) {
void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
KPanelMenu::mouseMoveEvent(e);
- if (!(e->state() & Qt::LeftButton))
+ if (!(e->state() & TQt::LeftButton))
return;
if (!rect().contains(_mouseDown))
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 0fa85a1e3..28fbdf000 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
l1->setPixmap(foo);
runLayout->addWidget(l1);*/
/*TQLabel* l2 = new TQLabel(i18n("&Run: "), this);
- l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+ l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
l2->setBuddy(this);
runLayout->addWidget(l2);*/
m_runEdit = new KHistoryCombo(this);
@@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQSettings settings;
if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled")
{
- setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+ setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
}
else
{
- /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/
+ /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/
//l1->setAutoMask(true);
- //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+ //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
}
setMinimumHeight(TDEIcon::SizeMedium + 2);
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index af4f0f909..9ca123a94 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -746,7 +746,7 @@ void TaskBar::reLayout()
int minButtonHeight = buttonHeight();
// horizontal layout
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int bwidth=buttonWidth();
int rows = contentsRect().height() / minButtonHeight;
@@ -1005,7 +1005,7 @@ int TaskBar::maximumButtonsWithoutShrinking() const
rows = 1;
}
- if ( orientation() == Qt::Horizontal ) {
+ if ( orientation() == TQt::Horizontal ) {
// maxWidth of 0 means no max width, drop back to default
int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
if (maxWidth == 0)
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index a891cf64e..f9ba06c32 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -207,7 +207,7 @@ void TaskBarContainer::preferences()
void TaskBarContainer::orientationChange(Orientation o)
{
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
if (windowListButton)
{
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index cf3dbc648..c8a3d3423 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -666,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p)
for (int i = 0; i < 2; ++i)
{
line = KickerLib::blendColors(line, colors.background());
- p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+ p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin));
r.addCoords(-1, -1, 1, 1);
p->drawRect(r);
}
@@ -894,10 +894,10 @@ void TaskContainer::drawButton(TQPainter *p)
switch (arrowType)
{
- case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break;
- case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break;
- case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break;
- case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break;
+ case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break;
+ case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break;
+ case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break;
+ case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break;
}
int flags = TQStyle::Style_Enabled;
@@ -1015,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
return;
}
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_dragStartPos = e->pos();
}
@@ -1030,13 +1030,13 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
// Other actions will be handled in mouseReleaseEvent
switch (e->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
break;
- case Qt::MidButton:
+ case TQt::MidButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
break;
- case Qt::RightButton:
+ case TQt::RightButton:
default:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
break;
@@ -1071,13 +1071,13 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
switch (e->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
break;
- case Qt::MidButton:
+ case TQt::MidButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
break;
- case Qt::RightButton:
+ case TQt::RightButton:
default:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
break;
@@ -1406,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
if ( TQApplication::widgetAt( p, true ) == this )
{
if (me->type() == TQEvent::MouseButtonPress &&
- me->button() == Qt::LeftButton)
+ me->button() == TQt::LeftButton)
{
m_dragStartPos = mapFromGlobal(p);
}
@@ -1427,7 +1427,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
TQPoint p(me->globalPos());
- if (me->state() & Qt::LeftButton &&
+ if (me->state() & TQt::LeftButton &&
TQApplication::widgetAt(p, true) == this)
{
kdDebug() << "event move" << endl;
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 1be54ca8b..3286c8576 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch()
void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_dragStartPos = e->pos();
}
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index 6e0e33352..16b0c24f2 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -27,9 +27,9 @@
keys->insert( "Program:klipper", i18n("Clipboard") );
- DEF( I18N_NOOP("Show Klipper Popup-Menu"), ALT+CTRL+Qt::Key_V, WIN+CTRL+Qt::Key_V, slotPopupMenu() );
- DEF( I18N_NOOP("Manually Invoke Action on Current Clipboard"), ALT+CTRL+Qt::Key_R, WIN+CTRL+Qt::Key_R, slotRepeatAction() );
- DEF( I18N_NOOP("Enable/Disable Clipboard Actions"), ALT+CTRL+Qt::Key_X, WIN+CTRL+Qt::Key_X, toggleURLGrabber() );
+ DEF( I18N_NOOP("Show Klipper Popup-Menu"), ALT+CTRL+TQt::Key_V, WIN+CTRL+TQt::Key_V, slotPopupMenu() );
+ DEF( I18N_NOOP("Manually Invoke Action on Current Clipboard"), ALT+CTRL+TQt::Key_R, WIN+CTRL+TQt::Key_R, slotRepeatAction() );
+ DEF( I18N_NOOP("Enable/Disable Clipboard Actions"), ALT+CTRL+TQt::Key_X, WIN+CTRL+TQt::Key_X, toggleURLGrabber() );
#undef DEF
#undef WIN
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 5b43fb8f5..9d3ab728d 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -45,16 +45,16 @@ namespace {
#ifdef DEBUG_EVENTS__
kdbgstream& operator<<( kdbgstream& stream, const TQKeyEvent& e ) {
stream << "(TQKeyEvent(text=" << e.text() << ",key=" << e.key() << ( e.isAccepted()?",accepted":",ignored)" ) << ",count=" << e.count();
- if ( e.state() & Qt::AltButton ) {
+ if ( e.state() & TQt::AltButton ) {
stream << ",ALT";
}
- if ( e.state() & Qt::ControlButton ) {
+ if ( e.state() & TQt::ControlButton ) {
stream << ",CTRL";
}
- if ( e.state() & Qt::MetaButton ) {
+ if ( e.state() & TQt::MetaButton ) {
stream << ",META";
}
- if ( e.state() & Qt::ShiftButton ) {
+ if ( e.state() & TQt::ShiftButton ) {
stream << ",SHIFT";
}
if ( e.isAutoRepeat() ) {
@@ -249,15 +249,15 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
// widget, except a few used for navigation:
// These go to the superobject.
switch( e->key() ) {
- case Qt::Key_Up:
- case Qt::Key_Down:
- case Qt::Key_Right:
- case Qt::Key_Left:
- case Qt::Key_Tab:
- case Qt::Key_Backtab:
- case Qt::Key_Escape:
- case Qt::Key_Return:
- case Qt::Key_Enter:
+ case TQt::Key_Up:
+ case TQt::Key_Down:
+ case TQt::Key_Right:
+ case TQt::Key_Left:
+ case TQt::Key_Tab:
+ case TQt::Key_Backtab:
+ case TQt::Key_Escape:
+ case TQt::Key_Return:
+ case TQt::Key_Enter:
{
#ifdef DEBUG_EVENTS__
kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e << endl;
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 1a713fe25..64b80654b 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -280,7 +280,7 @@ void KlipperWidget::clearClipboardHistory()
void KlipperWidget::mousePressEvent(TQMouseEvent *e)
{
- if ( e->button() != Qt::LeftButton && e->button() != Qt::RightButton )
+ if ( e->button() != TQt::LeftButton && e->button() != TQt::RightButton )
return;
// if we only hid the menu less than a third of a second ago,
@@ -786,8 +786,8 @@ bool KlipperWidget::blockFetchingNewData()
// contents, so in practice it's like the user has selected only the part which was
// selected when Klipper asked first.
ButtonState buttonstate = kapp->keyboardMouseState();
- if( ( buttonstate & ( ShiftButton | Qt::LeftButton )) == ShiftButton // #85198
- || ( buttonstate & Qt::LeftButton ) == Qt::LeftButton ) { // #80302
+ if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
+ || ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
m_pendingContentsCheck = true;
m_pendingCheckTimer.start( 100, true );
return true;
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 8a90cfcd0..05414213f 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -80,7 +80,7 @@ void KMenuEdit::setupActions()
void KMenuEdit::setupView()
{
- m_splitter = new TQSplitter(Qt::Horizontal, this);
+ m_splitter = new TQSplitter(TQt::Horizontal, this);
m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter);
m_basicTab = new BasicTab(m_splitter);
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 10e330fde..0e15d8d38 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -310,7 +310,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr
void TreeView::fill()
{
- TQApplication::setOverrideCursor(Qt::WaitCursor);
+ TQApplication::setOverrideCursor(TQt::WaitCursor);
clear();
fillBranch(m_rootFolder, 0);
TQApplication::restoreOverrideCursor();
diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp
index 17f62744d..47e3322b8 100644
--- a/konqueror/iconview/konq_iconview.cpp
+++ b/konqueror/iconview/konq_iconview.cpp
@@ -839,7 +839,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo
void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&)
{
- if ( _button == Qt::RightButton && !_item )
+ if ( _button == TQt::RightButton && !_item )
{
// Right click on viewport
KFileItem * item = m_dirLister->rootItem();
@@ -876,11 +876,11 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item,
void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& )
{
- if (_button == Qt::MidButton)
+ if (_button == TQt::MidButton)
{
mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L );
}
- else if (!_item && _button == Qt::LeftButton)
+ else if (!_item && _button == TQt::LeftButton)
{
if (m_pActivateDoubleClickTimer->isActive())
{
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index c533fa8c2..1fd5cf222 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -646,7 +646,7 @@ class KeyPressEater : public TQObject {
bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
if (pe->type() == TQEvent::KeyPress) {
TQKeyEvent *k = (TQKeyEvent *) pe;
- if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab)
+ if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab)
&& !(k->state() & ControlButton || k->state() & AltButton)
) {
if (m_allowedToTab) {
@@ -655,7 +655,7 @@ bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
}
return true;
} else {
- m_allowedToTab = (k->key() == Qt::Key_Escape || k->key() == Qt::Key_Enter);
+ m_allowedToTab = (k->key() == TQt::Key_Escape || k->key() == TQt::Key_Enter);
}
}
return false;
@@ -911,7 +911,7 @@ void KEBListViewItem::setOpen(bool open) {
void KEBListViewItem::greyStyle(TQColorGroup &cg) {
int h, s, v;
cg.background().hsv(&h, &s, &v);
- TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray);
+ TQColor color = (v > 180 && v < 220) ? (TQt::darkGray) : (TQt::gray);
cg.setColor(TQColorGroup::Text, color);
}
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index decd07e05..cc8161f4e 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -229,7 +229,7 @@ KEBApp::KEBApp(
m_bkinfo = new BookmarkInfoWidget(vsplitter);
- vsplitter->setOrientation(Qt::Vertical);
+ vsplitter->setOrientation(TQt::Vertical);
vsplitter->setSizes(TQValueList<int>() << h << 380
<< m_bkinfo->sizeHint().height() );
diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp
index c1cbe734b..354a4a590 100644
--- a/konqueror/konq_combo.cpp
+++ b/konqueror/konq_combo.cpp
@@ -95,7 +95,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
: KHistoryCombo( parent, name ),
m_returnPressed( false ),
m_permanent( false ),
- m_modifier( Qt::NoButton ),
+ m_modifier( TQt::NoButton ),
m_pageSecurity( KonqMainWindow::NotCrypted )
{
setInsertionPolicy( NoInsertion );
@@ -537,7 +537,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
{
m_dragStart = TQPoint(); // null QPoint
- if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
+ if ( e->button() == TQt::LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked
int x = e->pos().x();
int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
@@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
}
}
- if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
+ if ( e->button() == TQt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked
int x = e->pos().x();
int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
@@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
if ( m_dragStart.isNull() || currentText().isEmpty() )
return;
- if ( e->state() & Qt::LeftButton &&
+ if ( e->state() & TQt::LeftButton &&
(e->pos() - m_dragStart).manhattanLength() >
TDEGlobalSettings::dndEventDelay() )
{
@@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text )
applyPermanent();
m_returnPressed = true;
emit activated( text, m_modifier );
- m_modifier = Qt::NoButton;
+ m_modifier = TQt::NoButton;
}
void KonqCombo::setConfig( TDEConfig *kc )
@@ -731,7 +731,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
if ( !text().isEmpty() ) {
TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth );
painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight,
- Qt::AlignLeft | Qt::AlignTop, squeezedText );
+ TQt::AlignLeft | TQt::AlignTop, squeezedText );
//painter->setPen( TDEGlobalSettings::inactiveTextColor() );
squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth );
@@ -739,7 +739,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
font.setItalic( true );
painter->setFont( font );
painter->drawText( entryWidth - titleWidth, 0, titleWidth,
- itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText );
+ itemHeight, TQt::AlignLeft | TQt::AlignTop, squeezedText );
}
}
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index 63f33aff1..8efe3fe38 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -68,7 +68,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
setSizeGripEnabled( false );
m_led = new TQLabel( this );
- m_led->setAlignment( Qt::AlignCenter );
+ m_led->setAlignment( TQt::AlignCenter );
m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
addWidget( m_led, 0, false ); // led (active view indicator)
m_led->hide();
@@ -177,7 +177,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
{
emit clicked();
update();
- if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton)
+ if ( TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton)
splitFrameMenu();
return true;
}
@@ -530,9 +530,9 @@ void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix,
//write orientation
TQString o;
- if( orientation() == Qt::Horizontal )
+ if( orientation() == TQt::Horizontal )
o = TQString::fromLatin1("Horizontal");
- else if( orientation() == Qt::Vertical )
+ else if( orientation() == TQt::Vertical )
o = TQString::fromLatin1("Vertical");
config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o );
diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp
index 94f6eedc9..fd7a1c29d 100644
--- a/konqueror/konq_guiclients.cpp
+++ b/konqueror/konq_guiclients.cpp
@@ -244,7 +244,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
if ( toggle )
{
- KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
+ KonqView *childView = viewManager->splitWindow( horizontal ? TQt::Vertical : TQt::Horizontal,
TQString::fromLatin1( "Browser/View" ),
serviceName,
!horizontal /* vertical = make it first */);
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 2880fad8a..3fbc8ebbe 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -1903,7 +1903,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat
if( state & TQt::ControlButton ) // Ctrl Left/MMB
openFilteredURL( homeURL, req);
- else if( state & Qt::MidButton )
+ else if( state & TQt::MidButton )
{
if(KonqSettings::mmbOpensTab())
openFilteredURL( homeURL, req);
@@ -1920,7 +1920,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat
void KonqMainWindow::slotHome()
{
- slotHome(TDEAction::UnknownActivation, Qt::LeftButton);
+ slotHome(TDEAction::UnknownActivation, TQt::LeftButton);
}
void KonqMainWindow::slotGoSystem()
@@ -2642,14 +2642,14 @@ void KonqMainWindow::slotFileNewAboutToShow()
void KonqMainWindow::slotSplitViewHorizontal()
{
- KonqView * newView = m_pViewManager->splitView( Qt::Horizontal );
+ KonqView * newView = m_pViewManager->splitView( TQt::Horizontal );
if (newView == 0L) return;
newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
}
void KonqMainWindow::slotSplitViewVertical()
{
- KonqView * newView = m_pViewManager->splitView( Qt::Vertical );
+ KonqView * newView = m_pViewManager->splitView( TQt::Vertical );
if (newView == 0L) return;
newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
}
@@ -3133,7 +3133,7 @@ void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state)
void KonqMainWindow::slotUp()
{
- m_goState = Qt::LeftButton;
+ m_goState = TQt::LeftButton;
TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
}
@@ -3151,7 +3151,7 @@ void KonqMainWindow::slotUpDelayed()
const TQString& url = m_currentView->upURL().url();
if(m_goState & TQt::ControlButton)
openFilteredURL(url, req );
- else if(m_goState & Qt::MidButton)
+ else if(m_goState & TQt::MidButton)
{
if(KonqSettings::mmbOpensTab())
openFilteredURL( url, req);
@@ -3160,7 +3160,7 @@ void KonqMainWindow::slotUpDelayed()
}
else
openFilteredURL( url, false );
- m_goState = Qt::LeftButton;
+ m_goState = TQt::LeftButton;
}
void KonqMainWindow::slotUpActivated( int id )
@@ -3181,7 +3181,7 @@ void KonqMainWindow::slotGoMenuAboutToShow()
void KonqMainWindow::slotGoHistoryActivated( int steps )
{
- slotGoHistoryActivated( steps, Qt::LeftButton );
+ slotGoHistoryActivated( steps, TQt::LeftButton );
}
void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state )
@@ -3212,7 +3212,7 @@ void KonqMainWindow::slotGoHistoryDelayed()
if (newView && inFront)
m_pViewManager->showTab( newView );
}
- else if(m_goState & Qt::MidButton)
+ else if(m_goState & TQt::MidButton)
{
if(mmbOpensTab)
{
@@ -3230,7 +3230,7 @@ void KonqMainWindow::slotGoHistoryDelayed()
}
m_goBuffer = 0;
- m_goState = Qt::LeftButton;
+ m_goState = TQt::LeftButton;
}
@@ -3605,7 +3605,7 @@ void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::But
slotStop();
m_combo->clearTemporary();
focusLocationBar();
- if ( state & Qt::MidButton )
+ if ( state & TQt::MidButton )
m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) );
}
@@ -4143,7 +4143,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState
if( state & TQt::ControlButton ) // Ctrl Left/MMB
openFilteredURL( url, req);
- else if( state & Qt::MidButton )
+ else if( state & TQt::MidButton )
{
if(KonqSettings::mmbOpensTab())
openFilteredURL( url, req);
diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp
index b2f0ad47f..e24426c8d 100644
--- a/konqueror/konq_misc.cpp
+++ b/konqueror/konq_misc.cpp
@@ -225,8 +225,8 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text
, m_mw(mw)
{
setBackgroundMode( TQt::PaletteButton );
- setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
- Qt::AlignVCenter | TQt::ShowPrefix );
+ setAlignment( (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
+ TQt::AlignVCenter | TQt::ShowPrefix );
setAcceptDrops(true);
adjustSize();
validDrag = false;
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 5a7ea1244..0306df565 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -1302,7 +1302,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
else if ( e->type() == TQEvent::MouseButtonPress )
{
TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
- if ( ev->button() == Qt::RightButton )
+ if ( ev->button() == TQt::RightButton )
{
return true;
}
@@ -1310,7 +1310,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
else if ( e->type() == TQEvent::MouseButtonRelease )
{
TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
- if ( ev->button() == Qt::RightButton )
+ if ( ev->button() == TQt::RightButton )
{
emit backRightClick();
return true;
@@ -1319,7 +1319,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
else if ( e->type() == TQEvent::MouseMove )
{
TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
- if ( ev->state() == Qt::RightButton )
+ if ( ev->state() == TQt::RightButton )
{
obj->removeEventFilter( this );
TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 );
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 495d267e8..2bcd3e52c 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -90,7 +90,7 @@ KonqViewManager::~KonqViewManager()
clear();
}
-KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitView ( TQt::Orientation orientation,
const TQString &serviceType,
const TQString &serviceName,
bool newOneFirst, bool forceAutoEmbed )
@@ -200,7 +200,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
return newView;
}
-KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation,
const TQString &serviceType,
const TQString &serviceName,
bool newOneFirst )
@@ -1574,14 +1574,14 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
//load container config
TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) );
//kdDebug(1202) << "Orientation: " << ostr << endl;
- Qt::Orientation o;
+ TQt::Orientation o;
if( ostr == "Vertical" )
- o = Qt::Vertical;
+ o = TQt::Vertical;
else if( ostr == "Horizontal" )
- o = Qt::Horizontal;
+ o = TQt::Horizontal;
else {
kdWarning() << "Profile Loading Error: No orientation specified in " << name << endl;
- o = Qt::Horizontal;
+ o = TQt::Horizontal;
}
TQValueList<int> sizes =
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 2c0887b3b..829decc86 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -68,7 +68,7 @@ public:
*
* @param newOneFirst if true, move the new view as the first one (left or top)
*/
- KonqView* splitView( Qt::Orientation orientation,
+ KonqView* splitView( TQt::Orientation orientation,
const TQString & serviceType = TQString::null,
const TQString & serviceName = TQString::null,
bool newOneFirst = false, bool forceAutoEmbed = false );
@@ -80,7 +80,7 @@ public:
*
* @param newOneFirst if true, move the new view as the first one (left or top)
*/
- KonqView* splitWindow( Qt::Orientation orientation,
+ KonqView* splitWindow( TQt::Orientation orientation,
const TQString & serviceType = TQString::null,
const TQString & serviceName = TQString::null,
bool newOneFirst = false);
diff --git a/konqueror/listview/konq_listviewitems.cpp b/konqueror/listview/konq_listviewitems.cpp
index 94c090189..3910095f9 100644
--- a/konqueror/listview/konq_listviewitems.cpp
+++ b/konqueror/listview/konq_listviewitems.cpp
@@ -161,7 +161,7 @@ void KonqListViewItem::updateContents()
const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
if ( tmpColumn->type == TQVariant::DateTime )
{
- TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( entryStr, TQt::ISODate );
setText(tmpColumn->displayInColumn,
TDEGlobal::locale()->formatDateTime(dt));
}
@@ -292,9 +292,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
{
if ( cInfo->type & TQVariant::DateTime ) {
const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
- TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate );
+ TQDateTime dt1 = TQDateTime::fromString( entryStr1, TQt::ISODate );
const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
- TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate );
+ TQDateTime dt2 = TQDateTime::fromString( entryStr2, TQt::ISODate );
return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0;
}
}
diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp
index 8c27c740b..1efda479c 100644
--- a/konqueror/listview/konq_listviewwidget.cpp
+++ b/konqueror/listview/konq_listviewwidget.cpp
@@ -426,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
TDEListView::contentsMousePressEvent( e );
}
else {
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
clearSelection();
emit selectionChanged();
m_fileTip->setItem( 0 );
}
- if ( e->button() != Qt::RightButton ) {
+ if ( e->button() != TQt::RightButton ) {
TQListView::contentsMousePressEvent( e );
}
}
@@ -972,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
TQListViewItem *_item, const TQPoint& pos, int )
{
- if ( _button == Qt::MidButton )
+ if ( _button == TQt::MidButton )
{
if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) )
m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() );
diff --git a/konqueror/listview/konq_textviewitem.cpp b/konqueror/listview/konq_textviewitem.cpp
index 1076e10af..625e10f79 100644
--- a/konqueror/listview/konq_textviewitem.cpp
+++ b/konqueror/listview/konq_textviewitem.cpp
@@ -210,7 +210,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
// Don't do that! Keep things readable whatever the selection background color is
// cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
-// cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
+// cg.setColor(TQColorGroup::Highlight, TQt::darkGray);
TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
}
@@ -223,7 +223,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
TQPixmap pix( _r.width(), _r.height() );
bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() );
TQImage im = pix.convertToImage();
- im = KImageEffect::fade( im, 0.25, Qt::black );
+ im = KImageEffect::fade( im, 0.25, TQt::black );
_p->drawImage( _r.topLeft(), im );
}*/
diff --git a/konqueror/listview/konq_textviewwidget.cpp b/konqueror/listview/konq_textviewwidget.cpp
index ab227899a..d814d2fbc 100644
--- a/konqueror/listview/konq_textviewwidget.cpp
+++ b/konqueror/listview/konq_textviewwidget.cpp
@@ -43,17 +43,17 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi
setAllColumnsShowFocus(TRUE);
setRootIsDecorated(false);
- colors[KTVI_REGULAR]=Qt::black;
+ colors[KTVI_REGULAR]=TQt::black;
colors[KTVI_EXEC]=TQColor(0,170,0);
- colors[KTVI_REGULARLINK]=Qt::black;
- colors[KTVI_DIR]=Qt::black;
- colors[KTVI_DIRLINK]=Qt::black;
- colors[KTVI_BADLINK]=Qt::red;
- colors[KTVI_SOCKET]=Qt::magenta;
- colors[KTVI_FIFO]=Qt::magenta;
- colors[KTVI_UNKNOWN]=Qt::red;
- colors[KTVI_CHARDEV]=Qt::blue;
- colors[KTVI_BLOCKDEV]=Qt::blue;
+ colors[KTVI_REGULARLINK]=TQt::black;
+ colors[KTVI_DIR]=TQt::black;
+ colors[KTVI_DIRLINK]=TQt::black;
+ colors[KTVI_BADLINK]=TQt::red;
+ colors[KTVI_SOCKET]=TQt::magenta;
+ colors[KTVI_FIFO]=TQt::magenta;
+ colors[KTVI_UNKNOWN]=TQt::red;
+ colors[KTVI_CHARDEV]=TQt::blue;
+ colors[KTVI_BLOCKDEV]=TQt::blue;
m_showIcons=FALSE;
}
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index e3477b2f8..a17d594f2 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -853,7 +853,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
{
if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
- if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton)
+ if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
{
KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
@@ -902,7 +902,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
{
if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
- if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) {
+ if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) {
m_menu->exec(TQCursor::pos());
}
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index f3a539c85..aa318826a 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item )
void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
- if (_button == Qt::RightButton)
+ if (_button == TQt::RightButton)
{
if ( item && col < 2)
{
@@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem*
if(_item && col < 2)
{
switch( _button ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
slotExecuted( item );
break;
- case Qt::MidButton:
+ case TQt::MidButton:
item->middleButtonClicked();
break;
}
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index a8f6fa6c2..e4669da89 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -82,7 +82,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
virtual void urlSelected( const TQString &url, int button,
int state, const TQString &_target,
KParts::URLArgs args = KParts::URLArgs()) {
- if (button == Qt::LeftButton ){
+ if (button == TQt::LeftButton ){
if (_target.lower() == "_self") {
openURL(url);
} else if (_target.lower() == "_blank") {
@@ -92,7 +92,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
}
return;
}
- if (button == Qt::MidButton) {
+ if (button == TQt::MidButton) {
emit openURLNewWindow(completeURL(url).url(),
args);
return;
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 3d22c4bd2..fb6d951ce 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -607,7 +607,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
}
}
- paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1);
+ paint.drawText(x,y, w, font_h, TQt::AlignHCenter | TQt::DontClip, drawstr, -1);
x += w;
}
}
@@ -621,7 +621,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
TQString& str, const ca *attr, bool pm, bool clear)
{
int a = font_a + m_lineSpacing / 2;
- TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table);
+ TQColor fColor = printerFriendly ? TQt::black : attr->f.color(color_table);
TQColor bColor = attr->b.color(color_table);
TQString drawstr;
@@ -634,7 +634,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
if (attr->isTransparent(color_table))
{
if (pm)
- paint.setBackgroundMode( Qt::TransparentMode );
+ paint.setBackgroundMode( TQt::TransparentMode );
if (clear || (blinking && (attr->r & RE_BLINK))) {
erase(rect);
}
@@ -676,7 +676,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
tmpRect.setWidth( tmpRect.width() + font_w );
}
- paint.fillRect( tmpRect, Qt::darkCyan ); // currently use hard code color
+ paint.fillRect( tmpRect, TQt::darkCyan ); // currently use hard code color
}
if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
@@ -691,13 +691,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
tmpRect.setWidth( tmpRect.width() + font_w );
}
- paint.fillRect( tmpRect, Qt::darkGray ); // currently use hard code color
+ paint.fillRect( tmpRect, TQt::darkGray ); // currently use hard code color
}
}
// Paint cursor
if ((attr->r & RE_CURSOR) && !isPrinting) {
- paint.setBackgroundMode( Qt::TransparentMode );
+ paint.setBackgroundMode( TQt::TransparentMode );
int h = font_h - m_lineSpacing;
TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
if (hasFocus())
@@ -740,7 +740,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
int y = rect.y(); // top of rect
if ( shadow ) {
- paint.setPen( Qt::black );
+ paint.setPen( TQt::black );
drawTextFixed(paint, x+1, y+1, str, attr);
paint.setPen(fColor);
}
@@ -753,7 +753,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
int y = rect.y()+a; // baseline
if ( shadow ) {
- paint.setPen( Qt::black );
+ paint.setPen( TQt::black );
paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR );
paint.setPen(fColor);
}
@@ -771,7 +771,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
{
paint.setClipRect(rect);
// On screen we use overstrike for bold
- paint.setBackgroundMode( Qt::TransparentMode );
+ paint.setBackgroundMode( TQt::TransparentMode );
int x = rect.x()+1;
if(!fixed_font)
{
@@ -1016,7 +1016,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
TQPainter paint;
setUpdatesEnabled(false);
paint.begin( this );
- paint.setBackgroundMode( Qt::TransparentMode );
+ paint.setBackgroundMode( TQt::TransparentMode );
// Note that the actual widget size can be slightly larger
// that the image (the size is truncated towards the smaller
@@ -1311,7 +1311,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
{
//printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
- if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) {
+ if ( possibleTripleClick && (ev->button()==TQt::LeftButton) ) {
mouseTripleClickEvent(ev);
return;
}
@@ -1324,7 +1324,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h);
//printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY);
- if ( ev->button() == Qt::LeftButton)
+ if ( ev->button() == TQt::LeftButton)
{
line_selection_mode = false;
word_selection_mode = false;
@@ -1361,14 +1361,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
}
}
}
- else if ( ev->button() == Qt::MidButton )
+ else if ( ev->button() == TQt::MidButton )
{
if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) )
emitSelection(true,ev->state() & ControlButton);
else
emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() );
}
- else if ( ev->button() == Qt::RightButton )
+ else if ( ev->button() == TQt::RightButton )
{
if (mouse_marks || (ev->state() & ShiftButton)) {
configureRequestPoint = TQPoint( ev->x(), ev->y() );
@@ -1382,7 +1382,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
{
// for auto-hiding the cursor, we need mouseTracking
- if (ev->state() == Qt::NoButton ) return;
+ if (ev->state() == TQt::NoButton ) return;
if (dragInfo.state == diPending) {
// we had a mouse down, but haven't confirmed a drag yet
@@ -1406,7 +1406,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
if (actSel == 0) return;
// don't extend selection while pasting
- if (ev->state() & Qt::MidButton) return;
+ if (ev->state() & TQt::MidButton) return;
extendSelection( ev->pos() );
}
@@ -1600,7 +1600,7 @@ void TEWidget::extendSelection( TQPoint pos )
void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
{
//printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
- if ( ev->button() == Qt::LeftButton)
+ if ( ev->button() == TQt::LeftButton)
{
emit isBusySelecting(false); // Ok.. we can breath again.
if(dragInfo.state == diPending)
@@ -1630,8 +1630,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
}
dragInfo.state = diNone;
}
- if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton))
- || ev->button() == Qt::MidButton) ) {
+ if ( !mouse_marks && ((ev->button() == TQt::RightButton && !(ev->state() & ShiftButton))
+ || ev->button() == TQt::MidButton) ) {
TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1643,7 +1643,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
{
- if ( ev->button() != Qt::LeftButton) return;
+ if ( ev->button() != TQt::LeftButton) return;
TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
@@ -1701,7 +1701,7 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
void TEWidget::wheelEvent( TQWheelEvent* ev )
{
- if (ev->orientation() != Qt::Vertical)
+ if (ev->orientation() != TQt::Vertical)
return;
if (ev->state() & ControlButton) {
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index fb38b6e18..a9c026fea 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -967,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev )
{
switch(ev->key())
{
- case Qt::Key_Down : gui->doScroll(+1); return;
- case Qt::Key_Up : gui->doScroll(-1); return;
- case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
- case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return;
+ case TQt::Key_Down : gui->doScroll(+1); return;
+ case TQt::Key_Up : gui->doScroll(-1); return;
+ case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
+ case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return;
}
}
// revert to non-history when typing
if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty()
- || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right
- || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown))
+ || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right
+ || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown))
scr->setHistCursor(scr->getHistLines());
if (cmd==CMD_send)
@@ -1231,7 +1231,7 @@ char TEmuVt102::getErase()
int len;
bool metaspecified;
- if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len,
+ if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len,
&metaspecified) && (cmd==CMD_send) && (len == 1))
return txt[0];
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 3712bb0da..a28801a06 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -519,143 +519,143 @@ void KeyTransSymbols::defModSyms()
void KeyTransSymbols::defKeySyms()
{
// Grey keys
- defKeySym("Escape", Qt::Key_Escape );
- defKeySym("Tab", Qt::Key_Tab );
- defKeySym("Backtab", Qt::Key_Backtab );
- defKeySym("Backspace", Qt::Key_Backspace );
- defKeySym("Return", Qt::Key_Return );
- defKeySym("Enter", Qt::Key_Enter );
- defKeySym("Insert", Qt::Key_Insert );
- defKeySym("Delete", Qt::Key_Delete );
- defKeySym("Pause", Qt::Key_Pause );
- defKeySym("Print", Qt::Key_Print );
- defKeySym("SysReq", Qt::Key_SysReq );
- defKeySym("Home", Qt::Key_Home );
- defKeySym("End", Qt::Key_End );
- defKeySym("Left", Qt::Key_Left );
- defKeySym("Up", Qt::Key_Up );
- defKeySym("Right", Qt::Key_Right );
- defKeySym("Down", Qt::Key_Down );
+ defKeySym("Escape", TQt::Key_Escape );
+ defKeySym("Tab", TQt::Key_Tab );
+ defKeySym("Backtab", TQt::Key_Backtab );
+ defKeySym("Backspace", TQt::Key_Backspace );
+ defKeySym("Return", TQt::Key_Return );
+ defKeySym("Enter", TQt::Key_Enter );
+ defKeySym("Insert", TQt::Key_Insert );
+ defKeySym("Delete", TQt::Key_Delete );
+ defKeySym("Pause", TQt::Key_Pause );
+ defKeySym("Print", TQt::Key_Print );
+ defKeySym("SysReq", TQt::Key_SysReq );
+ defKeySym("Home", TQt::Key_Home );
+ defKeySym("End", TQt::Key_End );
+ defKeySym("Left", TQt::Key_Left );
+ defKeySym("Up", TQt::Key_Up );
+ defKeySym("Right", TQt::Key_Right );
+ defKeySym("Down", TQt::Key_Down );
defKeySym("Prior", TQt::Key_Prior );
defKeySym("Next", TQt::Key_Next );
- defKeySym("Shift", Qt::Key_Shift );
- defKeySym("Control", Qt::Key_Control );
- defKeySym("Meta", Qt::Key_Meta );
- defKeySym("Alt", Qt::Key_Alt );
- defKeySym("CapsLock", Qt::Key_CapsLock );
- defKeySym("NumLock", Qt::Key_NumLock );
- defKeySym("ScrollLock", Qt::Key_ScrollLock );
- defKeySym("F1", Qt::Key_F1 );
- defKeySym("F2", Qt::Key_F2 );
- defKeySym("F3", Qt::Key_F3 );
- defKeySym("F4", Qt::Key_F4 );
- defKeySym("F5", Qt::Key_F5 );
- defKeySym("F6", Qt::Key_F6 );
- defKeySym("F7", Qt::Key_F7 );
- defKeySym("F8", Qt::Key_F8 );
- defKeySym("F9", Qt::Key_F9 );
- defKeySym("F10", Qt::Key_F10 );
- defKeySym("F11", Qt::Key_F11 );
- defKeySym("F12", Qt::Key_F12 );
- defKeySym("F13", Qt::Key_F13 );
- defKeySym("F14", Qt::Key_F14 );
- defKeySym("F15", Qt::Key_F15 );
- defKeySym("F16", Qt::Key_F16 );
- defKeySym("F17", Qt::Key_F17 );
- defKeySym("F18", Qt::Key_F18 );
- defKeySym("F19", Qt::Key_F19 );
- defKeySym("F20", Qt::Key_F20 );
- defKeySym("F21", Qt::Key_F21 );
- defKeySym("F22", Qt::Key_F22 );
- defKeySym("F23", Qt::Key_F23 );
- defKeySym("F24", Qt::Key_F24 );
- defKeySym("F25", Qt::Key_F25 );
- defKeySym("F26", Qt::Key_F26 );
- defKeySym("F27", Qt::Key_F27 );
- defKeySym("F28", Qt::Key_F28 );
- defKeySym("F29", Qt::Key_F29 );
- defKeySym("F30", Qt::Key_F30 );
- defKeySym("F31", Qt::Key_F31 );
- defKeySym("F32", Qt::Key_F32 );
- defKeySym("F33", Qt::Key_F33 );
- defKeySym("F34", Qt::Key_F34 );
- defKeySym("F35", Qt::Key_F35 );
- defKeySym("Super_L", Qt::Key_Super_L );
- defKeySym("Super_R", Qt::Key_Super_R );
- defKeySym("Menu", Qt::Key_Menu );
- defKeySym("Hyper_L", Qt::Key_Hyper_L );
- defKeySym("Hyper_R", Qt::Key_Hyper_R );
+ defKeySym("Shift", TQt::Key_Shift );
+ defKeySym("Control", TQt::Key_Control );
+ defKeySym("Meta", TQt::Key_Meta );
+ defKeySym("Alt", TQt::Key_Alt );
+ defKeySym("CapsLock", TQt::Key_CapsLock );
+ defKeySym("NumLock", TQt::Key_NumLock );
+ defKeySym("ScrollLock", TQt::Key_ScrollLock );
+ defKeySym("F1", TQt::Key_F1 );
+ defKeySym("F2", TQt::Key_F2 );
+ defKeySym("F3", TQt::Key_F3 );
+ defKeySym("F4", TQt::Key_F4 );
+ defKeySym("F5", TQt::Key_F5 );
+ defKeySym("F6", TQt::Key_F6 );
+ defKeySym("F7", TQt::Key_F7 );
+ defKeySym("F8", TQt::Key_F8 );
+ defKeySym("F9", TQt::Key_F9 );
+ defKeySym("F10", TQt::Key_F10 );
+ defKeySym("F11", TQt::Key_F11 );
+ defKeySym("F12", TQt::Key_F12 );
+ defKeySym("F13", TQt::Key_F13 );
+ defKeySym("F14", TQt::Key_F14 );
+ defKeySym("F15", TQt::Key_F15 );
+ defKeySym("F16", TQt::Key_F16 );
+ defKeySym("F17", TQt::Key_F17 );
+ defKeySym("F18", TQt::Key_F18 );
+ defKeySym("F19", TQt::Key_F19 );
+ defKeySym("F20", TQt::Key_F20 );
+ defKeySym("F21", TQt::Key_F21 );
+ defKeySym("F22", TQt::Key_F22 );
+ defKeySym("F23", TQt::Key_F23 );
+ defKeySym("F24", TQt::Key_F24 );
+ defKeySym("F25", TQt::Key_F25 );
+ defKeySym("F26", TQt::Key_F26 );
+ defKeySym("F27", TQt::Key_F27 );
+ defKeySym("F28", TQt::Key_F28 );
+ defKeySym("F29", TQt::Key_F29 );
+ defKeySym("F30", TQt::Key_F30 );
+ defKeySym("F31", TQt::Key_F31 );
+ defKeySym("F32", TQt::Key_F32 );
+ defKeySym("F33", TQt::Key_F33 );
+ defKeySym("F34", TQt::Key_F34 );
+ defKeySym("F35", TQt::Key_F35 );
+ defKeySym("Super_L", TQt::Key_Super_L );
+ defKeySym("Super_R", TQt::Key_Super_R );
+ defKeySym("Menu", TQt::Key_Menu );
+ defKeySym("Hyper_L", TQt::Key_Hyper_L );
+ defKeySym("Hyper_R", TQt::Key_Hyper_R );
// Regular keys
- defKeySym("Space", Qt::Key_Space );
- defKeySym("Exclam", Qt::Key_Exclam );
- defKeySym("QuoteDbl", Qt::Key_QuoteDbl );
- defKeySym("NumberSign", Qt::Key_NumberSign );
- defKeySym("Dollar", Qt::Key_Dollar );
- defKeySym("Percent", Qt::Key_Percent );
- defKeySym("Ampersand", Qt::Key_Ampersand );
- defKeySym("Apostrophe", Qt::Key_Apostrophe );
- defKeySym("ParenLeft", Qt::Key_ParenLeft );
- defKeySym("ParenRight", Qt::Key_ParenRight );
- defKeySym("Asterisk", Qt::Key_Asterisk );
- defKeySym("Plus", Qt::Key_Plus );
- defKeySym("Comma", Qt::Key_Comma );
- defKeySym("Minus", Qt::Key_Minus );
- defKeySym("Period", Qt::Key_Period );
- defKeySym("Slash", Qt::Key_Slash );
- defKeySym("0", Qt::Key_0 );
- defKeySym("1", Qt::Key_1 );
- defKeySym("2", Qt::Key_2 );
- defKeySym("3", Qt::Key_3 );
- defKeySym("4", Qt::Key_4 );
- defKeySym("5", Qt::Key_5 );
- defKeySym("6", Qt::Key_6 );
- defKeySym("7", Qt::Key_7 );
- defKeySym("8", Qt::Key_8 );
- defKeySym("9", Qt::Key_9 );
- defKeySym("Colon", Qt::Key_Colon );
- defKeySym("Semicolon", Qt::Key_Semicolon );
- defKeySym("Less", Qt::Key_Less );
- defKeySym("Equal", Qt::Key_Equal );
- defKeySym("Greater", Qt::Key_Greater );
- defKeySym("Question", Qt::Key_Question );
- defKeySym("At", Qt::Key_At );
- defKeySym("A", Qt::Key_A );
- defKeySym("B", Qt::Key_B );
- defKeySym("C", Qt::Key_C );
- defKeySym("D", Qt::Key_D );
- defKeySym("E", Qt::Key_E );
- defKeySym("F", Qt::Key_F );
- defKeySym("G", Qt::Key_G );
- defKeySym("H", Qt::Key_H );
- defKeySym("I", Qt::Key_I );
- defKeySym("J", Qt::Key_J );
- defKeySym("K", Qt::Key_K );
- defKeySym("L", Qt::Key_L );
- defKeySym("M", Qt::Key_M );
- defKeySym("N", Qt::Key_N );
- defKeySym("O", Qt::Key_O );
- defKeySym("P", Qt::Key_P );
- defKeySym("Q", Qt::Key_Q );
- defKeySym("R", Qt::Key_R );
- defKeySym("S", Qt::Key_S );
- defKeySym("T", Qt::Key_T );
- defKeySym("U", Qt::Key_U );
- defKeySym("V", Qt::Key_V );
- defKeySym("W", Qt::Key_W );
- defKeySym("X", Qt::Key_X );
- defKeySym("Y", Qt::Key_Y );
- defKeySym("Z", Qt::Key_Z );
- defKeySym("BracketLeft", Qt::Key_BracketLeft );
- defKeySym("Backslash", Qt::Key_Backslash );
- defKeySym("BracketRight", Qt::Key_BracketRight);
- defKeySym("AsciiCircum", Qt::Key_AsciiCircum );
- defKeySym("Underscore", Qt::Key_Underscore );
- defKeySym("QuoteLeft", Qt::Key_QuoteLeft );
- defKeySym("BraceLeft", Qt::Key_BraceLeft );
- defKeySym("Bar", Qt::Key_Bar );
- defKeySym("BraceRight", Qt::Key_BraceRight );
- defKeySym("AsciiTilde", Qt::Key_AsciiTilde );
+ defKeySym("Space", TQt::Key_Space );
+ defKeySym("Exclam", TQt::Key_Exclam );
+ defKeySym("QuoteDbl", TQt::Key_QuoteDbl );
+ defKeySym("NumberSign", TQt::Key_NumberSign );
+ defKeySym("Dollar", TQt::Key_Dollar );
+ defKeySym("Percent", TQt::Key_Percent );
+ defKeySym("Ampersand", TQt::Key_Ampersand );
+ defKeySym("Apostrophe", TQt::Key_Apostrophe );
+ defKeySym("ParenLeft", TQt::Key_ParenLeft );
+ defKeySym("ParenRight", TQt::Key_ParenRight );
+ defKeySym("Asterisk", TQt::Key_Asterisk );
+ defKeySym("Plus", TQt::Key_Plus );
+ defKeySym("Comma", TQt::Key_Comma );
+ defKeySym("Minus", TQt::Key_Minus );
+ defKeySym("Period", TQt::Key_Period );
+ defKeySym("Slash", TQt::Key_Slash );
+ defKeySym("0", TQt::Key_0 );
+ defKeySym("1", TQt::Key_1 );
+ defKeySym("2", TQt::Key_2 );
+ defKeySym("3", TQt::Key_3 );
+ defKeySym("4", TQt::Key_4 );
+ defKeySym("5", TQt::Key_5 );
+ defKeySym("6", TQt::Key_6 );
+ defKeySym("7", TQt::Key_7 );
+ defKeySym("8", TQt::Key_8 );
+ defKeySym("9", TQt::Key_9 );
+ defKeySym("Colon", TQt::Key_Colon );
+ defKeySym("Semicolon", TQt::Key_Semicolon );
+ defKeySym("Less", TQt::Key_Less );
+ defKeySym("Equal", TQt::Key_Equal );
+ defKeySym("Greater", TQt::Key_Greater );
+ defKeySym("Question", TQt::Key_Question );
+ defKeySym("At", TQt::Key_At );
+ defKeySym("A", TQt::Key_A );
+ defKeySym("B", TQt::Key_B );
+ defKeySym("C", TQt::Key_C );
+ defKeySym("D", TQt::Key_D );
+ defKeySym("E", TQt::Key_E );
+ defKeySym("F", TQt::Key_F );
+ defKeySym("G", TQt::Key_G );
+ defKeySym("H", TQt::Key_H );
+ defKeySym("I", TQt::Key_I );
+ defKeySym("J", TQt::Key_J );
+ defKeySym("K", TQt::Key_K );
+ defKeySym("L", TQt::Key_L );
+ defKeySym("M", TQt::Key_M );
+ defKeySym("N", TQt::Key_N );
+ defKeySym("O", TQt::Key_O );
+ defKeySym("P", TQt::Key_P );
+ defKeySym("Q", TQt::Key_Q );
+ defKeySym("R", TQt::Key_R );
+ defKeySym("S", TQt::Key_S );
+ defKeySym("T", TQt::Key_T );
+ defKeySym("U", TQt::Key_U );
+ defKeySym("V", TQt::Key_V );
+ defKeySym("W", TQt::Key_W );
+ defKeySym("X", TQt::Key_X );
+ defKeySym("Y", TQt::Key_Y );
+ defKeySym("Z", TQt::Key_Z );
+ defKeySym("BracketLeft", TQt::Key_BracketLeft );
+ defKeySym("Backslash", TQt::Key_Backslash );
+ defKeySym("BracketRight", TQt::Key_BracketRight);
+ defKeySym("AsciiCircum", TQt::Key_AsciiCircum );
+ defKeySym("Underscore", TQt::Key_Underscore );
+ defKeySym("QuoteLeft", TQt::Key_QuoteLeft );
+ defKeySym("BraceLeft", TQt::Key_BraceLeft );
+ defKeySym("Bar", TQt::Key_Bar );
+ defKeySym("BraceRight", TQt::Key_BraceRight );
+ defKeySym("AsciiTilde", TQt::Key_AsciiTilde );
}
KeyTransSymbols::KeyTransSymbols()
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 815b4f5a0..d41f30181 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -848,14 +848,14 @@ void Konsole::makeGUI()
if (!m_moveSessionLeft)
{
m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
- TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this),
TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
}
m_moveSessionLeft->plug(m_tabPopupMenu);
if (!m_moveSessionRight)
{
m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
- TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
}
m_moveSessionRight->plug(m_tabPopupMenu);
@@ -1091,9 +1091,9 @@ void Konsole::makeBasicGUI()
m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
- m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
+ m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
- m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
+ m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this),
@@ -1130,12 +1130,12 @@ void Konsole::makeBasicGUI()
}
m_detachSession->setEnabled(false);
- m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::SHIFT+Qt::Key_R, TQT_TQOBJECT(this),
+ m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this),
TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
if (kapp->authorizeTDEAction("zmodem_upload"))
m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
- Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this),
+ TQt::CTRL+TQt::ALT+TQt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT( slotZModemUpload() ),
m_shortcuts, "zmodem_upload" );
@@ -1152,7 +1152,7 @@ void Konsole::makeBasicGUI()
masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
- showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this),
+ showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
@@ -1174,28 +1174,28 @@ void Konsole::makeBasicGUI()
m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
- TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
- shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));
+ TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
+ shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session");
- new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
+ new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
if (!m_moveSessionLeft)
{
m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
- TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this),
TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
}
if (!m_moveSessionRight)
{
m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
- TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
}
- new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
+ new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
- new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right,
+ new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
for (int i=1;i<13;i++) { // Due to 12 function keys?
@@ -1205,7 +1205,7 @@ void Konsole::makeBasicGUI()
new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
- new TDEAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
+ new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
// Should we load all *.desktop files now? Required for Session shortcuts.
if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab
index 75d6cfd79..4e23851bb 100644
--- a/konsole/other/README.KeyTab
+++ b/konsole/other/README.KeyTab
@@ -14,7 +14,7 @@ The syntax is that each entry has the form :
"key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
Keynames are those defined in <qnamespace.h> with the
-"Qt::Key_" prefix removed.
+"TQt::Key_" prefix removed.
Mode names are:
diff --git a/konsole/other/linux.keytab b/konsole/other/linux.keytab
index d5149c3c8..aafbdd97f 100644
--- a/konsole/other/linux.keytab
+++ b/konsole/other/linux.keytab
@@ -15,7 +15,7 @@ keyboard "linux console"
# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
#
# Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
#
# Mode names are :
#
diff --git a/konsole/other/solaris.keytab b/konsole/other/solaris.keytab
index cb0626be9..e671cb13b 100644
--- a/konsole/other/solaris.keytab
+++ b/konsole/other/solaris.keytab
@@ -13,7 +13,7 @@ keyboard "Solaris"
# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
#
# Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
#
# Mode names are :
#
diff --git a/konsole/other/vt100.keytab b/konsole/other/vt100.keytab
index dec49baac..fa57934bc 100644
--- a/konsole/other/vt100.keytab
+++ b/konsole/other/vt100.keytab
@@ -14,7 +14,7 @@ keyboard "vt100 (historical)"
# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
#
# Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
#
# Mode names are :
#
diff --git a/konsole/other/vt420pc.keytab b/konsole/other/vt420pc.keytab
index d132797b1..376ce8d13 100644
--- a/konsole/other/vt420pc.keytab
+++ b/konsole/other/vt420pc.keytab
@@ -29,7 +29,7 @@ keyboard "VT420PC"
# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
#
# Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
#
# Mode names are :
#
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index 74ead587f..dc7b27f05 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -78,7 +78,7 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
{
if ( !KPagerConfigDialog::m_windowDragging )
return;
- if ( (ev->state() & Qt::LeftButton) == 0 )
+ if ( (ev->state() & TQt::LeftButton) == 0 )
return;
TQPoint p( ev->pos() - pressPos );
if ( p.manhattanLength() >= tqApp->startDragDistance() )
@@ -88,12 +88,12 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
void Desktop::mousePressEvent( TQMouseEvent * ev)
{
bool showWindows= KPagerConfigDialog::m_showWindows;
- if (ev->button()==Qt::LeftButton){
+ if (ev->button()==TQt::LeftButton){
pressPos = ev->pos();
}
- else if ((ev->button()==Qt::MidButton)&&(showWindows))
+ else if ((ev->button()==TQt::MidButton)&&(showWindows))
startDrag(ev->pos());
- else if (ev->button()==Qt::RightButton) {
+ else if (ev->button()==TQt::RightButton) {
TQPoint pos;
KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos);
if ( info && showWindows )
@@ -107,7 +107,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
{
/** Note that mouseReleaseEvent is not called when releasing the mouse
to drop a window in this desktop */
- if (ev->button()==Qt::LeftButton)
+ if (ev->button()==TQt::LeftButton)
{
bool showWindows= KPagerConfigDialog::m_showWindows;
TQPoint pos;
@@ -426,7 +426,7 @@ void Desktop::paintEvent( TQPaintEvent * )
p.begin(&pixmap);
// p.setFont(font());
// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
-// p.setPen(Qt::black);
+// p.setPen(TQt::black);
// p.drawRect(rect());
if (KPagerConfigDialog::m_showBackground )
@@ -447,7 +447,7 @@ void Desktop::paintEvent( TQPaintEvent * )
p.drawPixmap(0,0,tmp);
}
- else pixmap.fill(Qt::gray);
+ else pixmap.fill(TQt::gray);
}
else
p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
@@ -528,7 +528,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
if ( m_transparentMode==AllWindows
|| (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
- brush.setStyle(Qt::Dense4Pattern);
+ brush.setStyle(TQt::Dense4Pattern);
if ( isActive )
{
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index e2699a578..0d9faaea2 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -289,7 +289,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
// Set the real desktop background to black so that exit looks
// clean regardless of what was on "our" desktop.
if (!showLogoutStatusDlg) {
- TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );
+ TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( TQt::black );
}
state = Shutdown;
wmPhase1WaitingCount = 0;
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 98dddcf18..0d1cbd4ef 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -511,7 +511,7 @@ void KSMShutdownFeedback::slotPaintEffect()
KPixmap pixmap;
pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 ));
TQImage image = pixmap.convertToImage();
- KImageEffect::blend( Qt::black, image, 0.4 );
+ KImageEffect::blend( TQt::black, image, 0.4 );
KImageEffect::toGray( image, true );
pixmap.convertFromImage( image );
bitBlt( this, 0, m_currentY, &pixmap );
@@ -529,7 +529,7 @@ void KSMShutdownFeedback::slotPaintEffect()
KSMShutdownIPFeedback * KSMShutdownIPFeedback::s_pSelf = 0L;
KSMShutdownIPFeedback::KSMShutdownIPFeedback()
-: TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+: TQWidget( 0L, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
{
setShown(false);
@@ -653,7 +653,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
}
else {
pm = TQPixmap(kapp->desktop()->width(), kapp->desktop()->height());
- pm.fill(Qt::black);
+ pm.fill(TQt::black);
m_paintedFromSharedRootPixmap = false;
}
}
@@ -757,7 +757,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// first line of buttons
hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
- hbuttonbox->setAlignment( Qt::AlignHCenter );
+ hbuttonbox->setAlignment( TQt::AlignHCenter );
// End session
FlatButton* btnLogout = new FlatButton( frame );
btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
@@ -776,7 +776,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
hbox->addWidget( lfrm, AlignCenter );
buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
- buttonlay->setAlignment( Qt::AlignHCenter );
+ buttonlay->setAlignment( TQt::AlignHCenter );
TQLabel* icon = new TQLabel( lfrm );
if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doNotUseKonqyPicture", false)) {
@@ -898,7 +898,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// bottom buttons
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox2->setAlignment( Qt::AlignHCenter );
+ hbuttonbox2->setAlignment( TQt::AlignHCenter );
if (mayrb) {
// Reboot
@@ -958,7 +958,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->setAlignment( TQt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@@ -1083,7 +1083,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->setAlignment( TQt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 7ee681907..66b6eb83b 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
{
- if ((button & Qt::LeftButton) == 0) return;
+ if ((button & TQt::LeftButton) == 0) return;
mOldPos = p;
mDragFile = TQString::null;
int cur = index(item);
@@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
{
- if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
+ if (((e->state() & TQt::LeftButton) != 0) && !mDragFile.isEmpty())
{
int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->globalPos();
@@ -123,7 +123,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
mPreview->setMinimumSize(TQSize(320,240));
- mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+ mPreview->setAlignment(TQt::AlignHCenter|TQt::AlignVCenter);
rightbox->addWidget(mPreview);
rightbox->setStretchFactor( mPreview, 3 );
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 0e1242120..c3a0285a8 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -120,19 +120,19 @@ void ThemeDefault::_initUi()
if (mActivePixmap->isNull())
{
mActivePixmap->resize(200,100);
- mActivePixmap->fill(Qt::blue);
+ mActivePixmap->fill(TQt::blue);
}
if (mInactivePixmap->isNull())
{
mInactivePixmap->resize(200,100);
- mInactivePixmap->fill(Qt::black);
+ mInactivePixmap->fill(TQt::black);
}
TQPixmap tlimage( _findPicture(TQString("splash_top.png")) );
if (tlimage.isNull())
{
tlimage.resize(200,100);
- tlimage.fill(Qt::blue);
+ tlimage.fill(TQt::blue);
}
TQLabel *top_label = new TQLabel( vbox );
top_label->setPixmap( tlimage );
@@ -147,7 +147,7 @@ void ThemeDefault::_initUi()
if (blimage.isNull())
{
blimage.resize(200,100);
- blimage.fill(Qt::black);
+ blimage.fill(TQt::black);
}
TQLabel *bottom_label = new TQLabel( vbox );
bottom_label->setPaletteBackgroundPixmap( blimage );
@@ -212,7 +212,7 @@ void ThemeDefault::_readSettings()
cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
mIconsFlashing = cfg->readBoolEntry( "Icons Flashing", true );
- TQColor df(Qt::white);
+ TQColor df(TQt::white);
mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
TQValueList<int> io_list=cfg->readIntListEntry("Icon Offsets");
if (io_list.size() == MAX_ICONS)
diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 29bfa4b66..5f759686c 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -33,10 +33,10 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent )
m_userFont (TQFont( "Arial", 16 )),
m_statusFont (TQFont( "Arial", 12, TQFont::Bold )),
- m_welcomeColor (Qt::white),
- m_welcomeShadowColor (Qt::darkGray),
- m_userColor (Qt::darkGray),
- m_statusColor (Qt::white),
+ m_welcomeColor (TQt::white),
+ m_welcomeShadowColor (TQt::darkGray),
+ m_userColor (TQt::darkGray),
+ m_statusColor (TQt::white),
m_icon (DesktopIcon("kmenu")),
@@ -71,7 +71,7 @@ void PreviewRedmond::_updateCache()
TQPainter p;
p.begin( &m_cache );
- p.fillRect( rect(), Qt::gray );
+ p.fillRect( rect(), TQt::gray );
m_welcomeFont.setItalic( true );
p.setFont( m_welcomeFont );
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index b0e81ba72..3792d6057 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -52,7 +52,7 @@ CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c )
TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold );
TQFont defaultActionFont( "Arial", 12, TQFont::Bold );
TQColor defaultDarkColor( 3, 47, 156 );
- TQColor defaultWhiteColor( Qt::white );
+ TQColor defaultWhiteColor( TQt::white );
TQHBox *hbox = new TQHBox( vbox );
hbox->setFrameStyle( TQFrame::WinPanel );
@@ -356,7 +356,7 @@ void ThemeRedmond::_readSettings()
mActionFont = cfg->readFontEntry( "Action Font", &defaultActionFont );
TQColor defaultDarkColor( 3, 47, 156 );
- TQColor defaultWhiteColor( Qt::white );
+ TQColor defaultWhiteColor( TQt::white );
mWelcomeTextColor = cfg->readColorEntry( "Welcome Text Color", &defaultWhiteColor );
mWelcomeTextShadowColor = cfg->readColorEntry( "Welcome Shadow Color", &defaultDarkColor );
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 0a2eb6343..e0ba8fb9e 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -97,7 +97,7 @@ void ThemeUnified::_readSettings()
cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
- TQColor df(Qt::white);
+ TQColor df(TQt::white);
mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
}
diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp
index 517a2bbd5..e1c8db73e 100644
--- a/ksysguard/gui/KSysGuardApplet.cpp
+++ b/ksysguard/gui/KSysGuardApplet.cpp
@@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified )
void KSysGuardApplet::layout()
{
- if ( orientation() == Qt::Horizontal ) {
+ if ( orientation() == TQt::Horizontal ) {
int h = height();
int w = (int) ( h * mSizeRatio + 0.5 );
for ( uint i = 0; i < mDockCount; ++i )
@@ -173,7 +173,7 @@ void KSysGuardApplet::layout()
int KSysGuardApplet::findDock( const TQPoint& point )
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) );
else
return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) );
diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp
index 801091d98..32f290460 100644
--- a/ksysguard/gui/SensorBrowser.cpp
+++ b/ksysguard/gui/SensorBrowser.cpp
@@ -240,7 +240,7 @@ void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e )
* mouse tracking cannot be turned off. So we have to check each event
* whether the LMB is really pressed. */
- if ( !( e->state() & Qt::LeftButton ) )
+ if ( !( e->state() & TQt::LeftButton ) )
return;
TQListViewItem* item = itemAt( e->pos() );
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cpp b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
index 8d2b5e302..1a1608b6c 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
@@ -161,10 +161,10 @@ void BarGraph::paintEvent( TQPaintEvent* )
if ( showLabels ) {
p.drawText( b * barWidth + 3, h - ( 2 * fm.lineSpacing() ) - 2,
- barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
+ barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter,
footers[ b ] );
p.drawText( b * barWidth + 3, h - fm.lineSpacing() - 2,
- barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
+ barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter,
TQString( "%1" ).arg( samples[ b ] ) );
}
}
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
index ee03f9e94..9b05d6806 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
@@ -47,7 +47,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
TQFrame *page = addPage( i18n( "Range" ) );
TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
- TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+ TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 );
mTitle = new KLineEdit( groupBox );
@@ -56,7 +56,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Display Range" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 );
boxLayout->setColStretch( 2, 1 );
@@ -84,7 +84,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
page = addPage( i18n( "Alarms" ) );
pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Minimum Value" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
boxLayout->setColStretch( 1, 1 );
@@ -102,7 +102,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Maximum Value" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
boxLayout->setColStretch( 1, 1 );
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
index 13696c502..a9b8d21c0 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
@@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* )
bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event )
{
if ( event->type() == TQEvent::MouseButtonRelease &&
- ( (TQMouseEvent*)event)->button() == Qt::LeftButton )
+ ( (TQMouseEvent*)event)->button() == TQt::LeftButton )
setFocus();
return TQWidget::eventFilter( object, event );
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
index 9d388df63..447d9c718 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
@@ -65,7 +65,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( mTitle, 0, 1 );
label->setBuddy( mTitle );
- TQButtonGroup *buttonBox = new TQButtonGroup( 2, Qt::Vertical,
+ TQButtonGroup *buttonBox = new TQButtonGroup( 2, TQt::Vertical,
i18n( "Graph Drawing Style" ), page );
mUsePolygonStyle = new TQRadioButton( i18n( "Basic polygons" ), buttonBox );
@@ -78,7 +78,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
page = addPage( i18n( "Scales" ) );
pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Vertical Scale" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
boxLayout->setColStretch( 2, 1 );
@@ -108,7 +108,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Horizontal Scale" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() );
boxLayout->setRowStretch( 1, 1 );
@@ -126,7 +126,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
page = addPage( i18n( "Grid" ) );
pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Lines" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -165,7 +165,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Text" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -190,7 +190,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 1, 0 );
- groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
+ groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Colors" ), page );
boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() );
label = new TQLabel( i18n( "Vertical lines:" ), groupBox );
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cpp b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
index a8b22569d..763953163 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cpp
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
@@ -181,8 +181,8 @@ LogFile::restoreSettings(TQDomElement& element)
TQFont font;
TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
- cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
+ cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green));
+ cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black));
monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "logfile" : element.attribute("sensorType")), element.attribute("title"));
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
index 4dfff7957..ac029e5e2 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
@@ -64,9 +64,9 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
TQWhatsThis::add( this, "dummy" );
if(!nf) {
- mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
+ mFrame = new TQGroupBox( 2, TQt::Vertical, "", this, "displayFrame");
mFrame->setFlat(true);
- mFrame->setAlignment(Qt::AlignHCenter);
+ mFrame->setAlignment(TQt::AlignHCenter);
mFrame->setInsideMargin(2);
setTitle( title );
@@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* )
bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
{
if ( event->type() == TQEvent::MouseButtonPress &&
- ( (TQMouseEvent*)event)->button() == Qt::RightButton ) {
+ ( (TQMouseEvent*)event)->button() == TQt::RightButton ) {
TQPopupMenu pm;
if ( mIsApplet ) {
pm.insertItem( i18n( "Launch &System Guard"), 1 );
@@ -200,7 +200,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
return true;
} else if ( event->type() == TQEvent::MouseButtonRelease &&
- ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) {
+ ( ( TQMouseEvent*)event)->button() == TQt::LeftButton ) {
setFocus();
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
index 334a5b736..9cdf1f507 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
@@ -284,9 +284,9 @@ SensorLogger::restoreSettings(TQDomElement& element)
{
TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
- cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
- cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red));
+ cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green));
+ cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black));
+ cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", TQt::red));
monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
logSensors.clear();
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
index bcb0b821b..1568eab17 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
@@ -445,7 +445,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
top = p.fontMetrics().height();
h -= top;
int h0 = top - 2; // h0 is our new top. It's at least 5 pixels high
- p.drawText(0, 0, x0, top - 2, Qt::AlignCenter, mTitle );
+ p.drawText(0, 0, x0, top - 2, TQt::AlignCenter, mTitle );
p.drawLine( x0 - 1, 1, x0 - 1, h0 );
p.drawLine( 0, top - 1, w - 2, top - 1 );
diff --git a/ksysguard/gui/WorkSheetSettings.cpp b/ksysguard/gui/WorkSheetSettings.cpp
index 703be57d5..e985cfafa 100644
--- a/ksysguard/gui/WorkSheetSettings.cpp
+++ b/ksysguard/gui/WorkSheetSettings.cpp
@@ -45,24 +45,24 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
- TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+ TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page );
group->layout()->setMargin( marginHint() );
group->layout()->setSpacing( spacingHint() );
TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->setAlignment( TQt::AlignTop );
mSheetTitle = new KLineEdit( group );
groupLayout->addWidget( mSheetTitle, 0, 0 );
topLayout->addWidget( group );
- group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
+ group = new TQGroupBox( 0, TQt::Vertical, i18n( "Properties" ), page );
group->layout()->setMargin( marginHint() );
group->layout()->setSpacing( spacingHint() );
groupLayout = new TQGridLayout( group->layout(), 3, 2 );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->setAlignment( TQt::AlignTop );
TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
groupLayout->addWidget( label, 0, 0 );
diff --git a/ksysguard/gui/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp
index b6e85b795..da3974ce9 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cpp
+++ b/ksysguard/gui/ksgrd/HostConnector.cpp
@@ -57,11 +57,11 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
mHostNameLabel->hide();
layout->addWidget( mHostNameLabel, 0, 1 );
- TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical,
+ TQButtonGroup *group = new TQButtonGroup( 0, TQt::Vertical,
i18n( "Connection Type" ), page );
TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
spacingHint() );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->setAlignment( TQt::AlignTop );
mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
mUseSsh->setEnabled( true );
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cpp b/ksysguard/gui/ksgrd/StyleSettings.cpp
index b84d3e407..71a18b713 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cpp
+++ b/ksysguard/gui/ksgrd/StyleSettings.cpp
@@ -90,7 +90,7 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name )
mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page );
mEditColorButton->setEnabled( false );
- layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop );
+ layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop );
connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 937c5fdd1..2c2994eaa 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -76,7 +76,7 @@ TopLevel::TopLevel( const char *name )
mTimerId = -1;
mSplitter = new TQSplitter( this );
- mSplitter->setOrientation( Qt::Horizontal );
+ mSplitter->setOrientation( TQt::Horizontal );
mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
setCentralWidget( mSplitter );
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 5f9264c8c..630079600 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -292,7 +292,7 @@ void KSysTrayCmd::windowChanged( WId w )
void KSysTrayCmd::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::RightButton )
+ if ( e->button() == TQt::RightButton )
execContextMenu( e->globalPos() );
else if ( lazyStart && ( !hasRunningClient() ) )
{
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index 7d1412ae7..01529f0f3 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -78,7 +78,7 @@ class KxkbSystemTray : public KSystemTray
void mouseReleaseEvent(TQMouseEvent *ev)
{
- if (ev->button() == Qt::LeftButton)
+ if (ev->button() == TQt::LeftButton)
emit toggled();
KSystemTray::mouseReleaseEvent(ev);
}
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index 45fb935ec..63fc4f1db 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -141,11 +141,11 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
if( m_labelShadow ) {
p.setPen(m_shColor);
- p.drawText(1, 1, pm->width(), pm->height(), Qt::AlignCenter, displayName);
+ p.drawText(1, 1, pm->width(), pm->height(), TQt::AlignCenter, displayName);
}
p.setPen(m_fgColor);
- p.drawText(0, 0, pm->width(), pm->height(), Qt::AlignCenter, displayName);
+ p.drawText(0, 0, pm->width(), pm->height(), TQt::AlignCenter, displayName);
if( m_bgTransparent && !m_showFlag )
{
@@ -156,10 +156,10 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
maskp.setPen(TQt::black);
maskp.setFont(m_labelFont);
- maskp.drawText(0, 0, maskpix.width(), maskpix.height(), Qt::AlignCenter, displayName);
+ maskp.drawText(0, 0, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
if( m_labelShadow )
{
- maskp.drawText(1, 1, maskpix.width(), maskpix.height(), Qt::AlignCenter, displayName);
+ maskp.drawText(1, 1, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
}
TQBitmap mask;
@@ -305,15 +305,15 @@ static const char* ERROR_LABEL = "err";
TQPixmap* LayoutIcon::createErrorPixmap()
{
TQPixmap* pm = new TQPixmap(21, 14);
- pm->fill(Qt::white);
+ pm->fill(TQt::white);
TQPainter p(pm);
p.setFont(m_labelFont);
- p.setPen(Qt::red);
- p.drawText(1, 1, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
- p.setPen(Qt::blue);
- p.drawText(0, 0, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
+ p.setPen(TQt::red);
+ p.drawText(1, 1, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
+ p.setPen(TQt::blue);
+ p.drawText(0, 0, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
m_pixmapCache.insert(ERROR_CODE, pm);
return pm;
diff --git a/libkonq/konq_bgnddlg.cpp b/libkonq/konq_bgnddlg.cpp
index 60f3aa63d..f4c0c41a6 100644
--- a/libkonq/konq_bgnddlg.cpp
+++ b/libkonq/konq_bgnddlg.cpp
@@ -47,11 +47,11 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
TQVBoxLayout* mainLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
- m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
+ m_buttonGroup->setColumnLayout( 0, TQt::Vertical );
m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->setAlignment( TQt::AlignTop );
mainLayout->addWidget( m_buttonGroup );
connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 995b51ebc..6022f1850 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -561,7 +561,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
if ( itemTextBg.isValid() )
setItemTextBackground( itemTextBg );
else
- setItemTextBackground( Qt::NoBrush );
+ setItemTextBackground( TQt::NoBrush );
}
bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled();
@@ -1300,7 +1300,7 @@ void KonqIconViewWidget::doubleClickTimeout()
if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
brenameTrash = true;
- if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).contains(e.pos()))
+ if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == TQt::LeftButton && item->textRect( false ).contains(e.pos()))
{
if( d->pActivateDoubleClick->isActive () )
d->pActivateDoubleClick->stop();
@@ -1378,7 +1378,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
bool brenameTrash =false;
if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
brenameTrash = true;
- if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
+ if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == TQt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
{
d->firstClick = true;
d->mousePos = e->pos();
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 4f754681e..8f500db52 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -579,7 +579,7 @@ void KonqOperations::doFileCopy()
if (bSetWallpaper)
popup.insertItem(SmallIconSet("background"), i18n( "Set as &Wallpaper" ), 4 );
popup.insertSeparator();
- popup.insertItem(SmallIconSet("cancel"), i18n( "C&ancel" ) + "\t" + KKey( Qt::Key_Escape ).toString(), 5);
+ popup.insertItem(SmallIconSet("cancel"), i18n( "C&ancel" ) + "\t" + KKey( TQt::Key_Escape ).toString(), 5);
int result = popup.exec( m_info->mousePos );
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 037798cb2..da6c5d780 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -69,9 +69,9 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
TQDateTime current = lastChanged( *it );
// store non-existent directory as "N" string rather than empty string, TDEConfig
// has a bug with storing a list of empty items
- if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate ))
+ if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, TQt::ISODate ))
changed = true;
- currentTimestamps.append( current.isNull() ? "N" : current.toString( Qt::ISODate ));
+ currentTimestamps.append( current.isNull() ? "N" : current.toString( TQt::ISODate ));
}
if( changed )
{
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index a4297969e..1b36daaae 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -48,7 +48,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Paths to Local CGI Programs"), this );
+ TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Paths to Local CGI Programs"), this );
topLayout->addWidget( topBox );
mListBox = new TQListBox( topBox );
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index e7a195c44..6f6cd93c6 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -776,7 +776,7 @@ int fishProtocol::handleResponse(const TQString &str){
int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &dayStr, const TQString &timeyearStr)
{
- TQDateTime dt(TQDate::currentDate(Qt::UTC));
+ TQDateTime dt(TQDate::currentDate(TQt::UTC));
int year = dt.date().year();
int month = dt.date().month();
int currentMonth = month;
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 0b5f433e6..3f27feb68 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -330,7 +330,7 @@ static void InitNumberDefinitions( void )
{
// As the date number registers are more for end-users, better choose local time.
// Groff seems to support Gregorian dates only
- TQDate today( TQDate::currentDate( Qt::LocalTime ) );
+ TQDate today( TQDate::currentDate( TQt::LocalTime ) );
s_numberDefinitionMap.insert( "year", today.year() ); // Y2K-correct year
s_numberDefinitionMap.insert( "yr", today.year() - 1900 ); // Y2K-incorrect year
s_numberDefinitionMap.insert( "mo", today.month() );
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index 826b69f6a..5f72e3102 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -158,8 +158,8 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
TQPixmap bar(150, 20);
TQPainter p(&bar);
- p.fillRect(0, 0, length, 20, Qt::red);
- p.fillRect(length, 0, 150-length, 20, Qt::green);
+ p.fillRect(0, 0, length, 20, TQt::red);
+ p.fillRect(length, 0, 150-length, 20, TQt::green);
TQColorGroup cg = TQApplication::palette().active();
diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index 90431afd5..eeb0f600b 100644
--- a/tdeioslave/trash/tdeio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -435,7 +435,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString
addAtom( entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime );
addAtom( entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime ); // ## or use it for deletion time?
addAtom( entry, TDEIO::UDS_EXTRA, 0, info.origPath );
- addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( Qt::ISODate ) );
+ addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( TQt::ISODate ) );
return true;
}
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index 4f7dbf492..8bfbbca8d 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -263,7 +263,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1();
info += "\n";
info += "DeletionDate=";
- info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
+ info += TQDateTime::currentDateTime().toString( TQt::ISODate ).latin1();
info += "\n";
size_t sz = info.size() - 1; // avoid trailing 0 from QCString
@@ -637,7 +637,7 @@ bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, i
}
TQString line = cfg.readEntry( "DeletionDate" );
if ( !line.isEmpty() ) {
- info.deletionDate = TQDateTime::fromString( line, Qt::ISODate );
+ info.deletionDate = TQDateTime::fromString( line, TQt::ISODate );
}
return true;
}
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index 05ef4c6bc..f1fe23d47 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -48,7 +48,7 @@ private:
void JobTray::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
KSystemTray::mousePressEvent(e);
else if (m_app->m_views.count() > 0)
{
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 0c3febd86..f87ee4377 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -522,7 +522,7 @@ void FaxCtrl::viewLog(TQWidget *)
m_logview = new KTextEdit(topView);
m_logview->setTextFormat( TQt::LogText );
m_logview->setWordWrap( TQTextEdit::WidgetWidth );
- m_logview->setPaper( Qt::white );
+ m_logview->setPaper( TQt::white );
//m_logview->setReadOnly(true);
//m_logview->setWordWrap(TQTextEdit::NoWrap);
TQPushButton *m_clear = new KPushButton(KStdGuiItem::clear(), topView);
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 2927d4e88..4cf67d0ca 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -133,7 +133,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
TQGridLayout *l0 = new TQGridLayout(mainw, 10, 2, 10, 5);
l0->setColStretch(1,1);
- l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop);
+ l0->addWidget(m_filelabel, 0, 0, TQt::AlignLeft|TQt::AlignTop);
TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 );
TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 5 );
l0->addLayout( l2, 0, 1 );
@@ -159,7 +159,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
l0->addWidget( m_cover, 6, 1 );
l0->addWidget( m_subjectlabel, 7, 0 );
l0->addWidget( m_subject, 7, 1 );
- l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft);
+ l0->addWidget(m_commentlabel, 8, 0, TQt::AlignTop|TQt::AlignLeft);
l0->addWidget(m_comment, 8, 1);
l0->addWidget(m_timelabel, 9, 0);
TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5);
@@ -188,14 +188,14 @@ KdeprintFax::~KdeprintFax()
void KdeprintFax::initActions()
{
- new TDEAction(i18n("&Add File..."), "document-new", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
- new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
- new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
- new TDEAction(i18n("A&bort"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
- new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
- new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
- new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
- new TDEAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+ new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
+ new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
+ new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
+ new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
+ new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
+ new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
+ new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
+ new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
setStandardToolBarMenuEnabled(true);
diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp
index 5e8f8e861..428b2ce09 100644
--- a/tdm/kfrontend/kfdialog.cpp
+++ b/tdm/kfrontend/kfdialog.cpp
@@ -181,7 +181,7 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
- grid->addWidget( label1, 0, 0, Qt::AlignCenter );
- grid->addWidget( label2, 0, 1, Qt::AlignCenter );
- grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+ grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+ grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+ grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
}
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 58b9d2e9c..521c624f2 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -101,7 +101,7 @@ GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy)
init();
}
-GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
+GreeterApp::GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
{
init();
}
@@ -201,7 +201,7 @@ checkSAK(GreeterApp* app)
app->restoreOverrideCursor();
SAKDlg sak(0);
sak.exec();
- app->setOverrideCursor( Qt::WaitCursor );
+ app->setOverrideCursor( TQt::WaitCursor );
}
void
@@ -284,7 +284,7 @@ kg_main( const char *argv0 )
GreeterApp *app;
if ((!_compositor.isEmpty()) && ( argb_visual_available == true )) {
- app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap ));
+ app = new GreeterApp(dpyi, TQt::HANDLE( visual ), TQt::HANDLE( colormap ));
}
else {
argb_visual_available = false;
@@ -418,7 +418,7 @@ kg_main( const char *argv0 )
}
TDEProcess *proc2 = 0;
- app->setOverrideCursor( Qt::WaitCursor );
+ app->setOverrideCursor( TQt::WaitCursor );
FDialog *dialog = NULL;
#ifdef XDMCP
if (cmd == G_Choose) {
diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h
index 0a1c69d19..1acbcf187 100644
--- a/tdm/kfrontend/kgapp.h
+++ b/tdm/kfrontend/kgapp.h
@@ -40,7 +40,7 @@ class GreeterApp : public TDEApplication {
public:
GreeterApp();
GreeterApp(Display *dpy);
- GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap);
+ GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap);
~GreeterApp();
virtual bool x11EventFilter( XEvent * );
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 61c3f84ef..4aa49eca5 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -123,8 +123,8 @@ class UserListView : public TDEListView {
// FIXME: This must be configurable, so disable
// painting of list background for now.
// if (themed) {
-// setBackgroundMode( Qt::NoBackground );
-// viewport()->setBackgroundMode( Qt::NoBackground );
+// setBackgroundMode( TQt::NoBackground );
+// viewport()->setBackgroundMode( TQt::NoBackground );
// setFrameStyle( TQFrame::NoFrame );
// }
}
@@ -993,7 +993,7 @@ KStdGreeter::KStdGreeter()
"open windows on it or intercept your input.") );
complainLabel->setAlignment( AlignCenter );
complainLabel->setFont( _failFont );
- complainLabel->setPaletteForegroundColor( Qt::red );
+ complainLabel->setPaletteForegroundColor( TQt::red );
inner_box->addWidget( complainLabel );
}
if (_logoArea == LOGO_NONE) {
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 44353087a..66b13e974 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -1086,7 +1086,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
failedLabel = new TQLabel( parent );
failedLabel->setFont( _failFont );
- grid->addWidget( failedLabel, 1, 0, Qt::AlignCenter );
+ grid->addWidget( failedLabel, 1, 0, TQt::AlignCenter );
updateLockStatus();
}
@@ -1143,7 +1143,7 @@ KGStdVerify::updateStatus()
if (failedLabelState != nfls) {
failedLabelState = nfls;
if (nfls < 0) {
- failedLabel->setPaletteForegroundColor( Qt::black );
+ failedLabel->setPaletteForegroundColor( TQt::black );
failedLabel->setText( i18n( "Automatic login in 1 second...",
"Automatic login in %n seconds...",
timedLeft ) );
@@ -1153,11 +1153,11 @@ KGStdVerify::updateStatus()
failedLabel->clear();
break;
case 3:
- failedLabel->setPaletteForegroundColor( Qt::red );
+ failedLabel->setPaletteForegroundColor( TQt::red );
failedLabel->setText( i18n("Warning: Caps Lock on") );
break;
case 2:
- failedLabel->setPaletteForegroundColor( Qt::black );
+ failedLabel->setPaletteForegroundColor( TQt::black );
failedLabel->setText( authTok ?
i18n("Change failed") :
fixedEntity.isEmpty() ?
diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp
index a15012a17..138045a52 100644
--- a/tdm/kfrontend/sakdlg.cpp
+++ b/tdm/kfrontend/sakdlg.cpp
@@ -253,7 +253,7 @@ void SAKDlg::reject()
void SAKDlg::updateLabel(TQString &txt)
{
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
}
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 094e2a8c8..1a9ea254c 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -304,9 +304,9 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
TQGridLayout *grid = new TQGridLayout( schedGroup, 0, 0, KDmh, KDsh );
grid->addRowSpacing( 0, schedGroup->fontMetrics().height() - 5 );
- grid->addWidget( lab1, 1, 0, Qt::AlignRight );
+ grid->addWidget( lab1, 1, 0, TQt::AlignRight );
grid->addWidget( le_start, 1, 1 );
- grid->addWidget( lab2, 2, 0, Qt::AlignRight );
+ grid->addWidget( lab2, 2, 0, TQt::AlignRight );
grid->addWidget( le_timeout, 2, 1 );
grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
@@ -494,7 +494,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
// first line of buttons
hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
- hbuttonbox->setAlignment( Qt::AlignHCenter );
+ hbuttonbox->setAlignment( TQt::AlignHCenter );
// Reboot
FlatButton* btnReboot = new FlatButton( lfrm );
@@ -538,7 +538,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
// cancel buttonbox
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
- hbuttonbox2->setAlignment( Qt::AlignRight );
+ hbuttonbox2->setAlignment( TQt::AlignRight );
// Back to tdm
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
@@ -885,13 +885,13 @@ TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout,
strt = i18n("now");
else {
qdt.setTime_t( start );
- strt = qdt.toString( Qt::LocalDate );
+ strt = qdt.toString( TQt::LocalDate );
}
if (timeout == TO_INF)
end = i18n("infinite");
else {
qdt.setTime_t( timeout );
- end = qdt.toString( Qt::LocalDate );
+ end = qdt.toString( TQt::LocalDate );
}
TQString trg =
i18n("Owner: %1"
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index 969833511..361f73e06 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -379,7 +379,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
#ifdef DRAW_OUTLINE
// Draw bounding rect for this item
- p->setPen( Qt::white );
+ p->setPen( TQt::white );
p->drawRect( area );
#endif
diff --git a/twin/bridge.cpp b/twin/bridge.cpp
index f79382457..5a9365dbe 100644
--- a/twin/bridge.cpp
+++ b/twin/bridge.cpp
@@ -147,7 +147,7 @@ TQWidget* Bridge::initialParentWidget() const
return NULL;
}
-Qt::WFlags Bridge::initialWFlags() const
+TQt::WFlags Bridge::initialWFlags() const
{
return 0;
}
diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h
index 5e8c3d35c..558ac848a 100644
--- a/twin/clients/plastik/plastik.h
+++ b/twin/clients/plastik/plastik.h
@@ -93,7 +93,7 @@ public:
int borderSize() { return m_borderSize; }
bool animateButtons() { return m_animateButtons; }
bool menuClose() { return m_menuClose; }
- Qt::AlignmentFlags titleAlign() { return m_titleAlign; }
+ TQt::AlignmentFlags titleAlign() { return m_titleAlign; }
bool reverseLayout() { return m_reverse; }
TQColor getColor(KWinPlastik::ColorType type, const bool active = true);
@@ -113,7 +113,7 @@ private:
int m_titleHeightTool;
TQFont m_titleFont;
TQFont m_titleFontTool;
- Qt::AlignmentFlags m_titleAlign;
+ TQt::AlignmentFlags m_titleAlign;
// pixmap cache
TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state...
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index ad3d768c7..bb2c465a6 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const
buttonsLeftWidth() - buttonsRightWidth() -
marginLeft - marginRight;
- Qt::AlignmentFlags a = Handler()->titleAlign();
+ TQt::AlignmentFlags a = Handler()->titleAlign();
int tX, tW; // position/width of the title buffer
if (caption.width() > titleWidth) {
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 954ff1774..a1c92c8cb 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -234,7 +234,7 @@ TQWidget* KDecorationPreviewBridge::initialParentWidget() const
return preview;
}
-Qt::WFlags KDecorationPreviewBridge::initialWFlags() const
+TQt::WFlags KDecorationPreviewBridge::initialWFlags() const
{
return 0;
}
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 6034a613e..c706eb5df 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -188,7 +188,7 @@ TQWidget* KDecorationPreviewBridge::initialParentWidget() const
return preview;
}
-Qt::WFlags KDecorationPreviewBridge::initialWFlags() const
+TQt::WFlags KDecorationPreviewBridge::initialWFlags() const
{
return 0;
}