summaryrefslogtreecommitdiffstats
path: root/cervisia/settingsdlg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cervisia/settingsdlg.cpp')
-rw-r--r--cervisia/settingsdlg.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index eecdd41f..f1437f24 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -25,7 +25,7 @@
#include <tqgrid.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqwidgetlist.h>
#include <tqhbuttongroup.h>
@@ -52,7 +52,7 @@ namespace
inline TQPixmap LoadIcon(const char* iconName)
{
KIconLoader* loader = KGlobal::instance()->iconLoader();
- return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup,
+ return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup,
KIcon::SizeMedium);
}
}
@@ -73,7 +73,7 @@ void FontButton::chooseFont()
return;
setFont(newFont);
- tqrepaint(false);
+ repaint(false);
}
@@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam
addDiffPage();
//
- // tqStatus Options
+ // Status Options
//
addStatusPage();
@@ -204,7 +204,7 @@ void SettingsDialog::writeSettings()
CervisiaSettings::setDiffDeleteColor(m_diffDeleteButton->color());
// I'm not yet sure whether this is a hack or not :-)
- TQWidgetListIt it(*TQApplication::tqallWidgets());
+ TQWidgetListIt it(*TQApplication::allWidgets());
for (; it.current(); ++it)
{
TQWidget *w = it.current();
@@ -236,24 +236,24 @@ void SettingsDialog::addGeneralPage()
{
TQFrame* generalPage = addPage(i18n("General"), TQString(),
LoadIcon("misc"));
- TQVBoxLayout* tqlayout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
+ TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
TQLabel *usernamelabel = new TQLabel( i18n("&User name for the change log editor:"), generalPage );
usernameedit = new KLineEdit(generalPage);
usernameedit->setFocus();
usernamelabel->setBuddy(usernameedit);
- tqlayout->addWidget(usernamelabel);
- tqlayout->addWidget(usernameedit);
+ layout->addWidget(usernamelabel);
+ layout->addWidget(usernameedit);
TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage );
cvspathedit = new KURLRequester(generalPage);
cvspathlabel->setBuddy(cvspathedit);
- tqlayout->addWidget(cvspathlabel);
- tqlayout->addWidget(cvspathedit);
+ layout->addWidget(cvspathlabel);
+ layout->addWidget(cvspathedit);
- tqlayout->addStretch();
+ layout->addStretch();
}
@@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage()
m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."),
fontGroupBox);
- TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal,
+ TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal,
i18n("Colors"), lookPage);
- tqcolorGroupBox->setColumns(4);
- tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint());
+ colorGroupBox->setColumns(4);
+ colorGroupBox->setInsideSpacing(KDialog::spacingHint());
- TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox);
- m_conflictButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox);
+ m_conflictButton = new KColorButton(colorGroupBox);
conflictLabel->setBuddy(m_conflictButton);
- TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox);
- m_diffChangeButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox);
+ m_diffChangeButton = new KColorButton(colorGroupBox);
diffChangeLabel->setBuddy(m_diffChangeButton);
- TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox);
- m_localChangeButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox);
+ m_localChangeButton = new KColorButton(colorGroupBox);
localChangeLabel->setBuddy(m_localChangeButton);
- TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox);
- m_diffInsertButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox);
+ m_diffInsertButton = new KColorButton(colorGroupBox);
diffInsertLabel->setBuddy(m_diffInsertButton);
- TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox);
- m_remoteChangeButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox);
+ m_remoteChangeButton = new KColorButton(colorGroupBox);
remoteChangeLabel->setBuddy( m_remoteChangeButton );
- TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox);
- m_diffDeleteButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox);
+ m_diffDeleteButton = new KColorButton(colorGroupBox);
diffDeleteLabel->setBuddy(m_diffDeleteButton);
- TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox);
- m_notInCvsButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox);
+ m_notInCvsButton = new KColorButton(colorGroupBox);
notInCvsLabel->setBuddy(m_notInCvsButton);
m_splitterBox = new TQCheckBox(i18n("Split main window &horizontally"), lookPage);