From 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:09 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0. --- cervisia/settingsdlg.cpp | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'cervisia/settingsdlg.cpp') diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp index f1437f24..eecdd41f 100644 --- a/cervisia/settingsdlg.cpp +++ b/cervisia/settingsdlg.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ namespace inline TQPixmap LoadIcon(const char* iconName) { KIconLoader* loader = KGlobal::instance()->iconLoader(); - return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup, + return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup, KIcon::SizeMedium); } } @@ -73,7 +73,7 @@ void FontButton::chooseFont() return; setFont(newFont); - repaint(false); + tqrepaint(false); } @@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam addDiffPage(); // - // Status Options + // tqStatus 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::allWidgets()); + TQWidgetListIt it(*TQApplication::tqallWidgets()); for (; it.current(); ++it) { TQWidget *w = it.current(); @@ -236,24 +236,24 @@ void SettingsDialog::addGeneralPage() { TQFrame* generalPage = addPage(i18n("General"), TQString(), LoadIcon("misc")); - TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint()); + TQVBoxLayout* tqlayout = 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); - layout->addWidget(usernamelabel); - layout->addWidget(usernameedit); + tqlayout->addWidget(usernamelabel); + tqlayout->addWidget(usernameedit); TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage ); cvspathedit = new KURLRequester(generalPage); cvspathlabel->setBuddy(cvspathedit); - layout->addWidget(cvspathlabel); - layout->addWidget(cvspathedit); + tqlayout->addWidget(cvspathlabel); + tqlayout->addWidget(cvspathedit); - layout->addStretch(); + tqlayout->addStretch(); } @@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage() m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."), fontGroupBox); - TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal, + TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal, i18n("Colors"), lookPage); - colorGroupBox->setColumns(4); - colorGroupBox->setInsideSpacing(KDialog::spacingHint()); + tqcolorGroupBox->setColumns(4); + tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint()); - TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox); - m_conflictButton = new KColorButton(colorGroupBox); + TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox); + m_conflictButton = new KColorButton(tqcolorGroupBox); conflictLabel->setBuddy(m_conflictButton); - TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox); - m_diffChangeButton = new KColorButton(colorGroupBox); + TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox); + m_diffChangeButton = new KColorButton(tqcolorGroupBox); diffChangeLabel->setBuddy(m_diffChangeButton); - TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox); - m_localChangeButton = new KColorButton(colorGroupBox); + TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox); + m_localChangeButton = new KColorButton(tqcolorGroupBox); localChangeLabel->setBuddy(m_localChangeButton); - TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox); - m_diffInsertButton = new KColorButton(colorGroupBox); + TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox); + m_diffInsertButton = new KColorButton(tqcolorGroupBox); diffInsertLabel->setBuddy(m_diffInsertButton); - TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox); - m_remoteChangeButton = new KColorButton(colorGroupBox); + TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox); + m_remoteChangeButton = new KColorButton(tqcolorGroupBox); remoteChangeLabel->setBuddy( m_remoteChangeButton ); - TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox); - m_diffDeleteButton = new KColorButton(colorGroupBox); + TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox); + m_diffDeleteButton = new KColorButton(tqcolorGroupBox); diffDeleteLabel->setBuddy(m_diffDeleteButton); - TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox); - m_notInCvsButton = new KColorButton(colorGroupBox); + TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox); + m_notInCvsButton = new KColorButton(tqcolorGroupBox); notInCvsLabel->setBuddy(m_notInCvsButton); m_splitterBox = new TQCheckBox(i18n("Split main window &horizontally"), lookPage); -- cgit v1.2.3