diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp
index d374eaed..8cdeb030 100644
--- a/cervisia/annotatectl.cpp
+++ b/cervisia/annotatectl.cpp
@@ -170,7 +170,7 @@ void AnnotateController::Private::parseCvsAnnotateOutput()
{
TQString dateString = line.mid(23, 9);
if( !dateString.isEmpty() )
- logInfo.m_dateTime.setTime_t(KRFCDate::parseDate(dateString), Qt::UTC);
+ logInfo.m_dateTime.setTime_t(KRFCDate::parseDate(dateString), TQt::UTC);
rev = line.left(13).stripWhiteSpace();
logInfo.m_author = line.mid(14, 8).stripWhiteSpace();
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 8cf00d37..63fb5976 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -129,8 +129,8 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
// an explaination
if( cvsService )
{
- Qt::Orientation o = splitHorz ? Qt::Vertical
- : Qt::Horizontal;
+ TQt::Orientation o = splitHorz ? TQt::Vertical
+ : TQt::Horizontal;
splitter = new TQSplitter(o, parentWidget, widgetName);
// avoid PartManager's warning that Part's window can't handle focus
splitter->setFocusPolicy( TQWidget::StrongFocus );
@@ -1635,8 +1635,8 @@ void CervisiaPart::slotConfigure()
conf->setGroup("LookAndFeel");
bool splitHorz = conf->readBoolEntry("SplitHorizontally",true);
splitter->setOrientation( splitHorz ?
- Qt::Vertical :
- Qt::Horizontal);
+ TQt::Vertical :
+ TQt::Horizontal);
}
void CervisiaPart::slotHelp()
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 0a0b4486..dadf606f 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -33,7 +33,7 @@
static inline TQString DateStringISO8601()
{
- return TQDate::currentDate().toString(Qt::ISODate);
+ return TQDate::currentDate().toString(TQt::ISODate);
}
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 29a07d68..11086c9a 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -66,7 +66,7 @@ LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
, cvsService(0)
, partConfig(cfg)
{
- TQSplitter *splitter = new TQSplitter(Qt::Vertical, this);
+ TQSplitter *splitter = new TQSplitter(TQt::Vertical, this);
setMainWidget(splitter);
tree = new LogTreeView(this);
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 47bd4115..a5986f7e 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -169,7 +169,7 @@ void LogListView::contentsMousePressEvent(TQMouseEvent *e)
// Retrieve revision
const TQString revision = selItem->text(LogListViewItem::Revision);
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
// If the control key was pressed, then we change revision B not A
if( e->state() & ControlButton )
@@ -177,7 +177,7 @@ void LogListView::contentsMousePressEvent(TQMouseEvent *e)
else
emit revisionClicked(revision, false);
}
- else if ( e->button() == Qt::MidButton )
+ else if ( e->button() == TQt::MidButton )
emit revisionClicked(revision, true);
}
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index cde3c132..bcc0e97d 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -69,7 +69,7 @@ void LogMessageEdit::setCompletedItems(const TQStringList&)
void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
{
- bool noModifier = (event->state() == Qt::NoButton ||
+ bool noModifier = (event->state() == TQt::NoButton ||
event->state() == ShiftButton ||
event->state() == Keypad);
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 864e31ee..06899a10 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -433,8 +433,8 @@ void LogTreeView::paintRevisionCell(TQPainter *p,
void LogTreeView::contentsMousePressEvent(TQMouseEvent *e)
{
- if ( e->button() == Qt::MidButton ||
- e->button() == Qt::LeftButton)
+ if ( e->button() == TQt::MidButton ||
+ e->button() == TQt::LeftButton)
{
int row = rowAt( e->pos().y() );
int col = columnAt( e->pos().x() );
@@ -446,8 +446,8 @@ void LogTreeView::contentsMousePressEvent(TQMouseEvent *e)
{
// Change selection for revision B if the middle mouse button or
// the left mouse button with the control key was pressed
- bool changeRevB = (e->button() == Qt::MidButton) ||
- (e->button() == Qt::LeftButton &&
+ bool changeRevB = (e->button() == TQt::MidButton) ||
+ (e->button() == TQt::LeftButton &&
e->state() & ControlButton);
emit revisionClicked(it.current()->m_logInfo.m_revision, changeRevB);
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index 22eca6da..6c02819c 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -1420,7 +1420,7 @@ void QtTableView::resizeEvent( TQResizeEvent * )
void QtTableView::wheelEvent( TQWheelEvent * e )
{
- if( e->orientation() ==Qt::Vertical && vScrollBar && vScrollBar->isVisible() )
+ if( e->orientation() ==TQt::Vertical && vScrollBar && vScrollBar->isVisible() )
TQApplication::sendEvent( vScrollBar, e );
}
@@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
{
QtTableView *that = (QtTableView*)this; // semantic const
if ( !vScrollBar ) {
- TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that );
+ TQScrollBar *sb = new TQScrollBar( TQt::Vertical, that );
#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
@@ -1474,7 +1474,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
{
QtTableView *that = (QtTableView*)this; // semantic const
if ( !hScrollBar ) {
- TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that );
+ TQScrollBar *sb = new TQScrollBar( TQt::Horizontal, that );
#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 8cc5e97e..60a35257 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -178,7 +178,7 @@ RepositoryDialog::RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService,
connect(m_repoList, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(slotSelectionChanged()));
- KButtonBox* actionbox = new KButtonBox(mainWidget, Qt::Vertical);
+ KButtonBox* actionbox = new KButtonBox(mainWidget, TQt::Vertical);
TQPushButton* addbutton = actionbox->addButton(i18n("&Add..."));
m_modifyButton = actionbox->addButton(i18n("&Modify..."));
m_removeButton = actionbox->addButton(i18n("&Remove"));
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 850f681c..ce3ce533 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -108,9 +108,9 @@ ResolveDialog::ResolveDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
- TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget);
+ TQSplitter *vertSplitter = new TQSplitter(TQt::Vertical, mainWidget);
- TQSplitter *splitter = new TQSplitter(Qt::Horizontal, vertSplitter);
+ TQSplitter *splitter = new TQSplitter(TQt::Horizontal, vertSplitter);
TQWidget *versionALayoutWidget = new TQWidget(splitter);
TQBoxLayout *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5);
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index d9383bc6..33f0b935 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -262,7 +262,7 @@ void SettingsDialog::addGeneralPage()
*/
void SettingsDialog::addDiffPage()
{
- TQGrid *diffPage = addGridPage(2, Qt::Horizontal, i18n("Diff Viewer"),
+ TQGrid *diffPage = addGridPage(2, TQt::Horizontal, i18n("Diff Viewer"),
TQString(), LoadIcon("vcs_diff"));
TQLabel *contextlabel = new TQLabel( i18n("&Number of context lines in diff dialog:"), diffPage );
@@ -328,7 +328,7 @@ void SettingsDialog::addLookAndFeelPage()
TQVBox* lookPage = addVBoxPage(i18n("Appearance"), TQString(),
LoadIcon("preferences-desktop"));
- TQGroupBox* fontGroupBox = new TQGroupBox(4, Qt::Vertical, i18n("Fonts"),
+ TQGroupBox* fontGroupBox = new TQGroupBox(4, TQt::Vertical, i18n("Fonts"),
lookPage);
fontGroupBox->setInsideSpacing(KDialog::spacingHint());
@@ -341,7 +341,7 @@ void SettingsDialog::addLookAndFeelPage()
m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."),
fontGroupBox);
- TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal,
+ TQGroupBox* colorGroupBox = new TQGroupBox(4, TQt::Horizontal,
i18n("Colors"), lookPage);
colorGroupBox->setColumns(4);
colorGroupBox->setInsideSpacing(KDialog::spacingHint());
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 1b0e788e..37fc36f5 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -359,7 +359,7 @@ void UpdateDirItem::syncWithEntries()
// const TQDateTime date(TQDateTime::fromString(timestamp)); // UTC Time
const TQDateTime date(parseDateTime(timestamp)); // UTC Time
TQDateTime fileDateUTC;
- fileDateUTC.setTime_t(entry.m_dateTime.toTime_t(), Qt::UTC);
+ fileDateUTC.setTime_t(entry.m_dateTime.toTime_t(), TQt::UTC);
if (date != fileDateUTC)
entry.m_status = Cervisia::LocallyModified;
}
@@ -566,7 +566,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
// tag date.
const unsigned int dateTimeInSeconds(tagDateTimeUtc.toTime_t());
TQDateTime dateTime;
- dateTime.setTime_t(dateTimeInSeconds, Qt::UTC);
+ dateTime.setTime_t(dateTimeInSeconds, TQt::UTC);
const int localUtcOffset(dateTime.secsTo(tagDateTimeUtc));
const TQDateTime tagDateTimeLocal(tagDateTimeUtc.addSecs(localUtcOffset));
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index d81e1b23..8eed87f5 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -2507,7 +2507,7 @@ void CatalogManagerView::showEvent(TQShowEvent*)
void CatalogManagerView::contentsMousePressEvent(TQMouseEvent* event)
{
- if(event->button() == Qt::LeftButton)
+ if(event->button() == TQt::LeftButton)
_pressPos=event->pos();
TQListView::contentsMousePressEvent( event );
@@ -2515,7 +2515,7 @@ void CatalogManagerView::contentsMousePressEvent(TQMouseEvent* event)
void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
{
- if(event->state() & Qt::LeftButton)
+ if(event->state() & TQt::LeftButton)
{
const int delay = TDEGlobalSettings::dndEventDelay();
if(TQABS( event->pos().x() - _pressPos.x() ) >= delay ||
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 66926de2..401e63e8 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -47,7 +47,7 @@ using namespace KBabel;
FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
:FindDialog(forReplace, parent)
{
- TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
+ TQGroupBox* box = new TQGroupBox(2, TQt::Horizontal, i18n("File Options"), mainWidget());
mainWidget()->layout()->add(box);
_inAllFiles = new TQCheckBox(i18n("&In all files"),box);
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index a3c4fdcd..fcf50750 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -1807,12 +1807,12 @@ TQString Catalog::dateTime() const
switch(options.dateFormat)
{
- case Qt::LocalDate:
+ case TQt::LocalDate:
{
dateTimeString = TDEGlobal::locale()->formatDateTime( dt );
break;
}
- case Qt::ISODate:
+ case TQt::ISODate:
{
dateTimeString = dt.toString("yyyy-MM-dd hh:mm");
TQTime t;
@@ -1823,7 +1823,7 @@ TQString Catalog::dateTime() const
dateTimeString += t.toString("hhmm");
break;
}
- case Qt::TextDate:
+ case TQt::TextDate:
{
dateTimeString = options.customDateFormat;
diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h
index f1426a3c..552f88c5 100644
--- a/kbabel/common/catalogsettings.h
+++ b/kbabel/common/catalogsettings.h
@@ -63,7 +63,7 @@ struct KDE_EXPORT SaveSettings
int encoding;
bool useOldEncoding;
- Qt::DateFormat dateFormat;
+ TQt::DateFormat dateFormat;
TQString customDateFormat;
TQString projectString;
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 35ce08a5..cdd99b05 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -250,7 +250,7 @@ SaveSettings Project::saveSettings ()
settings.autoSyntaxCheck = _settings->autoSyntaxCheck();
settings.saveObsolete = _settings->saveObsolete();
settings.customDateFormat = _settings->customDateFormat();
- settings.dateFormat = (Qt::DateFormat)_settings->dateFormat();
+ settings.dateFormat = (TQt::DateFormat)_settings->dateFormat();
settings.updateDescription = _settings->updateDescription();
settings.descriptionString = _settings->descriptionString();
settings.updateTranslatorCopyright = _settings->updateTranslatorCopyright();
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 34b63685..4f695fb4 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -105,7 +105,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
_replaceCombo=0;
}
- _buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page);
+ _buttonGrp = new TQButtonGroup(3, TQt::Horizontal, i18n("Where to Search"), page);
connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int)));
layout->addWidget(_buttonGrp);
@@ -118,7 +118,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
"to search."));
- TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page);
+ TQGroupBox* box = new TQGroupBox(2, TQt::Horizontal, i18n("Options"), page);
layout->addWidget(box);
_caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box);
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 2b5becb3..203d28c0 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -131,7 +131,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
+ TQGroupBox* box=new TQGroupBox(1,TQt::Horizontal,page);
layout->addWidget(box);
box->setMargin(KDialog::marginHint());
@@ -140,13 +140,13 @@ SavePreferences::SavePreferences(TQWidget *parent)
_autoCheckButton = new TQCheckBox(i18n("Chec&k syntax of file when saving"),box, "kcfg_AutoSyntaxCheck");
_saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete");
- TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page);
+ TQGroupBox* descBox=new TQGroupBox(1,TQt::Horizontal,i18n("De&scription"),page);
layout->addWidget(descBox);
descBox->setMargin(KDialog::marginHint());
_descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString");
- TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding")
+ TQGroupBox* encodingBox = new TQGroupBox(1,TQt::Horizontal,i18n("Encoding")
,page);
encodingBox->setMargin(KDialog::marginHint());
layout->addWidget(encodingBox);
@@ -175,7 +175,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
_oldEncodingButton = new TQCheckBox(i18n("Kee&p the encoding of the file")
,encodingBox, "kcfg_UseOldEncoding");
- _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page );
+ _autoSaveBox = new TQGroupBox( 1, TQt::Horizontal, i18n( "Automatic Saving" ), page );
_autoSaveBox->setMargin( KDialog::marginHint( ) );
layout->addWidget( _autoSaveBox );
_autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" );
@@ -192,7 +192,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page);
+ TQGroupBox* gridBox = new TQGroupBox(2,TQt::Horizontal,i18n("Fields to Update"),page);
layout->addWidget(gridBox);
gridBox->setMargin(KDialog::marginHint());
@@ -203,7 +203,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
_encodingButton = new TQCheckBox(i18n("&Encoding"),gridBox, "kcfg_UpdateEncoding");
_projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject");
- TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat");
+ TQButtonGroup* dateBox = new TQButtonGroup(2,TQt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat");
layout->addWidget(dateBox);
box->setMargin(KDialog::marginHint());
@@ -222,7 +222,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
connect( _customDateButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( customDateActivated(bool) ) );
- TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String")
+ TQGroupBox* projectBox = new TQGroupBox(1,TQt::Horizontal,i18n("Project String")
,page);
projectBox->setMargin(KDialog::marginHint());
layout->addWidget(projectBox);
@@ -243,14 +243,14 @@ SavePreferences::SavePreferences(TQWidget *parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page);
+ TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,TQt::Horizontal, page);
translatorCopyrightBox->setMargin(KDialog::marginHint());
_translatorCopyrightButton =
new TQCheckBox(i18n("Update &translator copyright")
,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright");
layout->addWidget(translatorCopyrightBox);
- TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright");
+ TQGroupBox* fsfBox=new TQButtonGroup(1,TQt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright");
layout->addWidget(fsfBox);
fsfBox->setMargin(KDialog::marginHint());
@@ -369,13 +369,13 @@ void SavePreferences::defaults(const KBabel::SaveSettings& _settings)
switch(_settings.dateFormat)
{
- case Qt::ISODate:
+ case TQt::ISODate:
_defaultDateButton->setChecked(true);
break;
- case Qt::LocalDate:
+ case TQt::LocalDate:
_localDateButton->setChecked(true);
break;
- case Qt::TextDate:
+ case TQt::TextDate:
_customDateButton->setChecked(true);
break;
}
@@ -412,7 +412,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
layout->addWidget(new TQLabel(i18n("Project: %1").arg(project),page));
}
- TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page);
+ TQGroupBox* group = new TQGroupBox(2,TQt::Horizontal,page);
layout->addWidget(group);
group->setMargin(KDialog::marginHint());
@@ -461,7 +461,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
TQWhatsThis::add(group,whatsThisMsg);
- group = new TQGroupBox(1,Qt::Horizontal,page);
+ group = new TQGroupBox(1,TQt::Horizontal,page);
layout->addWidget(group);
group->setMargin(KDialog::marginHint());
@@ -667,7 +667,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
+ TQGroupBox* box=new TQGroupBox(1,TQt::Horizontal,page);
box->setMargin(KDialog::marginHint());
layout->addWidget(box);
@@ -883,7 +883,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
+ TQGroupBox* box=new TQGroupBox(1,TQt::Horizontal,page);
box->setMargin(KDialog::marginHint());
layout->addWidget(box);
@@ -917,7 +917,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
"tree."));
- box=new TQGroupBox(1,Qt::Horizontal,page);
+ box=new TQGroupBox(1,TQt::Horizontal,page);
box->setMargin(KDialog::marginHint());
layout->addWidget(box);
@@ -985,7 +985,7 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page );
+ TQGroupBox* box = new TQGroupBox( 1 , TQt::Horizontal , i18n("Commands for Folders") , page );
box->setMargin( KDialog::marginHint() );
layout->addWidget( box );
@@ -1048,7 +1048,7 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page );
+ TQGroupBox* box=new TQGroupBox( 1 , TQt::Horizontal , i18n("Commands for Files") , page );
box->setMargin( KDialog::marginHint() );
layout->addWidget( box );
@@ -1111,7 +1111,7 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
layout->setSpacing(KDialog::spacingHint());
layout->setMargin(KDialog::marginHint());
- TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page);
+ TQGroupBox* box=new TQGroupBox(2, TQt::Horizontal,i18n("Shown Columns"),page);
box->setMargin(KDialog::marginHint());
layout->addWidget(box);
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 677b68ee..654bee27 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -77,7 +77,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
,partTransCounter(0)
,totalTried(0)
{
- setButtonBoxOrientation(Qt::Vertical);
+ setButtonBoxOrientation(TQt::Vertical);
setButtonText(User1,i18n("&Start"));
setButtonText(User2,i18n("S&top"));
setButtonText(User3,i18n("C&ancel"));
diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp
index ff5d1df5..50dcedd4 100644
--- a/kbabel/kbabel/gotodialog.cpp
+++ b/kbabel/kbabel/gotodialog.cpp
@@ -40,7 +40,7 @@
GotoDialog::GotoDialog(int max,TQWidget* parent)
: KDialogBase(parent,0,true,i18n("Go to Entry"),Ok|Cancel)
{
- TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,i18n("Go to Entry"),this);
+ TQGroupBox* box=new TQGroupBox(1,TQt::Horizontal,i18n("Go to Entry"),this);
_spinBox= new KIntSpinBox(1,max,1,1,10,box);
setMainWidget(box);
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index ea46b9ac..3d614f68 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -1252,7 +1252,7 @@ void MsgMultiLineEdit::highlight()
{
TQColor c;
TQFont f;
- Qt::VerticalAlignment v;
+ TQt::VerticalAlignment v;
getFormat(_firstChangedLine-1, paragraphLength(_firstChangedLine-1)-1, &f, &c, &v);
TQString l = text(_firstChangedLine-1);
if( c==_tagColor && !l.endsWith(">") ) // hope _tagColor will be different than other colors
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index bb0b108c..d1d8dafd 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -265,11 +265,11 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
mainLayout->addLayout(hbox);
- resultSplitter = new TQSplitter(Qt::Vertical,this
+ resultSplitter = new TQSplitter(TQt::Vertical,this
,"resultsplitter");
mainLayout->addWidget(resultSplitter);
- viewContainer = new TQSplitter(Qt::Vertical,resultSplitter, "singleEntrySplitter");
+ viewContainer = new TQSplitter(TQt::Vertical,resultSplitter, "singleEntrySplitter");
TQVBoxLayout *vbox = new TQVBoxLayout(viewContainer);
vbox->setResizeMode(TQLayout::FreeResize);
origView = new TQTextView(viewContainer,"origView");
diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp
index ce325a31..9daa5e3d 100644
--- a/kbugbuster/backend/bugcache.cpp
+++ b/kbugbuster/backend/bugcache.cpp
@@ -193,7 +193,7 @@ void BugCache::saveBugDetails( const Bug &bug, const BugDetails &details )
for ( it = parts.begin(); it != parts.end(); ++it ) {
senders.append( (*it).sender.fullName() );
texts.append( (*it).text );
- dates.append( (*it).date.toString( Qt::ISODate ) );
+ dates.append( (*it).date.toString( TQt::ISODate ) );
}
m_cacheBugs->writeEntry( "Details", texts );
@@ -228,7 +228,7 @@ BugDetails BugCache::loadBugDetails( const Bug &bug )
TQStringList::ConstIterator itSenders = senders.begin();
TQStringList::ConstIterator itDates = dates.begin();
while( itTexts != texts.end() ) {
- TQDateTime date = TQDateTime::fromString( *itDates, Qt::ISODate );
+ TQDateTime date = TQDateTime::fromString( *itDates, TQt::ISODate );
parts.append( BugDetailsPart( Person(*itSenders), date, *itTexts ) );
++itTexts;
diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp
index 8ca0e1a8..bcc75900 100644
--- a/kbugbuster/backend/domprocessor.cpp
+++ b/kbugbuster/backend/domprocessor.cpp
@@ -194,7 +194,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
else if ( e.tagName() == "severity" )
severity = Bug::stringToSeverity( e.text() );
else if ( e.tagName() == "creationdate" )
- age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::currentDateTime() );
+ age = ( TQDateTime::fromString( e.text(), TQt::ISODate ) ).daysTo( TQDateTime::currentDateTime() );
}
Person submitter( submitterName, submitterEmail );
@@ -397,7 +397,7 @@ bool DomProcessor::parseAttributeLine( const TQString &line, const TQString &key
TQDateTime DomProcessor::parseDate( const TQString &dateStr )
{
- TQDateTime date = TQDateTime::fromString( dateStr, Qt::ISODate );
+ TQDateTime date = TQDateTime::fromString( dateStr, TQt::ISODate );
return date;
}
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index f4e4c793..263c9f86 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -57,9 +57,9 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
KDialog::spacingHint() ) )->setAutoAdd( true );
// Create TQSplitter children
- m_vertSplitter = new TQSplitter( Qt::Vertical, this );
+ m_vertSplitter = new TQSplitter( TQt::Vertical, this );
m_listPane = new CWBugListContainer( m_vertSplitter );
- m_horSplitter = new TQSplitter( Qt::Horizontal,m_vertSplitter );
+ m_horSplitter = new TQSplitter( TQt::Horizontal,m_vertSplitter );
// The search pane isn't used. Should we remove the code?
m_searchPane = new CWSearchWidget( m_horSplitter );
m_bugPane = new CWBugDetailsContainer( m_horSplitter );
diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp
index 5bea95be..a1e10a38 100644
--- a/kbugbuster/gui/msginputdialog.cpp
+++ b/kbugbuster/gui/msginputdialog.cpp
@@ -44,7 +44,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
TQFrame *topFrame = plainPage();
( new TQHBoxLayout( topFrame ) )->setAutoAdd( true );
- mSplitter = new TQSplitter( Qt::Horizontal, topFrame );
+ mSplitter = new TQSplitter( TQt::Horizontal, topFrame );
TQWidget *w = new TQWidget( mSplitter );
( new TQVBoxLayout( w, spacingHint(), -1 ) )->setAutoAdd( true );
diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp
index d228cf86..ccd18880 100644
--- a/kbugbuster/gui/packageselectdialog.cpp
+++ b/kbugbuster/gui/packageselectdialog.cpp
@@ -46,7 +46,7 @@ PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) :
setMainWidget( topWidget );
TQBoxLayout *topLayout = new TQVBoxLayout( topWidget );
- TQSplitter *topSplitter = new TQSplitter( Qt::Vertical, topWidget );
+ TQSplitter *topSplitter = new TQSplitter( TQt::Vertical, topWidget );
topSplitter->setOpaqueResize( true );
topLayout->addWidget( topSplitter );
diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp
index 20ca0267..a7a99478 100644
--- a/kbugbuster/gui/preferencesdialog.cpp
+++ b/kbugbuster/gui/preferencesdialog.cpp
@@ -113,7 +113,7 @@ void PreferencesDialog::setupAdvancedPage()
TQBoxLayout *layout = new TQVBoxLayout( topFrame );
layout->setSpacing( spacingHint() );
- TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal,
+ TQButtonGroup *mailGroup = new TQButtonGroup( 1,TQt::Horizontal,
i18n( "Mail Client" ), topFrame );
layout->addWidget( mailGroup );
diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp
index bef2640b..f256cfdc 100644
--- a/kbugbuster/gui/severityselectdialog.cpp
+++ b/kbugbuster/gui/severityselectdialog.cpp
@@ -13,7 +13,7 @@
SeveritySelectDialog::SeveritySelectDialog(TQWidget *parent,const char *name) :
KDialogBase( parent, name, true, i18n("Select Severity"), Ok|Cancel )
{
- mButtonGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n("Severity"), this );
+ mButtonGroup = new TQButtonGroup( 1,TQt::Horizontal, i18n("Severity"), this );
setMainWidget( mButtonGroup );
TQValueList severities = Bug::severities();
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 31c881f8..e5bd5fc8 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -53,7 +53,7 @@ KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name )
m_destination( "" ),
m_info( 0 )
{
- m_splitter = new TQSplitter( Qt::Horizontal );
+ m_splitter = new TQSplitter( TQt::Horizontal );
setWidget( m_splitter );
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 2cd74f54..35b40f2e 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -41,7 +41,7 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
ViewSettings* settings,
KompareSplitter* parent,
const char* name ) :
- TQSplitterHandle(Qt::Horizontal, (TQSplitter *)parent, name),
+ TQSplitterHandle(TQt::Horizontal, (TQSplitter *)parent, name),
m_wid ( left, right, settings, this, name ),
m_label ( "", this ),
m_layout ( this )
@@ -75,7 +75,7 @@ static int kMouseOffset;
void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e )
{
- if ( !(e->state()&Qt::LeftButton) )
+ if ( !(e->state()&TQt::LeftButton) )
return;
TQCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
@@ -86,14 +86,14 @@ void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e )
void KompareConnectWidgetFrame::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
kMouseOffset = s->pick( e->pos() );
TQSplitterHandle::mousePressEvent(e);
}
void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( !opaque() && e->button() == Qt::LeftButton ) {
+ if ( !opaque() && e->button() == TQt::LeftButton ) {
TQCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
- kMouseOffset;
((KompareSplitter*)s)->moveSplitter( pos, id() );
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 5be663ba..6300837e 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -36,7 +36,7 @@ using namespace Diff2;
KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
const char *name) :
- TQSplitter(Qt::Horizontal, parent, name ),
+ TQSplitter(TQt::Horizontal, parent, name ),
m_settings( settings )
{
TQFrame *scrollFrame = new TQFrame( parent, "scrollFrame" );
@@ -46,9 +46,9 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
scrollFrame->setLineWidth(scrollFrame->style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
- m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame );
+ m_vScroll = new TQScrollBar( TQt::Vertical, scrollFrame );
pairlayout->addWidget( m_vScroll, 0, 1 );
- m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame );
+ m_hScroll = new TQScrollBar( TQt::Horizontal, scrollFrame );
pairlayout->addWidget( m_hScroll, 1, 0 );
new KompareListViewFrame(true, m_settings, this, "source");
@@ -229,7 +229,7 @@ void KompareSplitter::moveSplitter( TQCOORD p, int id )
int* ws = new int[d->list.count()];
TQWidget *w = 0;
bool upLeft;
- if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) {
int q = p + s->wid->width();
doMove( FALSE, q, id - 1, -1, (p > max), poss, ws );
doMove( TRUE, q, id, -1, (p < min), poss, ws );
@@ -408,7 +408,7 @@ void KompareSplitter::repaintHandles()
void KompareSplitter::wheelEvent( TQWheelEvent* e )
{
// scroll lines...
- if ( e->orientation() == Qt::Vertical )
+ if ( e->orientation() == TQt::Vertical )
{
if ( e->state() & TQt::ControlButton )
if ( e->delta() < 0 ) // scroll down one page
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index b855a52f..c8819b24 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -38,19 +38,19 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
layout->setSpacing( KDialog::spacingHint() );
layout->setMargin( KDialog::marginHint() );
- m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this. :)", page );
+ m_firstGB = new TQGroupBox( 1, TQt::Vertical, "You have to set this. :)", page );
m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" );
m_firstURLRequester = new KURLRequester( m_firstURLComboBox, m_firstGB );
m_firstURLRequester->setFocus();
- m_secondGB = new TQGroupBox( 1, Qt::Vertical, "This too!", page );
+ m_secondGB = new TQGroupBox( 1, TQt::Vertical, "This too!", page );
m_secondURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_secondGB, "DestURLComboBox" );
m_secondURLRequester = new KURLRequester( m_secondURLComboBox, m_secondGB );
connect( m_firstURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setSecondURL( const TQString & ) ) );
connect( m_secondURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setFirstURL( const TQString & ) ) );
- m_thirdGB = new TQGroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page );
+ m_thirdGB = new TQGroupBox( 1, TQt::Vertical, i18n( "Encoding" ), page );
m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
m_encodingComboBox->insertStringList( TDEGlobal::charsets()->availableEncodingNames() );
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index b09f6b3d..9a410f35 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -48,7 +48,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
layout->setMargin( KDialog::marginHint() );
// add a groupbox
- colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+ colorGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n( "Colors" ), page );
layout->addWidget( colorGroupBox );
colorGroupBox->setMargin( KDialog::marginHint() );
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index 61338b91..9613021f 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program " );
headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language " );
TQString revisionDate ( "PO-Revision-Date: " );
- const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC );
+ const TQDateTime dt = TQDateTime::currentDateTime( TQt::UTC );
revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" );
headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate );
headerLines << "Plural-Forms: nplurals=1; plural=0;";
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index f8c0e30d..5cce0546 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
}
}
- const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC );
+ const TQDateTime now = TQDateTime::currentDateTime( TQt::UTC );
cout << "# SOME DESCRIPTIVE TITLE.\n";
cout << "# FIRST AUTHOR , YEAR.\n";
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index ee8a8331..e04b89d4 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -1132,7 +1132,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
if (p && p->device()->devType() == TQInternal::Widget) {
TQHeader* hdr = dynamic_cast(p->device());
if (hdr)
- horizontal = hdr->orientation() ==Qt::Horizontal;
+ horizontal = hdr->orientation() ==TQt::Horizontal;
}
int x,y,w,h;
@@ -1624,7 +1624,7 @@ void StyleCheckStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
// -------------------------------------------------------------------
case KPE_SliderGroove: {
const TQSlider* slider = (const TQSlider*)widget;
- bool horizontal = slider->orientation() ==Qt::Horizontal;
+ bool horizontal = slider->orientation() ==TQt::Horizontal;
int gcenter = (horizontal ? r.height() : r.width()) / 2;
TQRect gr;
@@ -1658,7 +1658,7 @@ void StyleCheckStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
// -------------------------------------------------------------------
case KPE_SliderHandle: {
const TQSlider* slider = (const TQSlider*)widget;
- bool horizontal = slider->orientation() ==Qt::Horizontal;
+ bool horizontal = slider->orientation() ==TQt::Horizontal;
int x,y,w,h;
r.rect(&x, &y, &w, &h);
int x2 = x+w-1;
@@ -2108,14 +2108,14 @@ void StyleCheckStyle::drawControl( ControlElement element,
// Draw the pixmap
if ( pixmap->depth() == 1 )
- p->setBackgroundMode( Qt::OpaqueMode );
+ p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( w - pixmap->width() ) / 2 )
+ ( ( w - pixmap->width() ) % 2 );
p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
if ( pixmap->depth() == 1 )
- p->setBackgroundMode( Qt::TransparentMode );
+ p->setBackgroundMode( TQt::TransparentMode );
}
}
@@ -2354,7 +2354,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control,
TQRect pr = parent->rect();
renderGradient( p, r, cg.button(),
- parent->orientation() == Qt::Vertical,
+ parent->orientation() == TQt::Vertical,
r.x(), r.y(), pr.width()-2, pr.height()-2);
}
else if (widget->parent()->inherits("TQToolBarExtensionWidget"))
@@ -2363,7 +2363,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control,
TQToolBar* toolbar = (TQToolBar*)parent->parent();
TQRect tr = toolbar->rect();
- if ( toolbar->orientation() == Qt::Horizontal ) {
+ if ( toolbar->orientation() == TQt::Horizontal ) {
renderGradient( p, r, cg.button(), false, r.x(), r.y(),
r.width(), tr.height() );
} else {
diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el
index 3e700ed3..5e5c156b 100644
--- a/scripts/kde-emacs/kde-emacs-semantic.el
+++ b/scripts/kde-emacs/kde-emacs-semantic.el
@@ -320,7 +320,7 @@ class-token has to be a token representing either a class or a struct."
aslot nil)
)
((kde-label-namespace (car (semantic-token-extent elt)))
- ;;NAMESPACE - semantic doesn't handle things like Qt::ButtonState correctly
+ ;;NAMESPACE - semantic doesn't handle things like TQt::ButtonState correctly
;; so we do ;)
(set namespace (kde-label-namespace (car (semantic-token-extent elt))))
)
diff --git a/tdecachegrind/tdecachegrind/multiview.cpp b/tdecachegrind/tdecachegrind/multiview.cpp
index 628eefab..349db8d6 100644
--- a/tdecachegrind/tdecachegrind/multiview.cpp
+++ b/tdecachegrind/tdecachegrind/multiview.cpp
@@ -38,7 +38,7 @@ MultiView::MultiView(TopLevel* top, TQWidget* parent, const char* name)
: TQSplitter(parent, name), TraceItemView(0, top)
{
// default
- setOrientation(Qt::Horizontal);
+ setOrientation(TQt::Horizontal);
appendView();
_active = _views.first();
@@ -177,7 +177,7 @@ void MultiView::readViewConfig(TDEConfig* c,
int n = g->readNumEntry("Panels", 1);
setChildCount(n);
setOrientation( (g->readEntry("Orientation") == TQString("Horizontal")) ?
- Qt::Horizontal : Qt::Vertical );
+ TQt::Horizontal : TQt::Vertical );
setSizes(g->readIntListEntry("PanelSizes"));
@@ -208,7 +208,7 @@ void MultiView::saveViewConfig(TDEConfig* c,
g.writeEntry("Panels", childCount());
g.writeEntry("Orientation",
- (orientation() == Qt::Horizontal) ?
+ (orientation() == TQt::Horizontal) ?
"Horizontal" : "Vertical");
g.writeEntry("PanelSizes", sizes());
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index 2805c51f..b8cd09f5 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -52,7 +52,7 @@ TabBar::TabBar(TabView* v, TQTabWidget* parent, const char *name)
void TabBar::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton) {
+ if (e->button() == TQt::RightButton) {
TQTab *tab = selectTab( e->pos() );
TQWidget* page;
page = tab ? _tabWidget->page( indexOf( tab->identifier() ) ) :0;
@@ -114,7 +114,7 @@ void TabBar::mousePressEvent(TQMouseEvent *e)
// Splitter
//
-Splitter::Splitter(Qt::Orientation o, TQWidget* parent, const char* name)
+Splitter::Splitter(TQt::Orientation o, TQWidget* parent, const char* name)
: TQSplitter(o, parent, name)
{}
@@ -242,8 +242,8 @@ TabView::TabView(TraceItemView* parentView,
_nameLabel->setText(i18n("(No profile data file loaded)"));
vbox->addWidget( _nameLabel );
- _mainSplitter = new TQSplitter(Qt::Horizontal, this);
- _leftSplitter = new Splitter(Qt::Vertical, _mainSplitter, "Left");
+ _mainSplitter = new TQSplitter(TQt::Horizontal, this);
+ _leftSplitter = new Splitter(TQt::Vertical, _mainSplitter, "Left");
vbox->addWidget( _mainSplitter );
_rightTW = new TabWidget(this, _mainSplitter, "Right");
@@ -258,7 +258,7 @@ TabView::TabView(TraceItemView* parentView,
connect(_topTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)),
this, TQT_SLOT(visibleRectChangedSlot(TabWidget*)));
- _bottomSplitter = new Splitter(Qt::Horizontal,
+ _bottomSplitter = new Splitter(TQt::Horizontal,
_leftSplitter, "Bottom");
_leftTW = new TabWidget(this, _bottomSplitter, "Left");
diff --git a/tdecachegrind/tdecachegrind/tabview.h b/tdecachegrind/tdecachegrind/tabview.h
index 9369928f..fe7ae424 100644
--- a/tdecachegrind/tdecachegrind/tabview.h
+++ b/tdecachegrind/tdecachegrind/tabview.h
@@ -65,7 +65,7 @@ class Splitter: public TQSplitter
public:
- Splitter(Qt::Orientation o, TQWidget* parent = 0, const char* name = 0);
+ Splitter(TQt::Orientation o, TQWidget* parent = 0, const char* name = 0);
void checkVisiblity();
protected:
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 82bdb8c3..b9675a0e 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -266,7 +266,7 @@ void TopLevel::restoreCurrentState(TQString postfix)
_multiView->readViewConfig(tdeconfig, TQString("MainView"), postfix, true);
_taSplit->setChecked(_multiView->childCount()>1);
_taSplitDir->setEnabled(_multiView->childCount()>1);
- _taSplitDir->setChecked(_multiView->orientation() == Qt::Horizontal);
+ _taSplitDir->setChecked(_multiView->orientation() == TQt::Horizontal);
}
@@ -2031,13 +2031,13 @@ void TopLevel::splitSlot()
_taSplit->setChecked(count>1);
_taSplitDir->setEnabled(count>1);
- _taSplitDir->setChecked(_multiView->orientation() == Qt::Horizontal);
+ _taSplitDir->setChecked(_multiView->orientation() == TQt::Horizontal);
}
void TopLevel::splitDirSlot()
{
_multiView->setOrientation( _taSplitDir->isChecked() ?
- Qt::Horizontal : Qt::Vertical );
+ TQt::Horizontal : TQt::Vertical );
}
diff --git a/tdecachegrind/tdecachegrind/toplevel.h b/tdecachegrind/tdecachegrind/toplevel.h
index 9df242be..0a31d0b7 100644
--- a/tdecachegrind/tdecachegrind/toplevel.h
+++ b/tdecachegrind/tdecachegrind/toplevel.h
@@ -216,7 +216,7 @@ private:
TQLabel* _statusLabel;
TDERecentFilesAction* _openRecent;
bool _twoMainWidgets;
- Qt::Orientation _spOrientation;
+ TQt::Orientation _spOrientation;
MultiView* _multiView;
FunctionSelection* _functionSelection;
diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index d77fb1e9..f70f4a4f 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -1852,7 +1852,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e )
}
// item under mouse always selected on right button press
- if (e->button() == Qt::RightButton) {
+ if (e->button() == TQt::RightButton) {
TreeMapItem* changed2 = setTmpSelected(item, true);
if (changed2) changed = changed2->commonParent(changed);
}
@@ -1862,7 +1862,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e )
if (changed)
redraw(changed);
- if (e->button() == Qt::RightButton) {
+ if (e->button() == TQt::RightButton) {
// emit selection change
if (! (_tmpSelection == _selection)) {
diff --git a/tdecachegrind/tdecachegrind/treemap.h b/tdecachegrind/tdecachegrind/treemap.h
index dfe73cda..c0bd6d5d 100644
--- a/tdecachegrind/tdecachegrind/treemap.h
+++ b/tdecachegrind/tdecachegrind/treemap.h
@@ -234,10 +234,10 @@ public:
* longest side of rectangle left for drawing
* Best: Choose split direction for all subitems of an area
* depending on longest side
- * HAlternate:Qt::Horizontal at top; alternate direction on depth step
- * VAlternate:Qt::Vertical at top; alternate direction on depth step
- * Qt::Horizontal: Always horizontal split direction
- * Qt::Vertical: Always vertical split direction
+ * HAlternate: Horizontal at top; alternate direction on depth step
+ * VAlternate: Vertical at top; alternate direction on depth step
+ * Horizontal: Always horizontal split direction
+ * Vertical: Always vertical split direction
*/
enum SplitMode { Bisection, Columns, Rows,
AlwaysBest, Best,
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index bbff1aa6..756283d4 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -46,7 +46,7 @@ AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* )
insertButton(m_Pixmaps[alac_align_vertical_distribute], alac_align_vertical_distribute, true, i18n("Align Vertical Distribute"));
insertButton(m_Pixmaps[alac_align_horizontal_distribute], alac_align_horizontal_distribute, true, i18n("Align Horizontal Distribute"));
- setOrientation( Qt::Vertical );
+ setOrientation( TQt::Vertical );
setVerticalStretchable( true );
// gets called whenever a button in the toolbar is clicked
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 0e2ec525..aa0e1683 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -916,14 +916,14 @@ TQString AssociationWidget::toString() {
}
void AssociationWidget::mouseDoubleClickEvent(TQMouseEvent * me) {
- if (me->button() != Qt::RightButton && me->button() != Qt::LeftButton)
+ if (me->button() != TQt::RightButton && me->button() != TQt::LeftButton)
return;
int i = m_LinePath.onLinePath(me->pos());
if (i == -1) {
m_LinePath.setSelected(false);
return;
}
- if (me->button() != Qt::LeftButton)
+ if (me->button() != TQt::LeftButton)
return;
const TQPoint mp(me->pos());
/* if there is no point around the mouse pointer, we insert a new one */
@@ -2169,7 +2169,7 @@ void AssociationWidget::selectAssocClassLine(bool sel /* =true */) {
void AssociationWidget::mousePressEvent(TQMouseEvent * me) {
m_nMovingPoint = -1;
//make sure we should be here depending on the button
- if(me -> button() != Qt::RightButton && me->button() != Qt::LeftButton)
+ if(me -> button() != TQt::RightButton && me->button() != TQt::LeftButton)
return;
TQPoint mep = me->pos();
// See if `mep' is on the connecting line to the association class
@@ -2187,7 +2187,7 @@ void AssociationWidget::mousePressEvent(TQMouseEvent * me) {
}
void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) {
- if(me -> button() != Qt::RightButton && me->button() != Qt::LeftButton) {
+ if(me -> button() != TQt::RightButton && me->button() != TQt::LeftButton) {
setSelected( false );
return;
}
@@ -2208,7 +2208,7 @@ void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) {
m_nMovingPoint = -1;
const TQPoint p = me->pos();
- if (me->button() != Qt::RightButton) {
+ if (me->button() != TQt::RightButton) {
return;
}
@@ -2500,7 +2500,7 @@ void AssociationWidget::checkPoints(const TQPoint &p) {
}
void AssociationWidget::mouseMoveEvent(TQMouseEvent* me) {
- if( me->state() != Qt::LeftButton) {
+ if( me->state() != TQt::LeftButton) {
return;
}
diff --git a/umbrello/umbrello/classifierwidget.cpp b/umbrello/umbrello/classifierwidget.cpp
index 24da6833..3482a69f 100644
--- a/umbrello/umbrello/classifierwidget.cpp
+++ b/umbrello/umbrello/classifierwidget.cpp
@@ -554,7 +554,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) {
if ( tlist.count() > 0 ) {
UMLWidget::setPen(p);
TQPen pen = p.pen();
- pen.setStyle(Qt::DotLine);
+ pen.setStyle(TQt::DotLine);
p.setPen(pen);
p.drawRect( offsetX + width() - templatesBoxSize.width(), offsetY,
templatesBoxSize.width(), templatesBoxSize.height() );
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 71cef4e0..9262949e 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -59,11 +59,11 @@ void ActivityPage::setupPage() {
m_pUpArrowB -> setEnabled( false );
buttonLayout -> addWidget( m_pUpArrowB );
- m_pDownArrowB = new KArrowButton( m_pActivityGB, Qt::DownArrow );
+ m_pDownArrowB = new KArrowButton( m_pActivityGB, TQt::DownArrow );
m_pDownArrowB -> setEnabled( false );
buttonLayout -> addWidget( m_pDownArrowB );
- m_pBottomArrowB = new KArrowButton( m_pActivityGB, Qt::DownArrow );
+ m_pBottomArrowB = new KArrowButton( m_pActivityGB, TQt::DownArrow );
m_pBottomArrowB -> setEnabled( false );
buttonLayout -> addWidget( m_pBottomArrowB );
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index 4d44b44d..b4028f18 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -85,11 +85,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
m_pUpArrowB->setEnabled( false );
buttonLayout->addWidget( m_pUpArrowB );
- m_pDownArrowB = new KArrowButton( m_pItemListGB, Qt::DownArrow );
+ m_pDownArrowB = new KArrowButton( m_pItemListGB, TQt::DownArrow );
m_pDownArrowB->setEnabled( false );
buttonLayout->addWidget( m_pDownArrowB );
- m_pBottomArrowB = new KArrowButton( m_pItemListGB, Qt::DownArrow );
+ m_pBottomArrowB = new KArrowButton( m_pItemListGB, TQt::DownArrow );
m_pBottomArrowB->setEnabled( false );
buttonLayout->addWidget( m_pBottomArrowB );
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 4ac471a8..76b224c0 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -133,7 +133,7 @@ void UMLOperationDialog::setupDialog() {
m_pUpButton->setEnabled( false );
buttonLayout->addWidget( m_pUpButton );
- m_pDownButton = new KArrowButton( m_pParmsGB, Qt::DownArrow );
+ m_pDownButton = new KArrowButton( m_pParmsGB, TQt::DownArrow );
m_pDownButton->setEnabled( false );
buttonLayout->addWidget( m_pDownButton );
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index 767aae23..9df37596 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -73,7 +73,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
m_frame = new KPlayerPopupFrame;
m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
m_frame -> setLineWidth (2);
- m_slider = new KPlayerSlider (Qt::Vertical, m_frame);
+ m_slider = new KPlayerSlider (TQt::Vertical, m_frame);
m_frame -> resize (36, m_slider -> sizeHint().height() + 4);
m_slider -> setGeometry (m_frame -> contentsRect());
//CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n";
@@ -159,7 +159,7 @@ void KPlayerPopupSliderAction::slotActivated (void)
KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcut& cut,
const TQObject* receiver, const char* slot, TDEActionCollection* parent, const char* name)
- : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
+ : KWidgetAction (new KPlayerSlider (TQt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
//: TDEAction (text, 0, parent, name)
{
setAutoSized (true);
@@ -187,7 +187,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index)
return result;
TDEToolBar* toolbar = (TDEToolBar*) widget;
//int id = getToolButtonID();
- //kdDebug() << "Qt::Orientation: " << toolbar -> orientation() << "\n";
+ //kdDebug() << "TQt::Orientation: " << toolbar -> orientation() << "\n";
//m_slider -> reparent (toolbar, TQPoint());
//toolbar -> insertWidget (id, 0, m_slider, index);
//toolbar -> setItemAutoSized (id, true);
@@ -199,7 +199,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index)
//addContainer (toolbar, id);
//setupToolbar (toolbar -> orientation(), toolbar);
orientationChanged (toolbar -> orientation());
- connect (toolbar, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));
+ connect (toolbar, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation)));
//connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed()));
//if ( parentCollection() )
// parentCollection() -> connectHighlight (toolbar, this);
@@ -216,7 +216,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
if ( ! slider() || ! isPlugged() || widget != slider() -> parent() )
return;
//TDEToolBar* toolbar = (TDEToolBar*) widget;
- disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));
+ disconnect (widget, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation)));
//disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed()));
//m_slider -> reparent (0, TQPoint());
/*int index = findContainer (toolbar);
@@ -226,9 +226,9 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
removeContainer (index);*/
}
-/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, TDEToolBar* toolbar)
+/*void KPlayerSliderAction::setupToolbar (TQt::Orientation orientation, TDEToolBar* toolbar)
{
- if ( orientation == Qt::Horizontal )
+ if ( orientation == TQt::Horizontal )
{
// toolbar -> setMinimumWidth (300);
// toolbar -> setMinimumHeight (0);
@@ -248,7 +248,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
}
}*/
-void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation)
+void KPlayerSliderAction::orientationChanged (TQt::Orientation orientation)
{
//if ( sender() && sender() -> inherits ("TDEToolBar") )
// setupToolbar (orientation, (TDEToolBar*) sender());
@@ -264,7 +264,7 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation)
m_slider -> reparent (0, TQPoint());
}*/
-KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name)
+KPlayerSlider::KPlayerSlider (TQt::Orientation orientation, TQWidget* parent, const char* name)
//CHANGED : TQSlider (orientation, parent, name)
: TQSlider (300, 2200, 400, 1000, orientation, parent, name)
{
@@ -283,7 +283,7 @@ TQSize KPlayerSlider::sizeHint() const
TQSize hint = TQSlider::sizeHint();
//CHANGED int length = kPlayerSettings() -> preferredSliderLength();
int length = 200;
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
{
if ( hint.width() < length )
hint.setWidth (length);
@@ -302,7 +302,7 @@ TQSize KPlayerSlider::minimumSizeHint() const
TQSize hint = TQSlider::minimumSizeHint();
//CHANGED int length = kPlayerSettings() -> minimumSliderLength();
int length = 200;
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
{
if ( hint.width() < length )
hint.setWidth (length);
@@ -315,7 +315,7 @@ TQSize KPlayerSlider::minimumSizeHint() const
return hint;
}
-void KPlayerSlider::setOrientation (Qt::Orientation o)
+void KPlayerSlider::setOrientation (TQt::Orientation o)
{
if ( o == orientation() )
return;
@@ -332,14 +332,14 @@ void KPlayerSlider::setOrientation (Qt::Orientation o)
int KPlayerSlider::minValue (void) const
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
return TQSlider::minValue();
return - TQSlider::maxValue();
}
void KPlayerSlider::setMinValue (int minValue)
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
TQSlider::setMinValue (minValue);
else
TQSlider::setMaxValue (- minValue);
@@ -347,14 +347,14 @@ void KPlayerSlider::setMinValue (int minValue)
int KPlayerSlider::maxValue (void) const
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
return TQSlider::maxValue();
return - TQSlider::minValue();
}
void KPlayerSlider::setMaxValue (int maxValue)
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
TQSlider::setMaxValue (maxValue);
else
TQSlider::setMinValue (- maxValue);
@@ -383,14 +383,14 @@ void KPlayerSlider::setPageStep (int pageStep)
int KPlayerSlider::value (void) const
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
return TQSlider::value();
return - TQSlider::value();
}
void KPlayerSlider::setValue (int value, int)
{
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
TQSlider::setValue (value);
else
TQSlider::setValue (- value);
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index e77c1b4e..40b73e50 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -31,7 +31,7 @@ class KPlayerSlider : public TQSlider
public:
/** The KPlayerSlider constructor. Parameters are passed on to TQSlider.
*/
- explicit KPlayerSlider (Qt::Orientation, TQWidget* parent = 0, const char* name = 0);
+ explicit KPlayerSlider (TQt::Orientation, TQWidget* parent = 0, const char* name = 0);
/** The KPlayerSlider destructor. Does nothing.
*/
virtual ~KPlayerSlider();
@@ -79,7 +79,7 @@ public:
void setup (int minValue, int maxValue, int value, int pageStep, int lineStep = 1);
/** Sets the slider orientation.
*/
- virtual void setOrientation (Qt::Orientation);
+ virtual void setOrientation (TQt::Orientation);
signals:
/** Emitted when the slider value changes.
@@ -195,7 +195,7 @@ public:
protected slots:
/** Changes the slider orientation when the toolbar orientation changes.
*/
- void orientationChanged (Qt::Orientation);
+ void orientationChanged (TQt::Orientation);
protected:
/** The slider.
diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp
index f3227c31..09906491 100644
--- a/umbrello/umbrello/messagewidget.cpp
+++ b/umbrello/umbrello/messagewidget.cpp
@@ -120,7 +120,7 @@ void MessageWidget::drawArrow(TQPainter& p, int x, int y, int w,
// draw arrow line
if (useDottedLine) {
TQPen pen = p.pen();
- pen.setStyle(Qt::DotLine);
+ pen.setStyle(TQt::DotLine);
p.setPen(pen);
}
p.drawLine(x, y, x + w, y);
diff --git a/umbrello/umbrello/toolbarstate.cpp b/umbrello/umbrello/toolbarstate.cpp
index bf0ae9f0..cae6acf8 100644
--- a/umbrello/umbrello/toolbarstate.cpp
+++ b/umbrello/umbrello/toolbarstate.cpp
@@ -221,7 +221,7 @@ void ToolBarState::mouseMoveEmpty() {
}
void ToolBarState::changeTool() {
- if (m_pMouseEvent->state() == Qt::RightButton) {
+ if (m_pMouseEvent->state() == TQt::RightButton) {
UMLApp::app()->getWorkToolBar()->setDefaultTool();
}
}
diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp
index cbcbc20f..a24c4353 100644
--- a/umbrello/umbrello/toolbarstatearrow.cpp
+++ b/umbrello/umbrello/toolbarstatearrow.cpp
@@ -42,7 +42,7 @@ void ToolBarStateArrow::mousePressWidget() {
}
void ToolBarStateArrow::mousePressEmpty() {
- if (m_pMouseEvent->button() != Qt::LeftButton) {
+ if (m_pMouseEvent->button() != TQt::LeftButton) {
// Leave widgets selected upon RMB press on empty diagram area.
// The popup menu is activated upon RMB release.
return;
@@ -76,7 +76,7 @@ void ToolBarStateArrow::mouseReleaseWidget() {
void ToolBarStateArrow::mouseReleaseEmpty() {
if (m_selectionRect.count() == 4) {
m_selectionRect.clear();
- } else if (m_pMouseEvent->button() == Qt::RightButton) {
+ } else if (m_pMouseEvent->button() == TQt::RightButton) {
m_pUMLView->setMenu();
}
}
diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp
index 36017912..9129740a 100644
--- a/umbrello/umbrello/toolbarstateassociation.cpp
+++ b/umbrello/umbrello/toolbarstateassociation.cpp
@@ -72,7 +72,7 @@ void ToolBarStateAssociation::slotWidgetRemoved(UMLWidget* widget) {
}
void ToolBarStateAssociation::mouseReleaseAssociation() {
- if (m_pMouseEvent->button() != Qt::LeftButton ||
+ if (m_pMouseEvent->button() != TQt::LeftButton ||
!m_firstWidget || m_firstWidget->getBaseType() != Uml::wt_Class) {
cleanAssociation();
return;
@@ -85,7 +85,7 @@ void ToolBarStateAssociation::mouseReleaseAssociation() {
}
void ToolBarStateAssociation::mouseReleaseWidget() {
- if (m_pMouseEvent->button() != Qt::LeftButton) {
+ if (m_pMouseEvent->button() != TQt::LeftButton) {
cleanAssociation();
return;
}
diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp
index f8e5930a..47c5a387 100644
--- a/umbrello/umbrello/toolbarstatemessages.cpp
+++ b/umbrello/umbrello/toolbarstatemessages.cpp
@@ -85,7 +85,7 @@ void ToolBarStateMessages::setCurrentElement() {
void ToolBarStateMessages::mouseReleaseWidget() {
//TODO When an association between UMLObjects of invalid types is made, an error message
//is shown. Shouldn't also a message be used here?
- if (m_pMouseEvent->button() != Qt::LeftButton ||
+ if (m_pMouseEvent->button() != TQt::LeftButton ||
getCurrentWidget()->getBaseType() != Uml::wt_Object) {
cleanMessage();
return;
diff --git a/umbrello/umbrello/toolbarstateother.cpp b/umbrello/umbrello/toolbarstateother.cpp
index 718ac456..736afa17 100644
--- a/umbrello/umbrello/toolbarstateother.cpp
+++ b/umbrello/umbrello/toolbarstateother.cpp
@@ -42,7 +42,7 @@ void ToolBarStateOther::setCurrentElement() {
}
void ToolBarStateOther::mouseReleaseEmpty() {
- if (m_pMouseEvent->button() == Qt::LeftButton) {
+ if (m_pMouseEvent->button() == TQt::LeftButton) {
if (!newWidget()) {
// Is UMLObject?
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index b0d6e5fd..7e0ba7ec 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -1214,7 +1214,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) {
TQDomElement root = doc.createElement( "XMI" );
root.setAttribute( "xmi.version", "1.2" );
TQDateTime now = TQDateTime::currentDateTime();
- root.setAttribute( "timestamp", now.toString(Qt::ISODate));
+ root.setAttribute( "timestamp", now.toString(TQt::ISODate));
root.setAttribute( "verified", "false");
root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3");
doc.appendChild( root );
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 9753b81a..cf38403c 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -145,7 +145,7 @@ bool UMLListView::eventFilter(TQObject *o, TQEvent *e) {
if (e->type() != TQEvent::MouseButtonPress || !o->isA("TQHeader"))
return TQListView::eventFilter(o, e);
TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
- if (me->button() == Qt::RightButton) {
+ if (me->button() == TQt::RightButton) {
if (m_pMenu) {
m_pMenu->hide();
disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int)));
@@ -169,19 +169,19 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) {
UMLListViewItem * item = (UMLListViewItem*)itemAt(pt);
const TQt::ButtonState button = me->button();
- if (!item || (button != Qt::RightButton && button != Qt::LeftButton)) {
+ if (!item || (button != TQt::RightButton && button != TQt::LeftButton)) {
UMLApp::app()->getDocWindow()->updateDocumentation(true);
return;
}
- if (button == Qt::LeftButton) {
+ if (button == TQt::LeftButton) {
UMLObject *o = item->getUMLObject();
if (o)
UMLApp::app()->getDocWindow()->showDocumentation(o, false);
else
UMLApp::app()->getDocWindow()->updateDocumentation(true);
}
- if (button == Qt::RightButton) {
+ if (button == TQt::RightButton) {
if(m_pMenu != 0) {
m_pMenu->hide();
disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int)));
@@ -198,7 +198,7 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) {
}
void UMLListView::contentsMouseReleaseEvent(TQMouseEvent *me) {
- if (me->button() != Qt::LeftButton) {
+ if (me->button() != TQt::LeftButton) {
this->TDEListView::contentsMouseReleaseEvent(me);
return;
}
@@ -1041,7 +1041,7 @@ void UMLListView::setView(UMLView * v) {
void UMLListView::contentsMouseDoubleClickEvent(TQMouseEvent * me) {
UMLListViewItem * item = static_cast( currentItem() );
- if( !item || me -> button() != Qt::LeftButton )
+ if( !item || me -> button() != TQt::LeftButton )
return;
//see if on view
Uml::ListView_Type lvType = item -> getType();
diff --git a/umbrello/umbrello/umlwidgetcontroller.cpp b/umbrello/umbrello/umlwidgetcontroller.cpp
index efd0e4a3..d647f397 100644
--- a/umbrello/umbrello/umlwidgetcontroller.cpp
+++ b/umbrello/umbrello/umlwidgetcontroller.cpp
@@ -59,9 +59,9 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) {
return;
}
- if (me->button() == Qt::LeftButton) {
+ if (me->button() == TQt::LeftButton) {
m_leftButtonDown = true;
- } else if (me->button() == Qt::RightButton) {
+ } else if (me->button() == TQt::RightButton) {
m_rightButtonDown = true;
} else {
m_middleButtonDown = true;
@@ -77,7 +77,7 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) {
if (me->state() == TQt::ShiftButton || me->state() == TQt::ControlButton) {
m_shiftPressed = true;
- if (me->button() == Qt::LeftButton) {
+ if (me->button() == TQt::LeftButton) {
m_inMoveArea = true;
}
@@ -92,7 +92,7 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) {
m_shiftPressed = false;
int count = m_widget->m_pView->getSelectCount(true);
- if (me->button() == Qt::LeftButton) {
+ if (me->button() == TQt::LeftButton) {
if (m_widget->m_bSelected && count > 1) {
//Single selection is made in release event if the widget wasn't moved
m_inMoveArea = true;
@@ -189,12 +189,12 @@ void UMLWidgetController::mouseMoveEvent(TQMouseEvent* me) {
}
void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) {
- if (me->button() != Qt::LeftButton && me->button() != Qt::RightButton) {
+ if (me->button() != TQt::LeftButton && me->button() != TQt::RightButton) {
if (m_middleButtonDown) {
m_middleButtonDown = false;
resetSelection();
}
- } else if (me->button() == Qt::LeftButton) {
+ } else if (me->button() == TQt::LeftButton) {
if (m_leftButtonDown) {
m_leftButtonDown = false;
@@ -238,7 +238,7 @@ void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) {
m_inMoveArea = false;
}
}
- } else if (me->button() == Qt::RightButton) {
+ } else if (me->button() == TQt::RightButton) {
if (m_rightButtonDown) {
m_rightButtonDown = false;
showPopupMenu(me);
@@ -246,11 +246,11 @@ void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) {
//Cancel move/edit
TQMouseEvent move(TQMouseEvent::MouseMove,
TQPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY),
- Qt::LeftButton, Qt::NoButton);
+ TQt::LeftButton, TQt::NoButton);
mouseMoveEvent(&move);
TQMouseEvent release(TQMouseEvent::MouseButtonRelease,
TQPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY),
- Qt::LeftButton, Qt::NoButton);
+ TQt::LeftButton, TQt::NoButton);
mouseReleaseEvent(&release);
}
}
@@ -267,7 +267,7 @@ void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) {
}
void UMLWidgetController::mouseDoubleClickEvent(TQMouseEvent *me) {
- if (me->button() != Qt::LeftButton) {
+ if (me->button() != TQt::LeftButton) {
return;
}
diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp
index f1af2dbd..66cc931a 100644
--- a/umbrello/umbrello/worktoolbar.cpp
+++ b/umbrello/umbrello/worktoolbar.cpp
@@ -32,7 +32,7 @@ WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name)
loadPixmaps();
m_Type = Uml::dt_Class; /* first time in just want it to load arrow,
needs anything but dt_Undefined */
- setOrientation( Qt::Vertical );
+ setOrientation( TQt::Vertical );
setVerticalStretchable( true );
// initialize old tool map, everything starts with select tool (arrow)
m_map.insert(Uml::dt_UseCase,tbb_Arrow);
@@ -210,7 +210,7 @@ void WorkToolBar::slotResetToolBar() {
emit sigButtonChanged(m_CurrentButtonID);
TQCursor curs;
- curs.setShape(Qt::ArrowCursor);
+ curs.setShape(TQt::ArrowCursor);
UMLView* view = UMLApp::app()->getCurrentView();
if (view != NULL) {