diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-27 04:09:42 +0200 |
commit | 1177a9f23b1c9929bef9464f434d82273783204c (patch) | |
tree | bb02f26d98266ad9b7501307ab3013edd1b55ea7 /src/libgui | |
parent | adc9148343ca4ef148414cec1a6b38eb9636c029 (diff) | |
download | piklab-1177a9f23b1c9929bef9464f434d82273783204c.tar.gz piklab-1177a9f23b1c9929bef9464f434d82273783204c.zip |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 9d9fe02a944fe0719c2475739411727a729251ad)
Diffstat (limited to 'src/libgui')
-rw-r--r-- | src/libgui/device_gui.cpp | 4 | ||||
-rw-r--r-- | src/libgui/device_gui.h | 2 | ||||
-rw-r--r-- | src/libgui/likeback.cpp | 24 | ||||
-rw-r--r-- | src/libgui/project_wizard.cpp | 2 | ||||
-rw-r--r-- | src/libgui/text_editor.cpp | 2 | ||||
-rw-r--r-- | src/libgui/toplevel.cpp | 50 | ||||
-rw-r--r-- | src/libgui/toplevel.h | 6 | ||||
-rw-r--r-- | src/libgui/toplevel_ui.cpp | 6 | ||||
-rw-r--r-- | src/libgui/toplevel_ui.h | 2 |
9 files changed, 49 insertions, 49 deletions
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index bb91cea..fafd5a1 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -147,7 +147,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren shbox = new TQHBoxLayout(vbox); // status filter - _statusCombo = new EnumComboBox<Device::tqStatus>(i18n("<Status>"), "status", frame); + _statusCombo = new EnumComboBox<Device::Status>(i18n("<Status>"), "status", frame); connect(_statusCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList())); shbox->addWidget(_statusCombo->combo()); @@ -274,7 +274,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device) const Device::Data *data = Device::lister().data(list[i]); Q_ASSERT(data); if ( _memoryCombo->value()!=Device::MemoryTechnology::Nb_Types && data->memoryTechnology()!=_memoryCombo->value() ) continue; - if ( _statusCombo->value()!=Device::tqStatus::Nb_Types && data->status()!=_statusCombo->value() ) continue; + if ( _statusCombo->value()!=Device::Status::Nb_Types && data->status()!=_statusCombo->value() ) continue; if ( _featureCombo->value()!=Pic::Feature::Nb_Types ) { if ( data->group().name()!="pic" ) continue; if ( !static_cast<const Pic::Data *>(data)->hasFeature(_featureCombo->value()) ) continue; diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h index de28bbf..887b98c 100644 --- a/src/libgui/device_gui.h +++ b/src/libgui/device_gui.h @@ -105,7 +105,7 @@ private: KeyComboBox<TQString> *_programmerCombo, *_toolCombo; EnumComboBox<ListType> *_listTypeCombo; EnumComboBox<Device::MemoryTechnology> *_memoryCombo; - EnumComboBox<Device::tqStatus> *_statusCombo; + EnumComboBox<Device::Status> *_statusCombo; EnumComboBox<Pic::Feature> *_featureCombo; KListView *_listView; View *_deviceView; diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 2073f03..28e6f19 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -110,7 +110,7 @@ LikeBack::LikeBack(Button buttons) // KMessageBox::saveDontShowAgainContinue(messageShown); // } - resize(tqsizeHint()); + resize(sizeHint()); connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) ); m_timer.start(10); @@ -452,7 +452,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons) if (m_process) return; m_process = new KProcess(); - *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount"); + *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(endFetchingEmailFrom()) ); if (!m_process->start()) { kdDebug() << "Couldn't start kcmshell.." << endl; @@ -473,23 +473,23 @@ void LikeBack::endFetchingEmailFrom() // m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( TQString::tqfromLatin1("emaildefaults") ); + KConfig emailConf( TQString::fromLatin1("emaildefaults") ); // find out the default profile - emailConf.setGroup(TQString::tqfromLatin1("Defaults")); - TQString profile = TQString::tqfromLatin1("PROFILE_"); - profile += emailConf.readEntry(TQString::tqfromLatin1("Profile"), TQString::tqfromLatin1("Default")); + emailConf.setGroup(TQString::fromLatin1("Defaults")); + TQString profile = TQString::fromLatin1("PROFILE_"); + profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default")); emailConf.setGroup(profile); - TQString fromaddr = emailConf.readEntry(TQString::tqfromLatin1("EmailAddress")); + TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress")); if (fromaddr.isEmpty()) { struct passwd *p; p = getpwuid(getuid()); - m_fetchedEmail = TQString::tqfromLatin1(p->pw_name); + m_fetchedEmail = TQString::fromLatin1(p->pw_name); } else { - TQString name = emailConf.readEntry(TQString::tqfromLatin1("FullName")); + TQString name = emailConf.readEntry(TQString::fromLatin1("FullName")); if (!name.isEmpty()) - m_fetchedEmail = /*name + TQString::tqfromLatin1(" <") +*/ fromaddr /*+ TQString::tqfromLatin1(">")*/; + m_fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/; } // m_from->setText( fromaddr ); } @@ -580,7 +580,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS m_comment = new TQTextEdit(coloredWidget); TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail_send", KIcon::Toolbar); m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget); - m_sendButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding); + m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding); m_sendButton->setEnabled(false); connect( m_sendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(send()) ); connect( m_comment, TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) ); @@ -607,7 +607,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS resize(kapp->desktop()->width() / 2, kapp->desktop()->height() / 3); setCaption(kapp->makeStdCaption(i18n("Send a Comment"))); - // setMinimumSize(mainLayout->tqsizeHint()); // FIXME: Doesn't work! + // setMinimumSize(mainLayout->sizeHint()); // FIXME: Doesn't work! } LikeBackDialog::~LikeBackDialog() diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index 78fcd49..35e76b5 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -76,7 +76,7 @@ FileListBox::FileListBox(TQWidget *parent) _listView->header()->setResizeEnabled(false); _listView->header()->setMovingEnabled(false); _listView->setColumnText(0, i18n("Copy")); - int spacing = tqstyle().tqpixelMetric(TQStyle::PM_HeaderMargin); + int spacing = tqstyle().pixelMetric(TQStyle::PM_HeaderMargin); TQFontMetrics fm(font()); _listView->header()->resizeSection(0, fm.width(i18n("Copy")) + 2*spacing); // hack _listView->setColumnText(1, i18n("Filename")); diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index e7f0382..d9d0692 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -96,7 +96,7 @@ void TextEditor::addView() connect(v, TQT_SIGNAL(gotFocus(Kate::View *)), TQT_SLOT(gotFocus(Kate::View *))); connect(v, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(statusChanged())); connect(v, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SIGNAL(dropEventPass(TQDropEvent *))); - connect(v, TQT_SIGNAL(newtqStatus()), TQT_SLOT(statusChanged())); + connect(v, TQT_SIGNAL(newStatus()), TQT_SLOT(statusChanged())); v->show(); v->setFocus(); v->child(0, "KateViewInternal")->installEventFilter(this); diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index f087a4a..b909b82 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -91,23 +91,23 @@ MainWindow::MainWindow() Main::_toplevel = this; // status bar - _actiontqStatus = new TQLabel(statusBar()); - statusBar()->addWidget(_actiontqStatus); + _actionStatus = new TQLabel(statusBar()); + statusBar()->addWidget(_actionStatus); _actionProgress = new TQProgressBar(statusBar()); statusBar()->addWidget(_actionProgress); - _debugtqStatus = new TQLabel(statusBar()); - statusBar()->addWidget(_debugtqStatus, 0, true); - _editortqStatus = new TQLabel(statusBar()); - statusBar()->addWidget(_editortqStatus, 0, true); - _programmertqStatus = new ProgrammerStatusWidget(statusBar()); - connect(_programmertqStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer())); - connect(_programmertqStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &))); - statusBar()->addWidget(_programmertqStatus->widget(), 0, true); - _tooltqStatus = new ToolStatusWidget(statusBar()); - connect(_tooltqStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains())); - connect(_tooltqStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject())); - connect(_tooltqStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &))); - statusBar()->addWidget(_tooltqStatus->widget(), 0, true); + _debugStatus = new TQLabel(statusBar()); + statusBar()->addWidget(_debugStatus, 0, true); + _editorStatus = new TQLabel(statusBar()); + statusBar()->addWidget(_editorStatus, 0, true); + _programmerStatus = new ProgrammerStatusWidget(statusBar()); + connect(_programmerStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer())); + connect(_programmerStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &))); + statusBar()->addWidget(_programmerStatus->widget(), 0, true); + _toolStatus = new ToolStatusWidget(statusBar()); + connect(_toolStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains())); + connect(_toolStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject())); + connect(_toolStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &))); + statusBar()->addWidget(_toolStatus->widget(), 0, true); // interface _mainDock = createDockWidget("main_dock_widget", TQPixmap()); @@ -132,7 +132,7 @@ MainWindow::MainWindow() _mainDock->setWidget(Main::_editorManager); connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(modified(const PURL::Url &)), TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(modified(const PURL::Url &))); - connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editortqStatus, TQT_SLOT(setText(const TQString &))); + connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &))); dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", KIcon::Small), i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80)); @@ -160,15 +160,15 @@ MainWindow::MainWindow() // managers Programmer::manager = new Programmer::GuiManager(TQT_TQOBJECT(this)); Programmer::manager->setView(_programLog); - connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actiontqStatus, TQT_SLOT(setText(const TQString &))); + connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &))); connect(Programmer::manager, TQT_SIGNAL(showProgress(bool)), TQT_SLOT(showProgress(bool))); connect(Programmer::manager, TQT_SIGNAL(setTotalProgress(uint)), TQT_SLOT(setTotalProgress(uint))); connect(Programmer::manager, TQT_SIGNAL(setProgress(uint)), TQT_SLOT(setProgress(uint))); Debugger::manager = new Debugger::GuiManager; connect(Debugger::manager, TQT_SIGNAL(targetStateChanged()), TQT_SLOT(updateGUI())); - connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugtqStatus, TQT_SLOT(setText(const TQString &))); - connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actiontqStatus, TQT_SLOT(setText(const TQString &))); + connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQT_SLOT(setText(const TQString &))); + connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &))); Main::_compileManager = new Compile::Manager(TQT_TQOBJECT(this)); Main::_compileManager->setView(Main::_compileLog); @@ -570,7 +570,7 @@ void MainWindow::updateGUI() showProgress(false); break; case Main::Compiling: - _actiontqStatus->setText(Main::_compileManager->label()); + _actionStatus->setText(Main::_compileManager->label()); showProgress(true); makeWidgetDockVisible(Main::_compileLog); break; @@ -618,7 +618,7 @@ void MainWindow::updateGUI() Main::action("project_add_current_file")->setEnabled(Main::project() && !inProject && idle && isSource); // update build actions - static_cast<PopupButton *>(_tooltqStatus->widget())->setText(" " + Main::toolGroup().label() + " "); + static_cast<PopupButton *>(_toolStatus->widget())->setText(" " + Main::toolGroup().label() + " "); bool hexProject = ( Main::_projectManager->projectUrl().fileType()==PURL::Hex ); bool customTool = Main::toolGroup().isCustom(); Main::action("build_build_project")->setEnabled((Main::project() || (inProject && !hexProject) ) && idle); @@ -630,11 +630,11 @@ void MainWindow::updateGUI() // update programmer status PortType ptype = Programmer::GroupConfig::portType(Main::programmerGroup()); - static_cast<PopupButton *>(_programmertqStatus->widget())->setText(" " + Main::programmerGroup().statusLabel(ptype) + " "); + static_cast<PopupButton *>(_programmerStatus->widget())->setText(" " + Main::programmerGroup().statusLabel(ptype) + " "); TQFont f = font(); bool supported = (Main::deviceData() ? Main::programmerGroup().isSupported(Main::deviceData()->name()) : false); f.setItalic(!supported); - _programmertqStatus->widget()->setFont(f); + _programmerStatus->widget()->setFont(f); bool isProgrammer = ( Main::programmerGroup().properties() & ::Programmer::Programmer ); PURL::Url purl = Main::_projectManager->projectUrl(); bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->contains(purl.toFileType(PURL::Hex)) ); @@ -965,11 +965,11 @@ void MainWindow::showProgress(bool show) { if (show) { PBusyCursor::start(); - _actiontqStatus->show(); + _actionStatus->show(); _actionProgress->show(); } else { PBusyCursor::stop(); - _actiontqStatus->hide(); + _actionStatus->hide(); _actionProgress->hide(); } } diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h index f7ef383..a3c6306 100644 --- a/src/libgui/toplevel.h +++ b/src/libgui/toplevel.h @@ -93,9 +93,9 @@ signals: private: Log::Widget *_programLog; - TQLabel *_actiontqStatus, *_debugtqStatus, *_editortqStatus; - ProgrammerStatusWidget *_programmertqStatus; - ToolStatusWidget *_tooltqStatus; + TQLabel *_actionStatus, *_debugStatus, *_editorStatus; + ProgrammerStatusWidget *_programmerStatus; + ToolStatusWidget *_toolStatus; TQProgressBar *_actionProgress; ConfigGenerator *_configGenerator; ::Process::Base *_pikloopsProcess, *_kfindProcess; diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp index 51abeab..83a92c4 100644 --- a/src/libgui/toplevel_ui.cpp +++ b/src/libgui/toplevel_ui.cpp @@ -65,7 +65,7 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent) : TQToolButton(parent, "menu_bar_button") { TQFontMetrics fm(font()); - int h = fm.height() + 2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this); + int h = fm.height() + 2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this); setFixedHeight(h); KIconLoader loader; setIconSet(loader.loadIconSet(icon, KIcon::Small, fm.height()-2)); @@ -73,7 +73,7 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent) setAutoRaise(true); } -TQSize MenuBarButton::tqsizeHint() const +TQSize MenuBarButton::sizeHint() const { - return TQSize(TQToolButton::tqsizeHint().width(), height()); + return TQSize(TQToolButton::sizeHint().width(), height()); } diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h index 651809c..77ae7fc 100644 --- a/src/libgui/toplevel_ui.h +++ b/src/libgui/toplevel_ui.h @@ -75,7 +75,7 @@ Q_OBJECT TQ_OBJECT public: MenuBarButton(const TQString &icon, TQWidget *parent); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; #endif |