diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 12:34:35 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-18 19:03:13 +0900 |
| commit | ea1f5870db808971e833dd901aac2647d50634bd (patch) | |
| tree | 5eae36dbd282479c91ce1a65c2a7ef8edee0f619 | |
| parent | 21cae41ae67ab4478efda7b6def53fcf7e8003bc (diff) | |
| download | tdegraphics-ea1f5870db808971e833dd901aac2647d50634bd.tar.gz tdegraphics-ea1f5870db808971e833dd901aac2647d50634bd.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c616fab9053b07ed30508ab714de876409d82653)
255 files changed, 2829 insertions, 2829 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 08bd3064..fd9b795c 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -106,36 +106,36 @@ void KKameraConfig::displayGPSuccessDialogue(void) // create list of devices m_deviceSel = new TDEIconView(this); - connect(m_deviceSel, TQT_SIGNAL(rightButtonClicked(TQIconViewItem *, const TQPoint &)), - TQT_SLOT(slot_deviceMenu(TQIconViewItem *, const TQPoint &))); - connect(m_deviceSel, TQT_SIGNAL(doubleClicked(TQIconViewItem *)), - TQT_SLOT(slot_configureCamera())); - connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)), - TQT_SLOT(slot_deviceSelected(TQIconViewItem *))); + connect(m_deviceSel, TQ_SIGNAL(rightButtonClicked(TQIconViewItem *, const TQPoint &)), + TQ_SLOT(slot_deviceMenu(TQIconViewItem *, const TQPoint &))); + connect(m_deviceSel, TQ_SIGNAL(doubleClicked(TQIconViewItem *)), + TQ_SLOT(slot_configureCamera())); + connect(m_deviceSel, TQ_SIGNAL(selectionChanged(TQIconViewItem *)), + TQ_SLOT(slot_deviceSelected(TQIconViewItem *))); m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // create actions TDEAction *act; - act = new TDEAction(i18n("Add"), "camera-photo", 0, this, TQT_SLOT(slot_addCamera()), m_actions, "camera_add"); + act = new TDEAction(i18n("Add"), "camera-photo", 0, this, TQ_SLOT(slot_addCamera()), m_actions, "camera_add"); act->setWhatsThis(i18n("Click this button to add a new camera.")); act->plug(m_toolbar); m_toolbar->insertLineSeparator(); - act = new TDEAction(i18n("Test"), "button_ok", 0, this, TQT_SLOT(slot_testCamera()), m_actions, "camera_test"); + act = new TDEAction(i18n("Test"), "button_ok", 0, this, TQ_SLOT(slot_testCamera()), m_actions, "camera_test"); act->setWhatsThis(i18n("Click this button to remove the selected camera from the list.")); act->plug(m_toolbar); - act = new TDEAction(i18n("Remove"), "edittrash", 0, this, TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove"); + act = new TDEAction(i18n("Remove"), "edittrash", 0, this, TQ_SLOT(slot_removeCamera()), m_actions, "camera_remove"); act->setWhatsThis(i18n("Click this button to remove the selected camera from the list.")); act->plug(m_toolbar); - act = new TDEAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure"); + act = new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(slot_configureCamera()), m_actions, "camera_configure"); act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model.")); act->plug(m_toolbar); - act = new TDEAction(i18n("Information"), "hwinfo", 0, this, TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary"); + act = new TDEAction(i18n("Information"), "hwinfo", 0, this, TQ_SLOT(slot_cameraSummary()), m_actions, "camera_summary"); act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model.")); act->plug(m_toolbar); m_toolbar->insertLineSeparator(); - act = new TDEAction(i18n("Cancel"), "process-stop", 0, this, TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel"); + act = new TDEAction(i18n("Cancel"), "process-stop", 0, this, TQ_SLOT(slot_cancelOperation()), m_actions, "camera_cancel"); act->setWhatsThis(i18n("Click this button to cancel the current camera operation.")); act->setEnabled(false); act->plug(m_toolbar); @@ -188,8 +188,8 @@ void KKameraConfig::load(bool useDefaults ) continue; kcamera = new KCamera(*it,m_config->readEntry("Path")); - connect(kcamera, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &))); - connect(kcamera, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &))); + connect(kcamera, TQ_SIGNAL(error(const TQString &)), TQ_SLOT(slot_error(const TQString &))); + connect(kcamera, TQ_SIGNAL(error(const TQString &, const TQString &)), TQ_SLOT(slot_error(const TQString &, const TQString &))); kcamera->load(m_config); m_devices[*it] = kcamera; } @@ -227,8 +227,8 @@ void KKameraConfig::load(bool useDefaults ) /* kdDebug() << "Adding USB camera: " << portit.data() << " at " << portit.key() << endl; */ kcamera = new KCamera(portit.data(),portit.key()); - connect(kcamera, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &))); - connect(kcamera, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &))); + connect(kcamera, TQ_SIGNAL(error(const TQString &)), TQ_SLOT(slot_error(const TQString &))); + connect(kcamera, TQ_SIGNAL(error(const TQString &, const TQString &)), TQ_SLOT(slot_error(const TQString &, const TQString &))); m_devices[portit.data()] = kcamera; } populateDeviceListView(); @@ -285,8 +285,8 @@ TQString KKameraConfig::suggestName(const TQString &name) void KKameraConfig::slot_addCamera() { KCamera *m_device = new KCamera(TQString(),TQString()); - connect(m_device, TQT_SIGNAL(error(const TQString &)), TQT_SLOT(slot_error(const TQString &))); - connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)), TQT_SLOT(slot_error(const TQString &, const TQString &))); + connect(m_device, TQ_SIGNAL(error(const TQString &)), TQ_SLOT(slot_error(const TQString &))); + connect(m_device, TQ_SIGNAL(error(const TQString &, const TQString &)), TQ_SLOT(slot_error(const TQString &, const TQString &))); KameraDeviceSelectDialog dialog(this, m_device); if (dialog.exec() == TQDialog::Accepted) { dialog.save(); diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index ef1b0a6f..858499ce 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -276,10 +276,10 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de : KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true) { m_device = device; - connect(m_device, TQT_SIGNAL(error(const TQString &)), - TQT_SLOT(slot_error(const TQString &))); - connect(m_device, TQT_SIGNAL(error(const TQString &, const TQString &)), - TQT_SLOT(slot_error(const TQString &, const TQString &))); + connect(m_device, TQ_SIGNAL(error(const TQString &)), + TQ_SLOT(slot_error(const TQString &))); + connect(m_device, TQ_SIGNAL(error(const TQString &, const TQString &)), + TQ_SLOT(slot_error(const TQString &, const TQString &))); TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -292,8 +292,8 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de topLayout->addWidget( m_modelSel ); m_modelSel->addColumn(i18n("Supported Cameras")); m_modelSel->setColumnWidthMode(0, TQListView::Maximum); - connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slot_setModel(TQListViewItem *))); + connect(m_modelSel, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slot_setModel(TQListViewItem *))); // make sure listview only as wide as it needs to be m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); @@ -315,8 +315,8 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de TQWhatsThis::add(m_USBRB, i18n("If this option is checked, the camera would have to be connected to one of the USB slots in your computer or USB hub.")); // Create port settings widget stack m_settingsStack = new TQWidgetStack(m_portSettingsGroup); - connect(m_portSelectGroup, TQT_SIGNAL(clicked(int)), - m_settingsStack, TQT_SLOT(raiseWidget(int))); + connect(m_portSelectGroup, TQ_SIGNAL(clicked(int)), + m_settingsStack, TQ_SLOT(raiseWidget(int))); // none tab m_settingsStack->addWidget(new TQLabel(i18n("No port type selected."), diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index 30b1fc3a..0e85f2d9 100644 --- a/kcoloredit/colorselector.cpp +++ b/kcoloredit/colorselector.cpp @@ -37,16 +37,16 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par TQTabWidget* pages = new TQTabWidget(this); */ gradientSelection = new GradientSelection(this); - connect(gradientSelection, TQT_SIGNAL( valueChanged(Color*) ), - TQT_SLOT( slotGradientSelectionChangeColor(Color*) )); - connect(gradientSelection, TQT_SIGNAL( synchronizeColor() ), - TQT_SLOT( slotGradientSelectionSynchronizeColor() )); - connect(this, TQT_SIGNAL( valueChanged(Color*) ), gradientSelection, TQT_SLOT( slotSetValue(Color*) )); + connect(gradientSelection, TQ_SIGNAL( valueChanged(Color*) ), + TQ_SLOT( slotGradientSelectionChangeColor(Color*) )); + connect(gradientSelection, TQ_SIGNAL( synchronizeColor() ), + TQ_SLOT( slotGradientSelectionSynchronizeColor() )); + connect(this, TQ_SIGNAL( valueChanged(Color*) ), gradientSelection, TQ_SLOT( slotSetValue(Color*) )); /* pages->addTab(gradientSelection, i18n( "Gradient" )); ImageSelection* imageSelection = new ImageSelection(this); - connect(imageSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) )); - connect(this, TQT_SIGNAL( valueChanged(Color*) ), imageSelection, TQT_SLOT( slotSetValue(Color*) )); + connect(imageSelection, TQ_SIGNAL( valueChanged(Color*) ), TQ_SLOT( slotSetColor(Color*) )); + connect(this, TQ_SIGNAL( valueChanged(Color*) ), imageSelection, TQ_SLOT( slotSetValue(Color*) )); pages->addTab(imageSelection, i18n( "Image" )); topLayout->addWidget(pages, 10); */ @@ -55,17 +55,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par topLayout->addWidget(hLine); TQHBoxLayout* layout = new TQHBoxLayout(); TextEditSelection* textEditSelection = new TextEditSelection(this); - connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) )); - connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) )); + connect(textEditSelection, TQ_SIGNAL( valueChanged(Color*) ), TQ_SLOT( slotSetColor(Color*) )); + connect(this, TQ_SIGNAL( valueChanged(Color*) ), textEditSelection, TQ_SLOT( slotSetValue(Color*) )); TQVBoxLayout* colorChangeLayout = new TQVBoxLayout(); colorChangeLayout->setMargin(2); TQRadioButton* replaceButton = new TQRadioButton(i18n( "Replace" ), this); - connect(replaceButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotColorReplace() )); + connect(replaceButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotColorReplace() )); replaceButton->setChecked(true); colorChangeButtons.insert(replaceButton); colorChangeLayout->addWidget(replaceButton); TQRadioButton* changeButton = new TQRadioButton(i18n( "Change" ) + ":", this); - connect(changeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotColorChange() )); + connect(changeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotColorChange() )); colorChangeButtons.insert(changeButton); colorChangeLayout->addWidget(changeButton); colorChangeValue = 0; @@ -76,7 +76,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, TQt::Horizontal, colorChangeSliderWidget); colorChangeSlider->setTickInterval(colorChangeSlider->pageStep()); colorChangeSlider->setTickmarks(TQSlider::Above); - connect(colorChangeSlider, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotColorChangeValueChanged(int) )); + connect(colorChangeSlider, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotColorChangeValueChanged(int) )); colorChangeSliderLayout->addWidget(colorChangeSlider); TQHBoxLayout* colorChangeSliderLabelsLayout = new TQHBoxLayout(0); TQLabel* subtractLabel = new TQLabel(i18n( "0" ), colorChangeSliderWidget); @@ -95,7 +95,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par layout->addWidget(vLine); layout->addWidget(textEditSelection, 1); colorPatch = new KColorPatch(this); - connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) )); + connect(colorPatch, TQ_SIGNAL( colorChanged(const TQColor&) ), TQ_SLOT( slotSetColor(const TQColor&) )); colorPatch->setMinimumSize(80, 64); layout->addWidget(colorPatch, 10); topLayout->addLayout(layout); diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index 04fc2200..3fb4d651 100644 --- a/kcoloredit/gradientselection.cpp +++ b/kcoloredit/gradientselection.cpp @@ -29,8 +29,8 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi TQHBoxLayout* layout = new TQHBoxLayout(0); layout->setMargin(3); xyColorSelector = new KXYColorSelector(this); - connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ), - TQT_SLOT( slotXyColorSelectorPosChanged(int, int) )); + connect(xyColorSelector, TQ_SIGNAL( valueChanged(int, int) ), + TQ_SLOT( slotXyColorSelectorPosChanged(int, int) )); layout->addWidget(xyColorSelector); topLayout->addLayout(layout, 0, 0); topLayout->setRowStretch(0, 10); @@ -40,14 +40,14 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi checkBoxLayout->setMargin(0); variableCheckBox = new TQCheckBox(i18n( "Variable" ), this); variableGlobalComponent = false; - connect(variableCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotSetVariableGlobalComponent(bool) )); + connect(variableCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotSetVariableGlobalComponent(bool) )); checkBoxLayout->addSpacing(2); checkBoxLayout->addWidget(variableCheckBox); xyColorSelectorLayout->addLayout(checkBoxLayout); xyColorSelectorLayout->addStretch(10); TQHBoxLayout* buttonsLayout = new TQHBoxLayout(); synchronizeColorButton = new TQPushButton(i18n( "Synchronize" ), this); - connect(synchronizeColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSynchronizeColor() )); + connect(synchronizeColorButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSynchronizeColor() )); buttonsLayout->addSpacing(2); buttonsLayout->addWidget(synchronizeColorButton); buttonsLayout->addStretch(10); @@ -55,12 +55,12 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi xyColorSelectorLayout->addSpacing(2); topLayout->addLayout(xyColorSelectorLayout, 1, 0); zColorSelector = new KZColorSelector(TQt::Vertical, this); - connect(zColorSelector, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotZColorSelectorPosChanged(int) )); + connect(zColorSelector, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotZColorSelectorPosChanged(int) )); zColorSelector->setFixedWidth(36); topLayout->addWidget(zColorSelector, 0, 1); TQVBoxLayout* zColorSelectorLayout = new TQVBoxLayout(0); - connect(&hsvButtons, TQT_SIGNAL( clicked(int) ), TQT_SLOT( slotSetColorSelectionMode(int) )); + connect(&hsvButtons, TQ_SIGNAL( clicked(int) ), TQ_SLOT( slotSetColorSelectionMode(int) )); TQRadioButton* hRadioButton = new TQRadioButton("H", this); hsvButtons.insert(hRadioButton, H_COMPONENT); zColorSelectorLayout->addWidget(hRadioButton); diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index 50b83f1a..1759cf14 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) dlg.setColor(TQt::blue); // Just a color - app.connect(&dlg, TQT_SIGNAL(finished()), TQT_SLOT(quit())); + app.connect(&dlg, TQ_SIGNAL(finished()), TQ_SLOT(quit())); dlg.show(); app.exec(); diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index 05c5e1aa..16f06b89 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -64,40 +64,40 @@ KColorEditApp::~KColorEditApp() { void KColorEditApp::initActions() { // File actiojns - KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection() ); - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() ); - KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection() ); - KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() ); - KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); - m_actSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ), + KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection() ); + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); + KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection() ); + KStdAction::close( this, TQ_SLOT( slotClose() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() ); + m_actSave = KStdAction::save( this, TQ_SLOT( slotFileSave() ), actionCollection() ); m_actRecent = KStdAction::openRecent( this, - TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(), - this, TQT_SLOT( slotFileNewWindow() ), actionCollection(), + this, TQ_SLOT( slotFileNewWindow() ), actionCollection(), "file_new_window" ); // Edit actions - m_actCut = KStdAction::cut( this, TQT_SLOT( slotEditCut() ), + m_actCut = KStdAction::cut( this, TQ_SLOT( slotEditCut() ), actionCollection() ); - m_actCopy = KStdAction::copy( this, TQT_SLOT( slotEditCopy() ), + m_actCopy = KStdAction::copy( this, TQ_SLOT( slotEditCopy() ), actionCollection() ); - m_actPaste = KStdAction::paste( this, TQT_SLOT( slotEditPaste() ), + m_actPaste = KStdAction::paste( this, TQ_SLOT( slotEditPaste() ), actionCollection() ); m_actPaste->setEnabled( false ); // Color Menu m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), this, - TQT_SLOT( slotViewColorNames() ), actionCollection(), + TQ_SLOT( slotViewColorNames() ), actionCollection(), "color_view_names" ); m_actNames->setCheckedState(i18n("Hide &Color Names")); m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), this, - TQT_SLOT( slotColorFromPalette() ), actionCollection(), + TQ_SLOT( slotColorFromPalette() ), actionCollection(), "color_from_palette" ); ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), this, - TQT_SLOT( slotColorFromScreen() ), actionCollection(), + TQ_SLOT( slotColorFromScreen() ), actionCollection(), "color_from_screen" ); } @@ -112,14 +112,14 @@ void KColorEditApp::initDocument() doc = new KColorEditDoc(this); doc->newDocument(); - connect( doc, TQT_SIGNAL( selectionChanged( int, int ) ), - TQT_SLOT( slotSelectionChanged( int, int ) ) ); - connect( doc, TQT_SIGNAL( clipboardChanged() ), - TQT_SLOT( slotClipboardChanged() ) ); - connect( doc, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( slotModified( bool ) ) ); - connect( doc, TQT_SIGNAL( paletteAvailable( bool ) ), - TQT_SLOT( slotPaletteAvailable( bool ) ) ); + connect( doc, TQ_SIGNAL( selectionChanged( int, int ) ), + TQ_SLOT( slotSelectionChanged( int, int ) ) ); + connect( doc, TQ_SIGNAL( clipboardChanged() ), + TQ_SLOT( slotClipboardChanged() ) ); + connect( doc, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( slotModified( bool ) ) ); + connect( doc, TQ_SIGNAL( paletteAvailable( bool ) ), + TQ_SLOT( slotPaletteAvailable( bool ) ) ); } void KColorEditApp::initView() @@ -178,7 +178,7 @@ bool KColorEditApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KColorEditApp::slotSelectionChanged( int begin, int end ) diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp index ecc29b18..c56de065 100644 --- a/kcoloredit/kcoloreditview.cpp +++ b/kcoloredit/kcoloreditview.cpp @@ -48,15 +48,15 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( addColorLayout->setMargin(8); TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4); TQPushButton* addColorButton = new TQPushButton(i18n( "Add Color" ), paletteViewArea); - connect(addColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddColor() )); + connect(addColorButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddColor() )); buttonsLayout->addWidget(addColorButton); buttonsLayout->addStretch(10); addColorLayout->addLayout(buttonsLayout); TQCheckBox* atCursorCheckBox = new TQCheckBox(i18n( "At cursor" ), paletteViewArea); - connect(atCursorCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAddColorAtCursor(bool) )); + connect(atCursorCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAddColorAtCursor(bool) )); addColorLayout->addWidget(atCursorCheckBox); overwriteCheckBox = new TQCheckBox(i18n( "Overwrite" ), paletteViewArea); - connect(overwriteCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAddColorOverwrite(bool) )); + connect(overwriteCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAddColorOverwrite(bool) )); slotAddColorAtCursor(false); slotAddColorOverwrite(false); addColorLayout->addWidget(overwriteCheckBox); @@ -66,8 +66,8 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( //addColorLayout->addStretch(10); //TQCheckBox* cursorFollowsChosenColor = new TQCheckBox(i18n( "Cursor follows" ), paletteViewArea); //addColorLayout->addWidget(cursorFollowsChosenColor); - //connect(cursorFollowsChosenColor, TQT_SIGNAL( toggled(bool) ), - // paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) )); + //connect(cursorFollowsChosenColor, TQ_SIGNAL( toggled(bool) ), + // paletteView, TQ_SLOT( slotCursorFollowsChosenColor(bool) )); //cursorFollowsChosenColor->toggle(); paletteView->slotCursorFollowsChosenColor(true); layout->addLayout(addColorLayout, 0); @@ -78,7 +78,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( TQLabel* nameLabel = new TQLabel(i18n( "Name" ) + ": ", colorAtCursorFrameArea); colorNameLayout->addWidget(nameLabel, 0); colorName = new TQLineEdit(colorAtCursorFrameArea); - connect(colorName, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotSetColorName(const TQString&) )); + connect(colorName, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotSetColorName(const TQString&) )); colorNameLayout->addWidget(colorName, 10); colorAtCursorLayout->addLayout(colorNameLayout); TQGridLayout* colorAtCursorComponentsLayout = new TQGridLayout(3, 6, 4); diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp index 057dbe7c..aa95c007 100644 --- a/kcoloredit/loadpalettedlg.cpp +++ b/kcoloredit/loadpalettedlg.cpp @@ -65,12 +65,12 @@ LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name) else paletteBox->insertItem(paletteName); } - connect(paletteBox, TQT_SIGNAL( activated(int) ), TQT_SLOT( setFileName(int) )); + connect(paletteBox, TQ_SIGNAL( activated(int) ), TQ_SLOT( setFileName(int) )); topLayout->addWidget(paletteBox); TQHBoxLayout* browseLayout = new TQHBoxLayout( mainWidget ); TQPushButton* browseButton = new TQPushButton(i18n( "Browse..." ), mainWidget); - connect(browseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( browseFileNames() )); + connect(browseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( browseFileNames() )); browseLayout->addWidget(browseButton); browseLayout->addStretch(10); topLayout->addLayout(browseLayout); diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp index 637d88f4..ed8ff1ac 100644 --- a/kcoloredit/paletteview.cpp +++ b/kcoloredit/paletteview.cpp @@ -35,11 +35,11 @@ PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, TQt::Horizontal, this); scrolledArea = new PaletteViewScrolledArea(defaultCellWidth, defaultCellHeight, cellSpacing, scrollBar, hScrollBar, view, this); - connect(scrollBar, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRepaintScrolledArea() )); + connect(scrollBar, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRepaintScrolledArea() )); topLayout->addWidget(scrolledArea, 0, 0); - connect(hScrollBar, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRepaintScrolledArea() )); + connect(hScrollBar, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRepaintScrolledArea() )); TQHBoxLayout* hScrollBarLayout = new TQHBoxLayout(); hScrollBarLayout->addWidget(hScrollBar, 10); hScrollBarLayout->addWidget(new TQWidget(this), 0); diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index 3b4c7014..a00606c8 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/kcoloredit/paletteviewscrolledarea.cpp @@ -48,7 +48,7 @@ PaletteViewScrolledArea::PaletteViewScrolledArea(const int defaultCellWidth, this->view = view; setBackgroundMode(NoBackground); scrollTimeoutTimer = new TQTimer(this); - connect(scrollTimeoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimeout() )); + connect(scrollTimeoutTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimeout() )); scrollTimeout = true; mousePressed = false; cursorPositioning = false; diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index ee5cf729..35ee28db 100644 --- a/kcoloredit/texteditselection.cpp +++ b/kcoloredit/texteditselection.cpp @@ -34,24 +34,24 @@ TextEditSelection::TextEditSelection(TQWidget *parent, const char *name ) : TQWi componentsLayout->setColStretch(4, 10); TQLineEdit* lineEdit; addComponent(H_INDEX, ( lineEdit = new TQLineEdit(this) ), HSV_MAX_H_VALUE, "H:", 0, 0, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotHsvComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotHsvComponentChanged() )); addComponent(S_INDEX, ( lineEdit = new TQLineEdit(this) ), HSV_MAX_S_VALUE, "S:", 1, 0, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotHsvComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotHsvComponentChanged() )); addComponent(V_INDEX, ( lineEdit = new TQLineEdit(this) ), HSV_MAX_V_VALUE, "V:", 2, 0, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotHsvComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotHsvComponentChanged() )); addComponent(R_INDEX, ( lineEdit = new TQLineEdit(this) ), RGB_MAX_COMPONENT_VALUE, "R:", 0, 1, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbComponentChanged() )); addComponent(G_INDEX, ( lineEdit = new TQLineEdit(this) ), RGB_MAX_COMPONENT_VALUE, "G:", 1, 1, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbComponentChanged() )); addComponent(B_INDEX, ( lineEdit = new TQLineEdit(this) ), RGB_MAX_COMPONENT_VALUE, "B:", 2, 1, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbComponentChanged() )); TQHBoxLayout* rgbStringLayout = new TQHBoxLayout(2); TQLabel* rgbStringLabel = new TQLabel("RGB " + i18n( "hex." ) + ": ", this); rgbStringLayout->addWidget(rgbStringLabel); rgbStringLineEdit = new TQLineEdit(this); rgbStringLineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888888") )); rgbStringLineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("888888888") )); - connect(rgbStringLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbStringChanged() )); + connect(rgbStringLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbStringChanged() )); rgbStringLayout->addWidget(rgbStringLineEdit); topLayout->addLayout(rgbStringLayout); } diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index 46a56980..6fbe4a46 100644 --- a/kdvi/dviRenderer.cpp +++ b/kdvi/dviRenderer.cpp @@ -77,14 +77,14 @@ dviRenderer::dviRenderer(TQWidget *par) // initialize the dvi machinery dviFile = 0; - connect(&font_pool, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) ); + connect(&font_pool, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SIGNAL( setStatusBarText( const TQString& ) ) ); parentWidget = par; shrinkfactor = 3; current_page = 0; resolutionInDPI = 0.0; - connect( &clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar()) ); + connect( &clearStatusBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearStatusBar()) ); currentlyDrawnPage = 0; editorCommand = ""; @@ -103,7 +103,7 @@ dviRenderer::dviRenderer(TQWidget *par) PS_interface = new ghostscript_interface(); // pass status bar messages through - connect(PS_interface, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) ); + connect(PS_interface, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SIGNAL( setStatusBarText( const TQString& ) ) ); } @@ -225,7 +225,7 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page) dviFile->sourceSpecialMarker = false; // Show the dialog as soon as event processing is finished, and // the program is idle - TQTimer::singleShot( 0, this, TQT_SLOT(showThatSourceInformationIsPresent()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(showThatSourceInformationIsPresent()) ); } } @@ -767,8 +767,8 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum // henceforth dimiss the output of the older programm. "If it // hasn't failed until now, we don't care." if (proc != 0) { - tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); - tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); proc = 0; } @@ -778,9 +778,9 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum kdError(4300) << "Could not allocate ShellProcess for the editor command." << endl; return; } - tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(editorCommand_terminated(TDEProcess *))); + tqApp->connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(editorCommand_terminated(TDEProcess *))); // Merge the editor-specific editor message here. export_errorString = i18n("<qt>The external program<br><br><tt><strong>%1</strong></tt><br/><br/>which was used to call the editor " "for inverse search, reported an error. You might wish to look at the <strong>document info " diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp index d6e15873..b07e9b87 100644 --- a/kdvi/dviRenderer_export.cpp +++ b/kdvi/dviRenderer_export.cpp @@ -61,8 +61,8 @@ void dviRenderer::exportPDF() // has been called meanwhile. See also the exportPS method. if (proc != 0) { // Make sure all further output of the programm is ignored - tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); - tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); proc = 0; } @@ -120,7 +120,7 @@ void dviRenderer::exportPDF() if (progress != 0) { progress->TextLabel2->setText( i18n("Please be patient") ); progress->setTotalSteps( dviFile->total_pages ); - tqApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm())); + tqApp->connect(progress, TQ_SIGNAL(finished()), this, TQ_SLOT(abortExternalProgramm())); } proc = new KShellProcess(); @@ -128,11 +128,11 @@ void dviRenderer::exportPDF() kdError(4300) << "Could not allocate ShellProcess for the dvipdfm command." << endl; return; } - tqApp->disconnect( this, TQT_SIGNAL(mySignal()), 0, 0 ); + tqApp->disconnect( this, TQ_SIGNAL(mySignal()), 0, 0 ); - tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(dvips_terminated(TDEProcess *))); + tqApp->connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(dvips_terminated(TDEProcess *))); export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. " "You might wish to look at the <strong>document info dialog</strong> which you will " @@ -167,8 +167,8 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin // enough to ignore the exit status of the editor if another command // has been called meanwhile. See also the exportPDF method. if (proc != 0) { - tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); - tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); proc = 0; } @@ -223,7 +223,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin if (progress != 0) { progress->TextLabel2->setText( i18n("Please be patient") ); progress->setTotalSteps( dviFile->total_pages ); - tqApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm())); + tqApp->connect(progress, TQ_SIGNAL(finished()), this, TQ_SLOT(abortExternalProgramm())); } // There is a major problem with dvips, at least 5.86 and lower: the @@ -294,9 +294,9 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin return; } - tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(dvips_terminated(TDEProcess *))); + tqApp->connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(dvips_terminated(TDEProcess *))); export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. " "You might wish to look at the <strong>document info dialog</strong> which you will " "find in the File-Menu for a precise error report.</qt>") ; diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp index 830d0f67..d7b73847 100644 --- a/kdvi/fontpool.cpp +++ b/kdvi/fontpool.cpp @@ -304,8 +304,8 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo // If PK fonts are generated, the kpsewhich command will re-route // the output of MetaFont into its stderr. Here we make sure this // output is intercepted and parsed. - tqApp->connect(&kpsewhichIO, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(mf_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(&kpsewhichIO, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(mf_output_receiver(TDEProcess *, char *, int))); kpsewhichIO.setUseShell(true); diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp index 23bae486..a49fa384 100644 --- a/kdvi/fontprogress.cpp +++ b/kdvi/fontprogress.cpp @@ -61,7 +61,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString progress = 0; procIO = 0; - tqApp->connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(killProcIO())); + tqApp->connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(killProcIO())); } diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 39be9b31..a6aa58b8 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -67,13 +67,13 @@ KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQO DVIRenderer.setName("DVI renderer"); setRenderer(&DVIRenderer); - docInfoAction = new TDEAction(i18n("Document &Info"), "application-vnd.tde.info", 0, &DVIRenderer, TQT_SLOT(showInfo()), actionCollection(), "info_dvi"); - embedPSAction = new TDEAction(i18n("Embed External PostScript Files..."), 0, this, TQT_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript"); - new TDEAction(i18n("Enable All Warnings && Messages"), 0, this, TQT_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs"); - exportPSAction = new TDEAction(i18n("PostScript..."), 0, &DVIRenderer, TQT_SLOT(exportPS()), actionCollection(), "export_postscript"); - exportPDFAction = new TDEAction(i18n("PDF..."), 0, &DVIRenderer, TQT_SLOT(exportPDF()), actionCollection(), "export_pdf"); + docInfoAction = new TDEAction(i18n("Document &Info"), "application-vnd.tde.info", 0, &DVIRenderer, TQ_SLOT(showInfo()), actionCollection(), "info_dvi"); + embedPSAction = new TDEAction(i18n("Embed External PostScript Files..."), 0, this, TQ_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript"); + new TDEAction(i18n("Enable All Warnings && Messages"), 0, this, TQ_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs"); + exportPSAction = new TDEAction(i18n("PostScript..."), 0, &DVIRenderer, TQ_SLOT(exportPS()), actionCollection(), "export_postscript"); + exportPDFAction = new TDEAction(i18n("PDF..."), 0, &DVIRenderer, TQ_SLOT(exportPDF()), actionCollection(), "export_pdf"); - KStdAction::tipOfDay(this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); + KStdAction::tipOfDay(this, TQ_SLOT(showTip()), actionCollection(), "help_tipofday"); setXMLFile("kdvi_part.rc"); @@ -81,7 +81,7 @@ KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQO enableActions(false); // Show tip of the day, when the first main window is shown. - TQTimer::singleShot(0,this,TQT_SLOT(showTipOnStart())); + TQTimer::singleShot(0,this,TQ_SLOT(showTipOnStart())); } @@ -435,12 +435,12 @@ DocumentWidget* KDVIMultiPage::createDocumentWidget() "singlePageWidget" ); // Lets not forget the connections we make in the KMultiPage - connect(documentWidget, TQT_SIGNAL(clearSelection()), this, TQT_SLOT(clearSelection())); - connect(this, TQT_SIGNAL(enableMoveTool(bool)), documentWidget, TQT_SLOT(slotEnableMoveTool(bool))); + connect(documentWidget, TQ_SIGNAL(clearSelection()), this, TQ_SLOT(clearSelection())); + connect(this, TQ_SIGNAL(enableMoveTool(bool)), documentWidget, TQ_SLOT(slotEnableMoveTool(bool))); // Handle source links - connect(documentWidget, TQT_SIGNAL(SRCLink(const TQString&, TQMouseEvent*, DocumentWidget*)), getRenderer(), - TQT_SLOT(handleSRCLink(const TQString& ,TQMouseEvent*, DocumentWidget*))); + connect(documentWidget, TQ_SIGNAL(SRCLink(const TQString&, TQMouseEvent*, DocumentWidget*)), getRenderer(), + TQ_SLOT(handleSRCLink(const TQString& ,TQMouseEvent*, DocumentWidget*))); return documentWidget; } diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp index 800a5d19..e365d9e2 100644 --- a/kdvi/optionDialogSpecialWidget.cpp +++ b/kdvi/optionDialogSpecialWidget.cpp @@ -73,8 +73,8 @@ optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent, const c usersEditorCommand = currentEditorCommand; slotComboBox(i); - connect(urll, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(slotExtraHelpButton(const TQString&))); - connect(editorChoice, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotComboBox( int ) ) ); + connect(urll, TQ_SIGNAL(leftClickedURL(const TQString&)), this, TQ_SLOT(slotExtraHelpButton(const TQString&))); + connect(editorChoice, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotComboBox( int ) ) ); // Editor description strings (and their translations) vary in // size. Find the longest description string available to make sure @@ -87,7 +87,7 @@ optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent, const c } editorDescription->setMinimumWidth(maximumWidth+10); - connect(kcfg_EditorCommand, TQT_SIGNAL( textChanged (const TQString &) ), this, TQT_SLOT( slotUserDefdEditorCommand( const TQString & ) ) ); + connect(kcfg_EditorCommand, TQ_SIGNAL( textChanged (const TQString &) ), this, TQ_SLOT( slotUserDefdEditorCommand( const TQString & ) ) ); } optionDialogSpecialWidget::~optionDialogSpecialWidget() diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index c68b07c4..acdbeab4 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -213,12 +213,12 @@ TopLevel::TopLevel (TQWidget *, const char *name) vsb = new TQScrollBar( TQt::Vertical,faxqtwin,"scrollBar" ); vsb->hide(); - connect( vsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollVert(int)) ); + connect( vsb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrollVert(int)) ); // Create a Horizontal scroll bar hsb = new TQScrollBar( TQt::Horizontal,faxqtwin,"scrollBar" ); - connect( hsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollHorz(int)) ); + connect( hsb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrollHorz(int)) ); hsb->hide(); setCentralWidget(faxqtwin); @@ -236,43 +236,43 @@ TopLevel::~TopLevel() void TopLevel::setupMenuBar() { // File menu - KStdAction::open( this, TQT_SLOT( faxOpen() ), actionCollection() ); - actRecent = KStdAction::openRecent( this, TQT_SLOT( faxOpen( const KURL & ) ), + KStdAction::open( this, TQ_SLOT( faxOpen() ), actionCollection() ); + actRecent = KStdAction::openRecent( this, TQ_SLOT( faxOpen( const KURL & ) ), actionCollection() ); - actSave = KStdAction::save( this, TQT_SLOT( faxSave() ), actionCollection() ); - actSaveAs = KStdAction::saveAs( this, TQT_SLOT( faxSaveAs() ), + actSave = KStdAction::save( this, TQ_SLOT( faxSave() ), actionCollection() ); + actSaveAs = KStdAction::saveAs( this, TQ_SLOT( faxSaveAs() ), actionCollection() ); - actPrint = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + actPrint = KStdAction::print( this, TQ_SLOT( print() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); actAdd = new TDEAction( i18n( "A&dd..." ), "document-new", TDEShortcut(), this, - TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); + TQ_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); actRecent->setMaxItems( 5 ); // View Menu - actSize = KStdAction::actualSize( this, TQT_SLOT( actualSize() ), + actSize = KStdAction::actualSize( this, TQ_SLOT( actualSize() ), actionCollection() ); - actZoomIn = KStdAction::zoomIn( this, TQT_SLOT( zoomin() ), actionCollection() ); - actZoomOut = KStdAction::zoomOut( this, TQT_SLOT( zoomout() ), + actZoomIn = KStdAction::zoomIn( this, TQ_SLOT( zoomin() ), actionCollection() ); + actZoomOut = KStdAction::zoomOut( this, TQ_SLOT( zoomout() ), actionCollection() ); actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), this, - TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" ); + TQ_SLOT( rotatePage() ), actionCollection(), "view_rotate" ); actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), this, - TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" ); + TQ_SLOT( mirrorPage() ), actionCollection(), "view_mirror" ); actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), this, - TQT_SLOT( flipPage() ), actionCollection(), "view_flip" ); + TQ_SLOT( flipPage() ), actionCollection(), "view_flip" ); // Go menu - actNext = KStdAction::next( this, TQT_SLOT( nextPage() ), actionCollection() ); - actPrev = KStdAction::prior( this, TQT_SLOT( prevPage() ), actionCollection() ); - actFirst = KStdAction::firstPage( this, TQT_SLOT( firstPage() ), + actNext = KStdAction::next( this, TQ_SLOT( nextPage() ), actionCollection() ); + actPrev = KStdAction::prior( this, TQ_SLOT( prevPage() ), actionCollection() ); + actFirst = KStdAction::firstPage( this, TQ_SLOT( firstPage() ), actionCollection() ); - actLast = KStdAction::lastPage( this, TQT_SLOT( lastPage() ), + actLast = KStdAction::lastPage( this, TQ_SLOT( lastPage() ), actionCollection() ); // Settings menu - KStdAction::preferences( this, TQT_SLOT( faxoptions() ), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT( faxoptions() ), actionCollection() ); } void TopLevel::setupStatusBar() diff --git a/kfax/options.cpp b/kfax/options.cpp index a1f7e019..03a7c44b 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -143,17 +143,17 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name) hbl4->addWidget( rawlabel ); g3 = new TQRadioButton("G3",rawgroup,"g3"); - connect(g3,TQT_SIGNAL(clicked()), this, TQT_SLOT(g3toggled())); + connect(g3,TQ_SIGNAL(clicked()), this, TQ_SLOT(g3toggled())); hbl4->addSpacing( 20 ); hbl4->addWidget( g3 ); g32d = new TQRadioButton("G32d",rawgroup,"g32d"); - connect(g32d,TQT_SIGNAL(clicked()), this,TQT_SLOT(g32toggled())); + connect(g32d,TQ_SIGNAL(clicked()), this,TQ_SLOT(g32toggled())); hbl4->addSpacing( 30 ); hbl4->addWidget( g32d ); g4 = new TQRadioButton("G4",rawgroup,"g4"); - connect(g4,TQT_SIGNAL(clicked()), this, TQT_SLOT(g4toggled())); + connect(g4,TQ_SIGNAL(clicked()), this, TQ_SLOT(g4toggled())); hbl4->addSpacing( 30 ); hbl4->addWidget( g4 ); @@ -179,7 +179,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name) hbl5->addWidget( heightedit ); geomauto = new TQCheckBox(i18n("Auto"),bg,"geomauto"); - connect(geomauto,TQT_SIGNAL(clicked()),this,TQT_SLOT(geomtoggled())); + connect(geomauto,TQ_SIGNAL(clicked()),this,TQ_SLOT(geomtoggled())); hbl5->addSpacing( 10 ); hbl5->addWidget( geomauto ); } diff --git a/kgamma/kcmkgamma/gammactrl.cpp b/kgamma/kcmkgamma/gammactrl.cpp index 3596c8c2..49360c72 100644 --- a/kgamma/kcmkgamma/gammactrl.cpp +++ b/kgamma/kcmkgamma/gammactrl.cpp @@ -53,8 +53,8 @@ GammaCtrl::GammaCtrl(TQWidget *parent, XVidExtWrap *xvid, int channel, \ slider->setRange(0, maxslider); slider->setTickInterval(2); slider->setValue(setslider); - connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setGamma(int))); - connect(slider, TQT_SIGNAL(sliderPressed()), TQT_SLOT(pressed())); + connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setGamma(int))); + connect(slider, TQ_SIGNAL(sliderPressed()), TQ_SLOT(pressed())); textfield = new DisplayNumber(this, 4, 2); textfield->setText(setgamma); diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp index ecbb8fe4..23d7ebba 100644 --- a/kgamma/kcmkgamma/kgamma.cpp +++ b/kgamma/kcmkgamma/kgamma.cpp @@ -147,8 +147,8 @@ void KGamma::setupUI() { TQWidgetStack *stack = new TQWidgetStack( this ); stack->setFrameStyle( TQFrame::Box | TQFrame::Raised ); - connect( combo, TQT_SIGNAL( activated( int ) ), - stack, TQT_SLOT( raiseWidget( int ) ) ); + connect( combo, TQ_SIGNAL( activated( int ) ), + stack, TQ_SLOT( raiseWidget( int ) ) ); TQPixmap background; background.load(locate("data", "kgamma/pics/background.png")); @@ -212,29 +212,29 @@ void KGamma::setupUI() { bluelabel->setText(i18n("Blue:")); gctrl = new GammaCtrl(this, xv); - connect(gctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(Changed())); - connect(gctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(SyncScreens())); + connect(gctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(Changed())); + connect(gctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(SyncScreens())); gammalabel->setBuddy( gctrl ); rgctrl = new GammaCtrl(this, xv, XVidExtWrap::Red); - connect(rgctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(Changed())); - connect(rgctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(SyncScreens())); - connect(gctrl, TQT_SIGNAL(gammaChanged(int)), rgctrl, TQT_SLOT(setCtrl(int))); - connect(rgctrl, TQT_SIGNAL(gammaChanged(int)), gctrl, TQT_SLOT(suspend())); + connect(rgctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(Changed())); + connect(rgctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(SyncScreens())); + connect(gctrl, TQ_SIGNAL(gammaChanged(int)), rgctrl, TQ_SLOT(setCtrl(int))); + connect(rgctrl, TQ_SIGNAL(gammaChanged(int)), gctrl, TQ_SLOT(suspend())); redlabel->setBuddy( rgctrl ); ggctrl = new GammaCtrl(this, xv, XVidExtWrap::Green); - connect(ggctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(Changed())); - connect(ggctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(SyncScreens())); - connect(gctrl, TQT_SIGNAL(gammaChanged(int)), ggctrl, TQT_SLOT(setCtrl(int))); - connect(ggctrl, TQT_SIGNAL(gammaChanged(int)), gctrl, TQT_SLOT(suspend())); + connect(ggctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(Changed())); + connect(ggctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(SyncScreens())); + connect(gctrl, TQ_SIGNAL(gammaChanged(int)), ggctrl, TQ_SLOT(setCtrl(int))); + connect(ggctrl, TQ_SIGNAL(gammaChanged(int)), gctrl, TQ_SLOT(suspend())); greenlabel->setBuddy( ggctrl ); bgctrl = new GammaCtrl(this, xv, XVidExtWrap::Blue); - connect(bgctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(Changed())); - connect(bgctrl, TQT_SIGNAL(gammaChanged(int)), TQT_SLOT(SyncScreens())); - connect(gctrl, TQT_SIGNAL(gammaChanged(int)), bgctrl, TQT_SLOT(setCtrl(int))); - connect(bgctrl, TQT_SIGNAL(gammaChanged(int)), gctrl, TQT_SLOT(suspend())); + connect(bgctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(Changed())); + connect(bgctrl, TQ_SIGNAL(gammaChanged(int)), TQ_SLOT(SyncScreens())); + connect(gctrl, TQ_SIGNAL(gammaChanged(int)), bgctrl, TQ_SLOT(setCtrl(int))); + connect(bgctrl, TQ_SIGNAL(gammaChanged(int)), gctrl, TQ_SLOT(suspend())); bluelabel->setBuddy( bgctrl ); TQGridLayout *grid = new TQGridLayout(4, 9); @@ -256,17 +256,17 @@ void KGamma::setupUI() { TQHBox *options = new TQHBox(this); xf86cfgbox = new TQCheckBox( i18n("Save settings to X-Server Config"), options ); - connect(xf86cfgbox, TQT_SIGNAL(clicked()), TQT_SLOT(changeConfig())); + connect(xf86cfgbox, TQ_SIGNAL(clicked()), TQ_SLOT(changeConfig())); syncbox = new TQCheckBox( i18n("Sync screens"), options ); - connect(syncbox, TQT_SIGNAL(clicked()), TQT_SLOT(SyncScreens())); - connect(syncbox, TQT_SIGNAL(clicked()), TQT_SLOT(Changed())); + connect(syncbox, TQ_SIGNAL(clicked()), TQ_SLOT(SyncScreens())); + connect(syncbox, TQ_SIGNAL(clicked()), TQ_SLOT(Changed())); screenselect = new TQComboBox( options ); for ( int i = 0; i < ScreenCount; i++ ) screenselect->insertItem( i18n("Screen %1").arg(i+1) ); screenselect->setCurrentItem(currentScreen); - connect(screenselect, TQT_SIGNAL(activated(int)), TQT_SLOT(changeScreen(int))); + connect(screenselect, TQ_SIGNAL(activated(int)), TQ_SLOT(changeScreen(int))); options->setSpacing( 10 ); options->setStretchFactor( xf86cfgbox, 10 ); diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp index 32219bc9..3bcb7c31 100644 --- a/kghostview/kdscerrordialog.cpp +++ b/kghostview/kdscerrordialog.cpp @@ -76,10 +76,10 @@ KDSCErrorDialog::KDSCErrorDialog( TQWidget* parent ) : _ignoreAllButton = new TQPushButton( i18n("Ignore All"), this ); hbox->addWidget( _ignoreAllButton ); - connect( _okButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); - connect( _cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( _ignoreAllButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotIgnoreAll() ) ); + connect( _okButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) ); + connect( _cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCancel() ) ); + connect( _ignoreAllButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotIgnoreAll() ) ); } KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err ) diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 4a4dfc93..580921f7 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -66,16 +66,16 @@ KGVMiniWidget::KGVMiniWidget( KGVPart* part, const char* name ) : static_cast< TQPrinter::PageSize >( locale.pageSize() ) ); _thumbnailService = new ThumbnailService( this ); - connect( this, TQT_SIGNAL( newPageShown( int ) ), - TQT_SLOT( updateStatusBarText( int ) ) ); + connect( this, TQ_SIGNAL( newPageShown( int ) ), + TQ_SLOT( updateStatusBarText( int ) ) ); } void KGVMiniWidget::setDocument( KGVDocument* document ) { _document = document; if( _document ) - connect( _document, TQT_SIGNAL( completed() ), - TQT_SLOT( slotDocumentOpened() ) ); + connect( _document, TQ_SIGNAL( completed() ), + TQ_SLOT( slotDocumentOpened() ) ); } TQString KGVMiniWidget::pageSizeToString( TQPrinter::PageSize pageSize ) @@ -109,8 +109,8 @@ void KGVMiniWidget::setPSWidget( KPSWidget* psWidget ) { _psWidget = psWidget; // setMagnification( _magnification ); - connect( _psWidget, TQT_SIGNAL( newPageImage( TQPixmap ) ), - this, TQT_SLOT( sendPage() ) ); + connect( _psWidget, TQ_SIGNAL( newPageImage( TQPixmap ) ), + this, TQ_SLOT( sendPage() ) ); } void KGVMiniWidget::goToPage() @@ -452,8 +452,8 @@ void KGVMiniWidget::showPage( int pagenumber ) } } // Do this after ajusting pagenumber above - _thumbnailService->cancelRequests( -1 , _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ) ); - _thumbnailService->delayedGetThumbnail( pagenumber, _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ), true ); + _thumbnailService->cancelRequests( -1 , _part->scrollBox(), TQ_SLOT( setThumbnail( TQPixmap ) ) ); + _thumbnailService->delayedGetThumbnail( pagenumber, _part->scrollBox(), TQ_SLOT( setThumbnail( TQPixmap ) ), true ); emit newPageShown( pagenumber ); } diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 59140d72..8c9be61a 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -94,28 +94,28 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, setProgressInfoEnabled( !args.contains( "Browser/View") ); _document = new KGVDocument( this ); - connect( _document, TQT_SIGNAL( fileChangeFailed() ), - this, TQT_SLOT( slotCancelWatch() ) ); - connect( _document, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotOpenFileCompleted() ) ); - connect( _document, TQT_SIGNAL( canceled( const TQString& ) ), - this, TQT_SIGNAL( canceled( const TQString& ) ) ); + connect( _document, TQ_SIGNAL( fileChangeFailed() ), + this, TQ_SLOT( slotCancelWatch() ) ); + connect( _document, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotOpenFileCompleted() ) ); + connect( _document, TQ_SIGNAL( canceled( const TQString& ) ), + this, TQ_SIGNAL( canceled( const TQString& ) ) ); _fileWatcher = new KDirWatch( this ); - connect( _fileWatcher, TQT_SIGNAL( dirty( const TQString& ) ), - this, TQT_SLOT( slotFileDirty( const TQString& ) ) ); - connect( _dirtyHandler, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotDoFileDirty() ) ); + connect( _fileWatcher, TQ_SIGNAL( dirty( const TQString& ) ), + this, TQ_SLOT( slotFileDirty( const TQString& ) ) ); + connect( _dirtyHandler, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotDoFileDirty() ) ); // Setup main widget _mainWidget = new KGVMainWidget( parentWidget ); _mainWidget->setFocusPolicy( TQWidget::StrongFocus ); _mainWidget->installEventFilter( this ); _mainWidget->setAcceptDrops( true ); - connect( _mainWidget, TQT_SIGNAL( spacePressed() ), - this, TQT_SLOT( slotReadDown() ) ); - connect( _mainWidget, TQT_SIGNAL( urlDropped( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); + connect( _mainWidget, TQ_SIGNAL( spacePressed() ), + this, TQ_SLOT( slotReadDown() ) ); + connect( _mainWidget, TQ_SIGNAL( urlDropped( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); TQHBoxLayout* hlay = new TQHBoxLayout( _mainWidget, 0, 0 ); TQVBoxLayout* vlay = new TQVBoxLayout( hlay ); @@ -146,17 +146,17 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, _psWidget = new KPSWidget( _pageDecorator ); _psWidget->readSettings(); _pageView->setPage( _pageDecorator ); - connect( _psWidget, TQT_SIGNAL( output( char*, int ) ), - this, TQT_SLOT( slotGhostscriptOutput( char*, int ) ) ); + connect( _psWidget, TQ_SIGNAL( output( char*, int ) ), + this, TQ_SLOT( slotGhostscriptOutput( char*, int ) ) ); - connect( _psWidget, TQT_SIGNAL( ghostscriptError( const TQString& ) ), - this, TQT_SLOT( slotGhostscriptError( const TQString& ) ) ); + connect( _psWidget, TQ_SIGNAL( ghostscriptError( const TQString& ) ), + this, TQ_SLOT( slotGhostscriptError( const TQString& ) ) ); _logWindow = new LogWindow( i18n( "Ghostscript Messages" ), _mainWidget, "logwindow" ); _showLogWindow = false; - connect( _logWindow, TQT_SIGNAL( configureGS() ), TQT_SLOT( slotConfigure() ) ); + connect( _logWindow, TQ_SIGNAL( configureGS() ), TQ_SLOT( slotConfigure() ) ); _docManager = new KGVMiniWidget( this ); _docManager->setPSWidget( _psWidget ); @@ -165,57 +165,57 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, _markList = new MarkList( _mainWidget, "marklist", _docManager ); _markList->setFixedWidth( PAGELIST_WIDTH ); vlay->addWidget( _markList, 1 ); - connect( _markList, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ), - this, TQT_SLOT( showPopup( int, int, const TQPoint& ) ) ); - - - connect( _markList, TQT_SIGNAL( selected( int ) ), - _docManager, TQT_SLOT( goToPage( int ) ) ); - connect( _docManager, TQT_SIGNAL( newPageShown( int ) ), - _markList, TQT_SLOT( select( int ) ) ); - connect( _docManager, TQT_SIGNAL( setStatusBarText( const TQString& ) ), - this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) ); - connect( _scrollBox, TQT_SIGNAL( valueChangedRelative( int, int ) ), - _pageView, TQT_SLOT( scrollBy( int, int ) ) ); - connect( _pageView, TQT_SIGNAL( pageSizeChanged( const TQSize& ) ), - _scrollBox, TQT_SLOT( setPageSize( const TQSize& ) ) ); - connect( _pageView, TQT_SIGNAL( viewSizeChanged( const TQSize& ) ), - _scrollBox, TQT_SLOT( setViewSize( const TQSize& ) ) ); - connect( _pageView, TQT_SIGNAL( contentsMoving( int, int ) ), - _scrollBox, TQT_SLOT( setViewPos( int, int ) ) ); + connect( _markList, TQ_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ), + this, TQ_SLOT( showPopup( int, int, const TQPoint& ) ) ); + + + connect( _markList, TQ_SIGNAL( selected( int ) ), + _docManager, TQ_SLOT( goToPage( int ) ) ); + connect( _docManager, TQ_SIGNAL( newPageShown( int ) ), + _markList, TQ_SLOT( select( int ) ) ); + connect( _docManager, TQ_SIGNAL( setStatusBarText( const TQString& ) ), + this, TQ_SIGNAL( setStatusBarText( const TQString& ) ) ); + connect( _scrollBox, TQ_SIGNAL( valueChangedRelative( int, int ) ), + _pageView, TQ_SLOT( scrollBy( int, int ) ) ); + connect( _pageView, TQ_SIGNAL( pageSizeChanged( const TQSize& ) ), + _scrollBox, TQ_SLOT( setPageSize( const TQSize& ) ) ); + connect( _pageView, TQ_SIGNAL( viewSizeChanged( const TQSize& ) ), + _scrollBox, TQ_SLOT( setViewSize( const TQSize& ) ) ); + connect( _pageView, TQ_SIGNAL( contentsMoving( int, int ) ), + _scrollBox, TQ_SLOT( setViewPos( int, int ) ) ); //-- File Menu ---------------------------------------------------------- - KStdAction::saveAs( document(), TQT_SLOT( saveAs() ), + KStdAction::saveAs( document(), TQ_SLOT( saveAs() ), actionCollection() ); new TDEAction( i18n( "Document &Info" ), 0, - miniWidget(), TQT_SLOT( info() ), + miniWidget(), TQ_SLOT( info() ), actionCollection(), "info" ); //-- Edit Menu ----------------------------------------------------- _popup = new TDEPopupMenu( _markList, "marklist_menu" ); TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M, - _markList, TQT_SLOT( markCurrent() ), + _markList, TQ_SLOT( markCurrent() ), actionCollection(), "mark_current" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &All Pages" ), 0, - _markList, TQT_SLOT( markAll() ), + _markList, TQ_SLOT( markAll() ), actionCollection(), "mark_all" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &Even Pages" ), 0, - _markList, TQT_SLOT( markEven() ), + _markList, TQ_SLOT( markEven() ), actionCollection(), "mark_even" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &Odd Pages" ), 0, - _markList, TQT_SLOT( markOdd() ), + _markList, TQ_SLOT( markOdd() ), actionCollection(), "mark_odd" ); act->plug( _popup ); act = new TDEAction( i18n( "&Toggle Page Marks" ), 0, - _markList, TQT_SLOT( toggleMarks() ), + _markList, TQ_SLOT( toggleMarks() ), actionCollection(), "toggle" ); act->plug( _popup ); act = new TDEAction( i18n("&Remove Page Marks"), 0, - _markList, TQT_SLOT( removeMarks() ), + _markList, TQ_SLOT( removeMarks() ), actionCollection(), "remove" ); act->plug( _popup ); @@ -228,7 +228,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, actionCollection(), "media_menu" ); _flick = new TDEToggleAction( i18n( "No &Flicker" ), 0, - this, TQT_SLOT( slotFlicker() ), + this, TQ_SLOT( slotFlicker() ), actionCollection(), "no_flicker" ); TQStringList orientations; @@ -239,22 +239,22 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, orientations.append( i18n( "Seascape" ) ); _selectOrientation->setItems( orientations ); - connect( _selectOrientation, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotOrientation( int ) ) ); - connect( _selectMedia, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotMedia( int ) ) ); + connect( _selectOrientation, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotOrientation( int ) ) ); + connect( _selectMedia, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotMedia( int ) ) ); { TDEShortcut zoomInShort = TDEStdAccel::zoomIn(); zoomInShort.append( KKey( CTRL+Key_Equal ) ); - _zoomIn = KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ), + _zoomIn = KStdAction::zoomIn( this, TQ_SLOT( slotZoomIn() ), actionCollection(), "zoomIn" ); _zoomIn->setShortcut( zoomInShort ); } - _zoomOut = KStdAction::zoomOut( this, TQT_SLOT( slotZoomOut() ), + _zoomOut = KStdAction::zoomOut( this, TQ_SLOT( slotZoomOut() ), actionCollection(), "zoomOut" ); _zoomTo = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" ); - connect( _zoomTo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( slotZoom( const TQString& ) ) ); + connect( _zoomTo, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( slotZoom( const TQString& ) ) ); _zoomTo->setEditable( true ); _zoomTo->clear(); TQValueList<double> mags = DisplayOptions::normalMagnificationValues(); @@ -274,41 +274,41 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, _zoomTo->setCurrentItem( idx ); _fitWidth = new TDEAction( i18n( "&Fit to Page Width" ), 0, this, - TQT_SLOT( slotFitToPage() ), actionCollection(), + TQ_SLOT( slotFitToPage() ), actionCollection(), "fit_to_page"); _fitScreen = new TDEAction( i18n( "&Fit to Screen" ), Key_S, this, - TQT_SLOT( slotFitToScreen() ), actionCollection(), + TQ_SLOT( slotFitToScreen() ), actionCollection(), "fit_to_screen"); - _prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ), + _prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQ_SLOT( slotPrevPage() ), actionCollection(), "prevPage" ); _prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) ); - _nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ), + _nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQ_SLOT( slotNextPage() ), actionCollection(), "nextPage" ); _nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); - _firstPage = KStdAction::firstPage( this, TQT_SLOT( slotGotoStart() ), + _firstPage = KStdAction::firstPage( this, TQ_SLOT( slotGotoStart() ), actionCollection(), "goToStart" ); _firstPage->setWhatsThis( i18n( "Moves to the first page of the document" ) ); - _lastPage = KStdAction::lastPage( this, TQT_SLOT( slotGotoEnd() ), + _lastPage = KStdAction::lastPage( this, TQ_SLOT( slotGotoEnd() ), actionCollection(), "goToEnd" ); _lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) ); TDEShortcut readUpShort = TDEStdAccel::shortcut( TDEStdAccel::Prior ); readUpShort.append( KKey( SHIFT+Key_Space ) ); _readUp = new TDEAction( i18n( "Read Up" ), "go-up", - readUpShort, this, TQT_SLOT( slotReadUp() ), + readUpShort, this, TQ_SLOT( slotReadUp() ), actionCollection(), "readUp" ); TDEShortcut readDownShort = TDEStdAccel::shortcut( TDEStdAccel::Next ); readDownShort.append( KKey( Key_Space ) ); _readDown = new TDEAction( i18n( "Read Down" ), "go-down", - readDownShort, this, TQT_SLOT( slotReadDown() ), + readDownShort, this, TQ_SLOT( slotReadDown() ), actionCollection(), "readDown" ); - _gotoPage = KStdAction::gotoPage( _docManager, TQT_SLOT( goToPage() ), + _gotoPage = KStdAction::gotoPage( _docManager, TQ_SLOT( goToPage() ), actionCollection(), "goToPage" ); //-- Settings Menu ------------------------------------------------------ @@ -316,7 +316,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, actionCollection(), "show_scrollbars" ); _showScrollBars->setCheckedState(i18n("Hide &Scrollbars")); _watchFile = new TDEToggleAction( i18n( "&Watch File" ), 0, - this, TQT_SLOT( slotWatchFile() ), + this, TQ_SLOT( slotWatchFile() ), actionCollection(), "watch_file" ); _showPageList = new TDEToggleAction( i18n( "Show &Page List" ), 0, actionCollection(), "show_page_list" ); @@ -324,29 +324,29 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, _showPageLabels = new TDEToggleAction( i18n("Show Page &Labels"), 0, actionCollection(), "show_page_labels" ); _showPageLabels->setCheckedState(i18n("Hide Page &Labels")); - KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection() ); - connect( _showScrollBars, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showScrollBars( bool ) ) ); - connect( _showPageList, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showMarkList( bool ) ) ); - connect( _showPageLabels, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showPageLabels( bool ) ) ); + KStdAction::preferences( this, TQ_SLOT( slotConfigure() ), actionCollection() ); + connect( _showScrollBars, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showScrollBars( bool ) ) ); + connect( _showPageList, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showMarkList( bool ) ) ); + connect( _showPageLabels, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showPageLabels( bool ) ) ); _extension = new KGVBrowserExtension( this ); setXMLFile( "kgv_part.rc" ); - connect( miniWidget(), TQT_SIGNAL( newPageShown( int ) ), - this, TQT_SLOT( slotNewPage( int ) ) ); - connect( _pageView, TQT_SIGNAL( contentsMoving( int, int ) ), - this, TQT_SLOT( slotPageMoved( int, int ) ) ); + connect( miniWidget(), TQ_SIGNAL( newPageShown( int ) ), + this, TQ_SLOT( slotNewPage( int ) ) ); + connect( _pageView, TQ_SIGNAL( contentsMoving( int, int ) ), + this, TQ_SLOT( slotPageMoved( int, int ) ) ); - connect( _pageView, TQT_SIGNAL( nextPage() ), TQT_SLOT( slotNextPage() )); - connect( _pageView, TQT_SIGNAL( prevPage() ), TQT_SLOT( slotPrevPage() )); - connect( _pageView, TQT_SIGNAL( zoomIn() ), TQT_SLOT( slotZoomIn() )); - connect( _pageView, TQT_SIGNAL( zoomOut() ), TQT_SLOT( slotZoomOut() )); - connect( _pageView, TQT_SIGNAL( ReadUp() ), TQT_SLOT( slotReadUp() )); - connect( _pageView, TQT_SIGNAL( ReadDown() ), TQT_SLOT( slotReadDown() )); + connect( _pageView, TQ_SIGNAL( nextPage() ), TQ_SLOT( slotNextPage() )); + connect( _pageView, TQ_SIGNAL( prevPage() ), TQ_SLOT( slotPrevPage() )); + connect( _pageView, TQ_SIGNAL( zoomIn() ), TQ_SLOT( slotZoomIn() )); + connect( _pageView, TQ_SIGNAL( zoomOut() ), TQ_SLOT( slotZoomOut() )); + connect( _pageView, TQ_SIGNAL( ReadUp() ), TQ_SLOT( slotReadUp() )); + connect( _pageView, TQ_SIGNAL( ReadDown() ), TQ_SLOT( slotReadDown() )); TQStringList items = document()->mediaNames(); items.prepend( i18n( "Auto ") ); @@ -658,10 +658,10 @@ bool KGVPart::openURL( const KURL& url ) emit setWindowCaption( m_url.prettyURL() ); _mimetypeScanner = new KGVRun( m_url, 0, m_url.isLocalFile(), false ); - connect( _mimetypeScanner, TQT_SIGNAL( finished( const TQString& ) ), - TQT_SLOT( slotMimetypeFinished( const TQString& ) ) ); - connect( _mimetypeScanner, TQT_SIGNAL( error() ), - TQT_SLOT( slotMimetypeError() ) ); + connect( _mimetypeScanner, TQ_SIGNAL( finished( const TQString& ) ), + TQ_SLOT( slotMimetypeFinished( const TQString& ) ) ); + connect( _mimetypeScanner, TQ_SIGNAL( error() ), + TQ_SLOT( slotMimetypeError() ) ); return true; } @@ -693,15 +693,15 @@ void KGVPart::openURLContinue() /* d->m_job = TDEIO::file_copy( m_url, m_file, 0600, true, false, d->m_showProgressInfo ); emit started( d->m_job ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); */ _job = TDEIO::get( m_url, false, isProgressInfoEnabled() ); - connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotJobFinished( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotJobFinished( TDEIO::Job* ) ) ); emit started( _job ); } @@ -926,8 +926,8 @@ void KGVPart::slotFitToScreen() { kdDebug(4500) << "KGVPart::slotFitToScreen()" << endl; if ( _fitTimer->isActive() ) { - disconnect( _fitTimer, TQT_SIGNAL( timeout() ), this, 0 ); - connect( _fitTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoFitToScreen() ) ); + disconnect( _fitTimer, TQ_SIGNAL( timeout() ), this, 0 ); + connect( _fitTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoFitToScreen() ) ); } else slotDoFitToScreen(); } @@ -996,7 +996,7 @@ KGVRun::KGVRun( const KURL& url, mode_t mode, bool isLocalFile, bool showProgressInfo ) : KRun( url, mode, isLocalFile, showProgressInfo ) { - connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( emitFinishedWithMimetype() ) ); + connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( emitFinishedWithMimetype() ) ); } KGVRun::~KGVRun() diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index c2ce2d2a..e61d9682 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -146,6 +146,6 @@ void ConfigDialog::showSettings( KGVPart* main ) { gssw->setDetectedVersion(Configuration::version()); - TQObject::connect( dialog, TQT_SIGNAL( settingsChanged() ), main, TQT_SLOT( slotConfigurationChanged() ) ); + TQObject::connect( dialog, TQ_SIGNAL( settingsChanged() ), main, TQ_SLOT( slotConfigurationChanged() ) ); dialog->show(); } diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 96cc28c6..c08b68f1 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -63,8 +63,8 @@ KGVDocument::KGVDocument( KGVPart* part, const char* name ) : readSettings(); _pdf2dsc = new Pdf2dsc( _interpreterPath, this ); - connect( _pdf2dsc, TQT_SIGNAL( finished( bool ) ), - TQT_SLOT( openPDFFileContinue( bool ) ) ); + connect( _pdf2dsc, TQ_SIGNAL( finished( bool ) ), + TQ_SLOT( openPDFFileContinue( bool ) ) ); } KGVDocument::~KGVDocument() @@ -87,7 +87,7 @@ void KGVDocument::openFile( const TQString& name, const TQString& mimetype ) _fileName = name; _mimetype = mimetype; - TQTimer::singleShot( 0, this, TQT_SLOT( doOpenFile() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doOpenFile() ) ); } void KGVDocument::doOpenFile() @@ -784,8 +784,8 @@ e=%1" ).arg( dscName ) << "-c" << "quit"; - connect( &process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( pdf2psExited( TDEProcess* ) ) ); + connect( &process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( pdf2psExited( TDEProcess* ) ) ); kdDebug(4500) << "KGVDocument: pdf2ps started" << endl; process.start( TDEProcess::NotifyOnExit ); @@ -830,8 +830,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName ) << "-c" << "quit"; - connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( processExited() ) ); + connect( _process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( processExited() ) ); kdDebug(4500) << "Pdf2dsc: started" << endl; _process->start( TDEProcess::NotifyOnExit ); diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 10a5c5e2..8217ce47 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -64,25 +64,25 @@ KGVShell::KGVShell() : /*---- File -----------------------------------------------------------*/ openact = - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); recent = - KStdAction::openRecent( this, TQT_SLOT( openURL( const KURL& ) ), + KStdAction::openRecent( this, TQ_SLOT( openURL( const KURL& ) ), actionCollection() ); - KStdAction::print( m_gvpart->document(), TQT_SLOT( print() ), + KStdAction::print( m_gvpart->document(), TQ_SLOT( print() ), actionCollection() ); (void) - KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() ); /*---- View -----------------------------------------------------------*/ new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), - m_gvpart, TQT_SLOT( reloadFile() ), + m_gvpart, TQ_SLOT( reloadFile() ), actionCollection(), "reload" ); new TDEAction( i18n( "&Maximize" ), Key_M, this, - TQT_SLOT( slotMaximize() ), actionCollection(), + TQ_SLOT( slotMaximize() ), actionCollection(), "maximize"); - _showMenuBarAction = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenubar() ), actionCollection() ); + _showMenuBarAction = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenubar() ), actionCollection() ); /*---- Settings -------------------------------------------------------*/ #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) @@ -91,12 +91,12 @@ KGVShell::KGVShell() : setAutoSaveSettings(); setStandardToolBarMenuEnabled(true); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) - m_fullScreenAction = KStdAction::fullScreen( this, TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); + m_fullScreenAction = KStdAction::fullScreen( this, TQ_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); #else - m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) ); + m_fullScreenAction = new TDEToggleAction( this, TQ_SLOT( slotUpdateFullScreen() ) ); #endif - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); //_popup = new TDEPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" ); @@ -108,21 +108,21 @@ actionCollection()); m_fsFilter = new FullScreenFilter( *this ); // Just save them automatically is destructor. (TODO: of kgv_view!) - //KStdAction::saveOptions ( this, TQT_SLOT (slotWriteSettings()), actionCollection()); + //KStdAction::saveOptions ( this, TQ_SLOT (slotWriteSettings()), actionCollection()); setXMLFile( "kghostviewui.rc" ); // We could, at the user's option, make this connection and kghostview // will always resize to fit the width of the page. But, for now, // let's not. - // connect ( m_gvpart->widget(), TQT_SIGNAL (sizeHintChanged()), this, TQT_SLOT (slotResize ()) ); + // connect ( m_gvpart->widget(), TQ_SIGNAL (sizeHintChanged()), this, TQ_SLOT (slotResize ()) ); setCentralWidget( m_gvpart->widget() ); createGUI( m_gvpart ); - connect( m_gvpart->pageView(), TQT_SIGNAL( rightClick() ),TQT_SLOT( slotRMBClick() ) ); - connect( m_gvpart, TQT_SIGNAL( canceled(const TQString&) ),TQT_SLOT( slotReset() ) ); - connect( m_gvpart, TQT_SIGNAL( completed() ), TQT_SLOT( slotDocumentState() ) ); + connect( m_gvpart->pageView(), TQ_SIGNAL( rightClick() ),TQ_SLOT( slotRMBClick() ) ); + connect( m_gvpart, TQ_SIGNAL( canceled(const TQString&) ),TQ_SLOT( slotReset() ) ); + connect( m_gvpart, TQ_SIGNAL( completed() ), TQ_SLOT( slotDocumentState() ) ); if (!initialGeometrySet()) resize(640,400); @@ -304,7 +304,7 @@ void KGVShell::slotMaximize() KWin::setState( winId(), NET::MaxHoriz | NET::MaxVert ); // If we do it now, it comes to nothing since it would work // on the current (non-maximized) size - TQTimer::singleShot( 800, m_gvpart, TQT_SLOT( slotFitToPage() ) ); + TQTimer::singleShot( 800, m_gvpart, TQ_SLOT( slotFitToPage() ) ); } void KGVShell::slotResize() @@ -352,7 +352,7 @@ void KGVShell::slotConfigureToolbars() { saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar dlg( factory() ); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index b974bb41..7dd9f1be 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -358,14 +358,14 @@ bool KPSWidget::startInterpreter() else *_process << _fileName << "-c" << "quit"; - connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); - connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( gs_output( TDEProcess*, char*, int ) ) ); - connect( _process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( gs_output( TDEProcess*, char*, int ) ) ); - connect( _process, TQT_SIGNAL( wroteStdin( TDEProcess*) ), - this, TQT_SLOT( gs_input( TDEProcess* ) ) ); + connect( _process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( _process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( gs_output( TDEProcess*, char*, int ) ) ); + connect( _process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( gs_output( TDEProcess*, char*, int ) ) ); + connect( _process, TQ_SIGNAL( wroteStdin( TDEProcess*) ), + this, TQ_SLOT( gs_input( TDEProcess* ) ) ); kapp->flushX(); diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp index 2e94e45a..1e28fdb3 100644 --- a/kghostview/logwindow.cpp +++ b/kghostview/logwindow.cpp @@ -46,8 +46,8 @@ LogWindow::LogWindow( const TQString& caption, _logView->setFont( TDEGlobalSettings::fixedFont() ); _logView->setMinimumWidth( 80 * fontMetrics().width( " " ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( clear() ) ); - connect( _configureGS, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( emitConfigureGS() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( clear() ) ); + connect( _configureGS, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( emitConfigureGS() ) ); } void LogWindow::emitConfigureGS() { diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp index 257c21c6..e21ab7b0 100644 --- a/kghostview/marklist.cpp +++ b/kghostview/marklist.cpp @@ -105,7 +105,7 @@ void MarkListItem::paintEvent( TQPaintEvent* ) */ if ( _requested ) return; if ( !_thumbnailW->paletteBackgroundPixmap() || _thumbnailW->paletteBackgroundPixmap()->isNull() ) { - _miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, this, TQT_SLOT( setPixmap( TQPixmap ) ) ); + _miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, this, TQ_SLOT( setPixmap( TQPixmap ) ) ); _requested = true; } } @@ -122,8 +122,8 @@ _miniWidget( mini ) setLeftMargin( 0 ); // we don't want the vertical header horizontalHeader()->setLabel( 0, i18n("Page") ); - connect( this, TQT_SIGNAL( currentChanged( int, int ) ), - this, TQT_SIGNAL( selected( int ) ) ); + connect( this, TQ_SIGNAL( currentChanged( int, int ) ), + this, TQ_SIGNAL( selected( int ) ) ); } TQValueList<int> MarkList::markList() const diff --git a/kghostview/thumbnailservice.cpp b/kghostview/thumbnailservice.cpp index 817d1c03..367aad14 100644 --- a/kghostview/thumbnailservice.cpp +++ b/kghostview/thumbnailservice.cpp @@ -37,8 +37,8 @@ ThumbnailService::ThumbnailService( KGVMiniWidget* parent, const char* name ) : { _thumbnailDrawer = new KPSWidget( parent->_part->widget(), "thumbnail-drawer" ); _thumbnailDrawer->readSettings(); - connect( _thumbnailDrawer, TQT_SIGNAL( newPageImage( TQPixmap ) ), TQT_SLOT( slotDone( TQPixmap ) ) ); - connect( timer_, TQT_SIGNAL( timeout() ), TQT_SLOT( processOne() ) ); + connect( _thumbnailDrawer, TQ_SIGNAL( newPageImage( TQPixmap ) ), TQ_SLOT( slotDone( TQPixmap ) ) ); + connect( timer_, TQ_SIGNAL( timeout() ), TQ_SLOT( processOne() ) ); _thumbnailDrawer->hide(); } @@ -133,10 +133,10 @@ void ThumbnailService::processOne() FILE* file = _mini->psFile(); Request req = *pending.begin(); kdDebug( 4500 ) << "ThumbnailService::processOne(): processing " << req.page << "(of " << pending.size() << " requests)" << endl; - disconnect( TQT_SIGNAL( relayPixmap( TQPixmap ) ) ); + disconnect( TQ_SIGNAL( relayPixmap( TQPixmap ) ) ); while ( !pending.empty() && req.page == pending.begin()->page ) { req = *pending.begin(); - connect( this, TQT_SIGNAL( relayPixmap( TQPixmap ) ), req.receiver, req.slot ); + connect( this, TQ_SIGNAL( relayPixmap( TQPixmap ) ), req.receiver, req.slot ); pending.erase( pending.begin() ); } _thumbnailDrawer->setOrientation( _mini->orientation( req.page ) ); diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index b5256dfa..7073fa69 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -56,8 +56,8 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) //magComboBox->hide(); - connect ( magComboBox, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (slotMagSelection (int)) ); + connect ( magComboBox, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (slotMagSelection (int)) ); grid->addWidget( magComboBox, 0, 1 ); @@ -65,8 +65,8 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) mediaComboBox = new TQComboBox( FALSE, vcGroupBox ); mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() ); - connect ( mediaComboBox, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (slotMediaSelection (int)) ); + connect ( mediaComboBox, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (slotMediaSelection (int)) ); grid->addWidget( mediaComboBox, 1, 1 ); @@ -77,8 +77,8 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) orientComboBox->insertItem(i18n("Upside Down")); orientComboBox->setFixedHeight( magComboBox->sizeHint().height() ); - connect ( orientComboBox, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (slotOrientSelection (int)) ); + connect ( orientComboBox, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (slotOrientSelection (int)) ); grid->addWidget( orientComboBox, 2, 1 ); int labelWidth = 0; @@ -124,10 +124,10 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) bbox->addStretch( 10 ); apply = bbox->addButton( KStdGuiItem::apply() ); - connect( apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyClicked()) ); + connect( apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyClicked()) ); TQPushButton *closebtn = bbox->addButton( KStdGuiItem::close() ); - connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( closebtn, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); bbox->layout(); diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp index 8dd605fa..1a5d2757 100644 --- a/kolourpaint/kolourpaint.cpp +++ b/kolourpaint/kolourpaint.cpp @@ -191,8 +191,8 @@ int main (int argc, char *argv []) // TQt says this is necessary but I don't think it is... - TQObject::connect (&app, TQT_SIGNAL (lastWindowClosed ()), - &app, TQT_SLOT (quit ())); + TQObject::connect (&app, TQ_SIGNAL (lastWindowClosed ()), + &app, TQ_SLOT (quit ())); if (app.isRestored ()) diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp index a30f028b..943c4501 100644 --- a/kolourpaint/kpcommandhistory.cpp +++ b/kolourpaint/kpcommandhistory.cpp @@ -259,13 +259,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig, m_actionUndo = new TDEToolBarPopupAction (undoActionText (), TQString::fromLatin1 ("edit-undo"), TDEStdAccel::shortcut (TDEStdAccel::Undo), - this, TQT_SLOT (undo ()), + this, TQ_SLOT (undo ()), ac, KStdAction::name (KStdAction::Undo)); m_actionRedo = new TDEToolBarPopupAction (redoActionText (), TQString::fromLatin1 ("edit-redo"), TDEStdAccel::shortcut (TDEStdAccel::Redo), - this, TQT_SLOT (redo ()), + this, TQ_SLOT (redo ()), ac, KStdAction::name (KStdAction::Redo)); @@ -273,10 +273,10 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig, m_actionRedo->setEnabled (false); - connect (m_actionUndo->popupMenu (), TQT_SIGNAL (activated (int)), - this, TQT_SLOT (undoUpToNumber (int))); - connect (m_actionRedo->popupMenu (), TQT_SIGNAL (activated (int)), - this, TQT_SLOT (redoUpToNumber (int))); + connect (m_actionUndo->popupMenu (), TQ_SIGNAL (activated (int)), + this, TQ_SLOT (undoUpToNumber (int))); + connect (m_actionRedo->popupMenu (), TQ_SIGNAL (activated (int)), + this, TQ_SLOT (redoUpToNumber (int))); m_undoMinLimit = 10; diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp index 2ba20cc3..ededcb99 100644 --- a/kolourpaint/kpdocument.cpp +++ b/kolourpaint/kpdocument.cpp @@ -1220,8 +1220,8 @@ void kpDocument::setSelection (const kpSelection &selection) // 2. We delete our copy when setSelection() is called again. // // See code above for both. - connect (m_selection, TQT_SIGNAL (changed (const TQRect &)), - this, TQT_SLOT (slotContentsChanged (const TQRect &))); + connect (m_selection, TQ_SIGNAL (changed (const TQRect &)), + this, TQ_SLOT (slotContentsChanged (const TQRect &))); if (!hadSelection) diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp index 422ca416..6c31834c 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.cpp +++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp @@ -100,8 +100,8 @@ KDialogBase (parent, name, false/*non-modal*/, lay->setRowStretch (0, 1); - connect (m_filePixmapLabel, TQT_SIGNAL (resized ()), - this, TQT_SLOT (updatePixmapPreview ())); + connect (m_filePixmapLabel, TQ_SIGNAL (resized ()), + this, TQ_SLOT (updatePixmapPreview ())); } kpDocumentSaveOptionsPreviewDialog::~kpDocumentSaveOptionsPreviewDialog () @@ -331,27 +331,27 @@ void kpDocumentSaveOptionsWidget::init () lay->addWidget (m_previewButton, 0/*stretch*/, TQt::AlignRight); - connect (m_colorDepthCombo, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (slotColorDepthSelected ())); - connect (m_colorDepthCombo, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (updatePreview ())); + connect (m_colorDepthCombo, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (slotColorDepthSelected ())); + connect (m_colorDepthCombo, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (updatePreview ())); - connect (m_qualityInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (updatePreviewDelayed ())); + connect (m_qualityInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (updatePreviewDelayed ())); - connect (m_previewButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (showPreview (bool))); + connect (m_previewButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (showPreview (bool))); m_updatePreviewDelay = 200/*ms*/; m_updatePreviewTimer = new TQTimer (this); - connect (m_updatePreviewTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (updatePreview ())); + connect (m_updatePreviewTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (updatePreview ())); m_updatePreviewDialogLastRelativeGeometryTimer = new TQTimer (this); - connect (m_updatePreviewDialogLastRelativeGeometryTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (updatePreviewDialogLastRelativeGeometry ())); + connect (m_updatePreviewDialogLastRelativeGeometryTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (updatePreviewDialogLastRelativeGeometry ())); setMode (None); @@ -705,7 +705,7 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode) // we change the height of "this", causing the text on the labels // to move but the first instance of the text doesn't get erased. // TQt bug. - TQTimer::singleShot (0, this, TQT_SLOT (repaintLabels ())); + TQTimer::singleShot (0, this, TQ_SLOT (repaintLabels ())); } // protected slot @@ -738,8 +738,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes) m_previewDialog = new kpDocumentSaveOptionsPreviewDialog (m_visualParent, "previewSaveDialog"); updatePreview (); - connect (m_previewDialog, TQT_SIGNAL (finished ()), - this, TQT_SLOT (hidePreview ())); + connect (m_previewDialog, TQ_SIGNAL (finished ()), + this, TQ_SLOT (hidePreview ())); TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave); @@ -834,10 +834,10 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes) updatePreviewDialogLastRelativeGeometry (); - connect (m_previewDialog, TQT_SIGNAL (moved ()), - this, TQT_SLOT (updatePreviewDialogLastRelativeGeometry ())); - connect (m_previewDialog, TQT_SIGNAL (resized ()), - this, TQT_SLOT (updatePreviewDialogLastRelativeGeometry ())); + connect (m_previewDialog, TQ_SIGNAL (moved ()), + this, TQ_SLOT (updatePreviewDialogLastRelativeGeometry ())); + connect (m_previewDialog, TQ_SIGNAL (resized ()), + this, TQ_SLOT (updatePreviewDialogLastRelativeGeometry ())); m_updatePreviewDialogLastRelativeGeometryTimer->start (200/*ms*/); } diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp index 24a45054..d43921d1 100644 --- a/kolourpaint/kpmainwindow.cpp +++ b/kolourpaint/kpmainwindow.cpp @@ -259,20 +259,20 @@ void kpMainWindow::init () #endif m_scrollView = new kpViewScrollableContainer (this, "scrollView"); - connect (m_scrollView, TQT_SIGNAL (beganDocResize ()), - this, TQT_SLOT (slotBeganDocResize ())); - connect (m_scrollView, TQT_SIGNAL (continuedDocResize (const TQSize &)), - this, TQT_SLOT (slotContinuedDocResize (const TQSize &))); - connect (m_scrollView, TQT_SIGNAL (cancelledDocResize ()), - this, TQT_SLOT (slotCancelledDocResize ())); - connect (m_scrollView, TQT_SIGNAL (endedDocResize (const TQSize &)), - this, TQT_SLOT (slotEndedDocResize (const TQSize &))); - - connect (m_scrollView, TQT_SIGNAL (statusMessageChanged (const TQString &)), - this, TQT_SLOT (slotDocResizeMessageChanged (const TQString &))); - - connect (m_scrollView, TQT_SIGNAL (contentsMoving (int, int)), - this, TQT_SLOT (slotScrollViewAboutToScroll ())); + connect (m_scrollView, TQ_SIGNAL (beganDocResize ()), + this, TQ_SLOT (slotBeganDocResize ())); + connect (m_scrollView, TQ_SIGNAL (continuedDocResize (const TQSize &)), + this, TQ_SLOT (slotContinuedDocResize (const TQSize &))); + connect (m_scrollView, TQ_SIGNAL (cancelledDocResize ()), + this, TQ_SLOT (slotCancelledDocResize ())); + connect (m_scrollView, TQ_SIGNAL (endedDocResize (const TQSize &)), + this, TQ_SLOT (slotEndedDocResize (const TQSize &))); + + connect (m_scrollView, TQ_SIGNAL (statusMessageChanged (const TQString &)), + this, TQ_SLOT (slotDocResizeMessageChanged (const TQString &))); + + connect (m_scrollView, TQ_SIGNAL (contentsMoving (int, int)), + this, TQ_SLOT (slotScrollViewAboutToScroll ())); setCentralWidget (m_scrollView); m_scrollView->show (); #if DEBUG_KP_MAIN_WINDOW @@ -707,16 +707,16 @@ void kpMainWindow::setDocument (kpDocument *newDoc) #endif // Copy/Cut/Deselect/Delete - connect (m_document, TQT_SIGNAL (selectionEnabled (bool)), - m_actionCut, TQT_SLOT (setEnabled (bool))); - connect (m_document, TQT_SIGNAL (selectionEnabled (bool)), - m_actionCopy, TQT_SLOT (setEnabled (bool))); - connect (m_document, TQT_SIGNAL (selectionEnabled (bool)), - m_actionDelete, TQT_SLOT (setEnabled (bool))); - connect (m_document, TQT_SIGNAL (selectionEnabled (bool)), - m_actionDeselect, TQT_SLOT (setEnabled (bool))); - connect (m_document, TQT_SIGNAL (selectionEnabled (bool)), - m_actionCopyToFile, TQT_SLOT (setEnabled (bool))); + connect (m_document, TQ_SIGNAL (selectionEnabled (bool)), + m_actionCut, TQ_SLOT (setEnabled (bool))); + connect (m_document, TQ_SIGNAL (selectionEnabled (bool)), + m_actionCopy, TQ_SLOT (setEnabled (bool))); + connect (m_document, TQ_SIGNAL (selectionEnabled (bool)), + m_actionDelete, TQ_SLOT (setEnabled (bool))); + connect (m_document, TQ_SIGNAL (selectionEnabled (bool)), + m_actionDeselect, TQ_SLOT (setEnabled (bool))); + connect (m_document, TQ_SIGNAL (selectionEnabled (bool)), + m_actionCopyToFile, TQ_SLOT (setEnabled (bool))); // this code won't actually enable any actions at this stage // (fresh document) but better safe than sorry @@ -726,40 +726,40 @@ void kpMainWindow::setDocument (kpDocument *newDoc) m_actionDelete->setEnabled (m_document->selection ()); m_actionCopyToFile->setEnabled (m_document->selection ()); - connect (m_document, TQT_SIGNAL (selectionEnabled (bool)), - this, TQT_SLOT (slotImageMenuUpdateDueToSelection ())); - connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)), - this, TQT_SLOT (slotImageMenuUpdateDueToSelection ())); + connect (m_document, TQ_SIGNAL (selectionEnabled (bool)), + this, TQ_SLOT (slotImageMenuUpdateDueToSelection ())); + connect (m_document, TQ_SIGNAL (selectionIsTextChanged (bool)), + this, TQ_SLOT (slotImageMenuUpdateDueToSelection ())); // Status bar - connect (m_document, TQT_SIGNAL (documentOpened ()), - this, TQT_SLOT (recalculateStatusBar ())); + connect (m_document, TQ_SIGNAL (documentOpened ()), + this, TQ_SLOT (recalculateStatusBar ())); - connect (m_document, TQT_SIGNAL (sizeChanged (const TQSize &)), - this, TQT_SLOT (setStatusBarDocSize (const TQSize &))); + connect (m_document, TQ_SIGNAL (sizeChanged (const TQSize &)), + this, TQ_SLOT (setStatusBarDocSize (const TQSize &))); // Caption (url, modified) - connect (m_document, TQT_SIGNAL (documentModified ()), - this, TQT_SLOT (slotUpdateCaption ())); - connect (m_document, TQT_SIGNAL (documentOpened ()), - this, TQT_SLOT (slotUpdateCaption ())); - connect (m_document, TQT_SIGNAL (documentSaved ()), - this, TQT_SLOT (slotUpdateCaption ())); + connect (m_document, TQ_SIGNAL (documentModified ()), + this, TQ_SLOT (slotUpdateCaption ())); + connect (m_document, TQ_SIGNAL (documentOpened ()), + this, TQ_SLOT (slotUpdateCaption ())); + connect (m_document, TQ_SIGNAL (documentSaved ()), + this, TQ_SLOT (slotUpdateCaption ())); // File/Reload action only available with non-empty URL - connect (m_document, TQT_SIGNAL (documentSaved ()), - this, TQT_SLOT (slotEnableReload ())); + connect (m_document, TQ_SIGNAL (documentSaved ()), + this, TQ_SLOT (slotEnableReload ())); - connect (m_document, TQT_SIGNAL (documentSaved ()), - this, TQT_SLOT (slotEnableSettingsShowPath ())); + connect (m_document, TQ_SIGNAL (documentSaved ()), + this, TQ_SLOT (slotEnableSettingsShowPath ())); // Command history if (m_commandHistory) { - connect (m_commandHistory, TQT_SIGNAL (documentRestored ()), - this, TQT_SLOT (slotDocumentRestored ())); // caption "!modified" - connect (m_document, TQT_SIGNAL (documentSaved ()), - m_commandHistory, TQT_SLOT (documentSaved ())); + connect (m_commandHistory, TQ_SIGNAL (documentRestored ()), + this, TQ_SLOT (slotDocumentRestored ())); // caption "!modified" + connect (m_document, TQ_SIGNAL (documentSaved ()), + m_commandHistory, TQ_SLOT (documentSaved ())); } else { @@ -768,10 +768,10 @@ void kpMainWindow::setDocument (kpDocument *newDoc) } // Sync document -> views - connect (m_document, TQT_SIGNAL (contentsChanged (const TQRect &)), - m_viewManager, TQT_SLOT (updateViews (const TQRect &))); - connect (m_document, TQT_SIGNAL (sizeChanged (int, int)), - m_viewManager, TQT_SLOT (adjustViewsToEnvironment ())); + connect (m_document, TQ_SIGNAL (contentsChanged (const TQRect &)), + m_viewManager, TQ_SLOT (updateViews (const TQRect &))); + connect (m_document, TQ_SIGNAL (sizeChanged (int, int)), + m_viewManager, TQ_SLOT (adjustViewsToEnvironment ())); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\tenabling actions" << endl; @@ -814,7 +814,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc) #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\tcreating thumbnail LATER" << endl; #endif - TQTimer::singleShot (0, this, TQT_SLOT (slotCreateThumbnail ())); + TQTimer::singleShot (0, this, TQ_SLOT (slotCreateThumbnail ())); } } #endif @@ -1003,7 +1003,7 @@ void kpMainWindow::slotScrollViewAboutToScroll () } #endif - TQTimer::singleShot (0, this, TQT_SLOT (slotScrollViewAfterScroll ())); + TQTimer::singleShot (0, this, TQ_SLOT (slotScrollViewAfterScroll ())); } // private slot diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index dd62bcda..81312049 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -103,25 +103,25 @@ void kpMainWindow::setupEditMenuActions () } - m_actionCut = KStdAction::cut (this, TQT_SLOT (slotCut ()), ac); - m_actionCopy = KStdAction::copy (this, TQT_SLOT (slotCopy ()), ac); - m_actionPaste = KStdAction::paste (this, TQT_SLOT (slotPaste ()), ac); + m_actionCut = KStdAction::cut (this, TQ_SLOT (slotCut ()), ac); + m_actionCopy = KStdAction::copy (this, TQ_SLOT (slotCopy ()), ac); + m_actionPaste = KStdAction::paste (this, TQ_SLOT (slotPaste ()), ac); m_actionPasteInNewWindow = new TDEAction (i18n ("Paste in &New Window"), TQt::CTRL + TQt::SHIFT + TQt::Key_V, - this, TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window"); + this, TQ_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window"); - //m_actionDelete = KStdAction::clear (this, TQT_SLOT (slotDelete ()), ac); + //m_actionDelete = KStdAction::clear (this, TQ_SLOT (slotDelete ()), ac); m_actionDelete = new TDEAction (i18n ("&Delete Selection"), 0, - this, TQT_SLOT (slotDelete ()), ac, "edit_clear"); + this, TQ_SLOT (slotDelete ()), ac, "edit_clear"); - m_actionSelectAll = KStdAction::selectAll (this, TQT_SLOT (slotSelectAll ()), ac); - m_actionDeselect = KStdAction::deselect (this, TQT_SLOT (slotDeselect ()), ac); + m_actionSelectAll = KStdAction::selectAll (this, TQ_SLOT (slotSelectAll ()), ac); + m_actionDeselect = KStdAction::deselect (this, TQ_SLOT (slotDeselect ()), ac); m_actionCopyToFile = new TDEAction (i18n ("C&opy to File..."), 0, - this, TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file"); + this, TQ_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file"); m_actionPasteFromFile = new TDEAction (i18n ("Paste &From File..."), 0, - this, TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file"); + this, TQ_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file"); m_editMenuDocumentActionsEnabled = false; @@ -129,8 +129,8 @@ void kpMainWindow::setupEditMenuActions () // Paste should always be enabled, as long as there is something paste // (independent of whether we have a document or not) - connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()), - this, TQT_SLOT (slotEnablePaste ())); + connect (TQApplication::clipboard (), TQ_SIGNAL (dataChanged ()), + this, TQ_SLOT (slotEnablePaste ())); slotEnablePaste (); } diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index 25834797..60fd99a7 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/kolourpaint/kpmainwindow_file.cpp @@ -67,41 +67,41 @@ void kpMainWindow::setupFileMenuActions () #endif TDEActionCollection *ac = actionCollection (); - m_actionNew = KStdAction::openNew (this, TQT_SLOT (slotNew ()), ac); - m_actionOpen = KStdAction::open (this, TQT_SLOT (slotOpen ()), ac); + m_actionNew = KStdAction::openNew (this, TQ_SLOT (slotNew ()), ac); + m_actionOpen = KStdAction::open (this, TQ_SLOT (slotOpen ()), ac); - m_actionOpenRecent = KStdAction::openRecent (this, TQT_SLOT (slotOpenRecent (const KURL &)), ac); + m_actionOpenRecent = KStdAction::openRecent (this, TQ_SLOT (slotOpenRecent (const KURL &)), ac); m_actionOpenRecent->loadEntries (kapp->config ()); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\trecent URLs=" << m_actionOpenRecent->items () << endl; #endif - m_actionSave = KStdAction::save (this, TQT_SLOT (slotSave ()), ac); - m_actionSaveAs = KStdAction::saveAs (this, TQT_SLOT (slotSaveAs ()), ac); + m_actionSave = KStdAction::save (this, TQ_SLOT (slotSave ()), ac); + m_actionSaveAs = KStdAction::saveAs (this, TQ_SLOT (slotSaveAs ()), ac); m_actionExport = new TDEAction (i18n ("E&xport..."), 0, - this, TQT_SLOT (slotExport ()), ac, "file_export"); + this, TQ_SLOT (slotExport ()), ac, "file_export"); m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0, - this, TQT_SLOT (slotScan ()), ac, "file_scan"); + this, TQ_SLOT (slotScan ()), ac, "file_scan"); - //m_actionRevert = KStdAction::revert (this, TQT_SLOT (slotRevert ()), ac); + //m_actionRevert = KStdAction::revert (this, TQ_SLOT (slotRevert ()), ac); m_actionReload = new TDEAction (i18n ("Reloa&d"), TDEStdAccel::reload (), - this, TQT_SLOT (slotReload ()), ac, "file_revert"); + this, TQ_SLOT (slotReload ()), ac, "file_revert"); slotEnableReload (); - m_actionPrint = KStdAction::print (this, TQT_SLOT (slotPrint ()), ac); - m_actionPrintPreview = KStdAction::printPreview (this, TQT_SLOT (slotPrintPreview ()), ac); + m_actionPrint = KStdAction::print (this, TQ_SLOT (slotPrint ()), ac); + m_actionPrintPreview = KStdAction::printPreview (this, TQ_SLOT (slotPrintPreview ()), ac); - m_actionMail = KStdAction::mail (this, TQT_SLOT (slotMail ()), ac); + m_actionMail = KStdAction::mail (this, TQ_SLOT (slotMail ()), ac); m_actionSetAsWallpaperCentered = new TDEAction (i18n ("Set as Wa&llpaper (Centered)"), 0, - this, TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered"); + this, TQ_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered"); m_actionSetAsWallpaperTiled = new TDEAction (i18n ("Set as Wallpaper (&Tiled)"), 0, - this, TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); + this, TQ_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); - m_actionClose = KStdAction::close (this, TQT_SLOT (slotClose ()), ac); - m_actionQuit = KStdAction::quit (this, TQT_SLOT (slotQuit ()), ac); + m_actionClose = KStdAction::close (this, TQ_SLOT (slotClose ()), ac); + m_actionQuit = KStdAction::quit (this, TQ_SLOT (slotQuit ()), ac); m_scanDialog = 0; @@ -451,8 +451,8 @@ void kpMainWindow::slotScan () #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\tcreated scanDialog=" << m_scanDialog << endl; #endif - connect (m_scanDialog, TQT_SIGNAL (finalImage (const TQImage &, int)), - TQT_SLOT (slotScanned (const TQImage &, int))); + connect (m_scanDialog, TQ_SIGNAL (finalImage (const TQImage &, int)), + TQ_SLOT (slotScanned (const TQImage &, int))); } @@ -704,8 +704,8 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption, if (localOnly) fd.setMode (KFile::File | KFile::LocalOnly); - connect (&fd, TQT_SIGNAL (filterChanged (const TQString &)), - saveOptionsWidget, TQT_SLOT (setMimeType (const TQString &))); + connect (&fd, TQ_SIGNAL (filterChanged (const TQString &)), + saveOptionsWidget, TQ_SLOT (setMimeType (const TQString &))); if (fd.exec ()) diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp index 7b4488fa..4a1709ab 100644 --- a/kolourpaint/kpmainwindow_help.cpp +++ b/kolourpaint/kpmainwindow_help.cpp @@ -57,7 +57,7 @@ void kpMainWindow::setupHelpMenuActions () // -- Thurston d->m_actionHelpTakingScreenshots = new TDEAction ( i18n ("Acquiring &Screenshots"), 0, - this, TQT_SLOT (slotHelpTakingScreenshots ()), + this, TQ_SLOT (slotHelpTakingScreenshots ()), ac, "help_taking_screenshots"); @@ -185,10 +185,10 @@ void kpMainWindow::slotHelpTakingScreenshots () true/*separator line*/); KActiveLabel *messageLabel = new KActiveLabel (message, &dlg); - disconnect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)), - messageLabel, TQT_SLOT (openLink (const TQString &))); - connect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)), - this, TQT_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &))); + disconnect (messageLabel, TQ_SIGNAL (linkClicked (const TQString &)), + messageLabel, TQ_SLOT (openLink (const TQString &))); + connect (messageLabel, TQ_SIGNAL (linkClicked (const TQString &)), + this, TQ_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &))); dlg.setMainWidget (messageLabel); diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp index 533b11f9..9a5fd060 100644 --- a/kolourpaint/kpmainwindow_image.cpp +++ b/kolourpaint/kpmainwindow_image.cpp @@ -90,37 +90,37 @@ void kpMainWindow::setupImageMenuActions () TDEActionCollection *ac = actionCollection (); m_actionResizeScale = new TDEAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E, - this, TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale"); + this, TQ_SLOT (slotResizeScale ()), ac, "image_resize_scale"); m_actionCrop = new TDEAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T, - this, TQT_SLOT (slotCrop ()), ac, "image_crop"); + this, TQ_SLOT (slotCrop ()), ac, "image_crop"); m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U, - this, TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop"); + this, TQ_SLOT (slotAutoCrop ()), ac, "image_auto_crop"); m_actionFlip = new TDEAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F, - this, TQT_SLOT (slotFlip ()), ac, "image_flip"); + this, TQ_SLOT (slotFlip ()), ac, "image_flip"); m_actionRotate = new TDEAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R, - this, TQT_SLOT (slotRotate ()), ac, "image_rotate"); + this, TQ_SLOT (slotRotate ()), ac, "image_rotate"); m_actionSkew = new TDEAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K, - this, TQT_SLOT (slotSkew ()), ac, "image_skew"); + this, TQ_SLOT (slotSkew ()), ac, "image_skew"); m_actionConvertToBlackAndWhite = new TDEAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0, - this, TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white"); + this, TQ_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white"); m_actionConvertToGrayscale = new TDEAction (i18n ("Reduce to &Grayscale"), 0, - this, TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale"); + this, TQ_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale"); m_actionInvertColors = new TDEAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I, - this, TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors"); + this, TQ_SLOT (slotInvertColors ()), ac, "image_invert_colors"); m_actionClear = new TDEAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N, - this, TQT_SLOT (slotClear ()), ac, "image_clear"); + this, TQ_SLOT (slotClear ()), ac, "image_clear"); m_actionMoreEffects = new TDEAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M, - this, TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects"); + this, TQ_SLOT (slotMoreEffects ()), ac, "image_more_effects"); enableImageMenuDocumentActions (false); } diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index 6dfff99b..c3fe3025 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -57,19 +57,19 @@ void kpMainWindow::setupSettingsMenuActions () createStandardStatusBarAction (); - m_actionFullScreen = KStdAction::fullScreen (this, TQT_SLOT (slotFullScreen ()), ac, + m_actionFullScreen = KStdAction::fullScreen (this, TQ_SLOT (slotFullScreen ()), ac, this/*window*/); m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0, - this, TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path"); + this, TQ_SLOT (slotShowPathToggled ()), ac, "settings_show_path"); m_actionShowPath->setCheckedState (i18n ("Hide &Path")); slotEnableSettingsShowPath (); - m_actionKeyBindings = KStdAction::keyBindings (this, TQT_SLOT (slotKeyBindings ()), ac); - m_actionConfigureToolbars = KStdAction::configureToolbars (this, TQT_SLOT (slotConfigureToolBars ()), ac); - // m_actionConfigure = KStdAction::preferences (this, TQT_SLOT (slotConfigure ()), ac); + m_actionKeyBindings = KStdAction::keyBindings (this, TQ_SLOT (slotKeyBindings ()), ac); + m_actionConfigureToolbars = KStdAction::configureToolbars (this, TQ_SLOT (slotConfigureToolBars ()), ac); + // m_actionConfigure = KStdAction::preferences (this, TQ_SLOT (slotConfigure ()), ac); enableSettingsMenuDocumentActions (false); @@ -174,8 +174,8 @@ void kpMainWindow::slotConfigureToolBars () // Clicking on OK after Apply brings up the dialog (below) again. // Bug with KEditToolBar. dialog.showButtonApply (false); - connect (&dialog, TQT_SIGNAL (newToolbarConfig ()), - this, TQT_SLOT (slotNewToolBarConfig ())); + connect (&dialog, TQ_SIGNAL (newToolbarConfig ()), + this, TQ_SLOT (slotNewToolBarConfig ())); dialog.exec (); } diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index 11058217..55dff166 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -50,22 +50,22 @@ void kpMainWindow::setupTextToolBarActions () TDEActionCollection *ac = actionCollection (); m_actionTextFontFamily = new TDEFontAction (i18n ("Font Family"), 0/*shortcut*/, - this, TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); + this, TQ_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); m_actionTextFontSize = new TDEFontSizeAction (i18n ("Font Size"), 0/*shortcut*/, - this, TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); + this, TQ_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); m_actionTextBold = new TDEToggleAction (i18n ("Bold"), "format-text-bold"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextBoldChanged ()), ac, "format-text-bold"); + this, TQ_SLOT (slotTextBoldChanged ()), ac, "format-text-bold"); m_actionTextItalic = new TDEToggleAction (i18n ("Italic"), "format-text-italic"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextItalicChanged ()), ac, "format-text-italic"); + this, TQ_SLOT (slotTextItalicChanged ()), ac, "format-text-italic"); m_actionTextUnderline = new TDEToggleAction (i18n ("Underline"), "format-text-underline"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); + this, TQ_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); m_actionTextStrikeThru = new TDEToggleAction (i18n ("Strike Through"), "format-text-strikethrough"/*icon*/, 0/*shortcut*/, - this, TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); + this, TQ_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); readAndApplyTextSettings (); diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp index 26c6bc00..3e906899 100644 --- a/kolourpaint/kpmainwindow_tools.cpp +++ b/kolourpaint/kpmainwindow_tools.cpp @@ -103,23 +103,23 @@ void kpMainWindow::setupToolActions () m_actionPrevToolOptionGroup1 = new kpSingleKeyTriggersAction ( i18n ("Previous Tool Option (Group #1)"), kpTool::shortcutForKey (TQt::Key_1), - this, TQT_SLOT (slotActionPrevToolOptionGroup1 ()), + this, TQ_SLOT (slotActionPrevToolOptionGroup1 ()), ac, "prev_tool_option_group_1"); m_actionNextToolOptionGroup1 = new kpSingleKeyTriggersAction ( i18n ("Next Tool Option (Group #1)"), kpTool::shortcutForKey (TQt::Key_2), - this, TQT_SLOT (slotActionNextToolOptionGroup1 ()), + this, TQ_SLOT (slotActionNextToolOptionGroup1 ()), ac, "next_tool_option_group_1"); m_actionPrevToolOptionGroup2 = new kpSingleKeyTriggersAction ( i18n ("Previous Tool Option (Group #2)"), kpTool::shortcutForKey (TQt::Key_3), - this, TQT_SLOT (slotActionPrevToolOptionGroup2 ()), + this, TQ_SLOT (slotActionPrevToolOptionGroup2 ()), ac, "prev_tool_option_group_2"); m_actionNextToolOptionGroup2 = new kpSingleKeyTriggersAction ( i18n ("Next Tool Option (Group #2)"), kpTool::shortcutForKey (TQt::Key_4), - this, TQT_SLOT (slotActionNextToolOptionGroup2 ()), + this, TQ_SLOT (slotActionNextToolOptionGroup2 ()), ac, "next_tool_option_group_2"); } @@ -127,10 +127,10 @@ void kpMainWindow::setupToolActions () void kpMainWindow::createToolBox () { m_toolToolBar = new kpToolToolBar (i18n ("Tool Box"), this, 2/*columns/rows*/, "Tool Box"); - connect (m_toolToolBar, TQT_SIGNAL (sigToolSelected (kpTool *)), - this, TQT_SLOT (slotToolSelected (kpTool *))); - connect (m_toolToolBar, TQT_SIGNAL (toolWidgetOptionSelected ()), - this, TQT_SLOT (updateToolOptionPrevNextActionsEnabled ())); + connect (m_toolToolBar, TQ_SIGNAL (sigToolSelected (kpTool *)), + this, TQ_SLOT (slotToolSelected (kpTool *))); + connect (m_toolToolBar, TQ_SIGNAL (toolWidgetOptionSelected ()), + this, TQ_SLOT (updateToolOptionPrevNextActionsEnabled ())); for (TQPtrList <kpTool>::const_iterator it = m_tools.begin (); it != m_tools.end (); @@ -331,55 +331,55 @@ void kpMainWindow::slotToolSelected (kpTool *tool) if (previousTool) { - disconnect (previousTool, TQT_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)), - this, TQT_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *))); - disconnect (previousTool, TQT_SIGNAL (endedDraw (const TQPoint &)), - this, TQT_SLOT (slotEndDragScroll ())); - disconnect (previousTool, TQT_SIGNAL (cancelledShape (const TQPoint &)), - this, TQT_SLOT (slotEndDragScroll ())); - - disconnect (previousTool, TQT_SIGNAL (userMessageChanged (const TQString &)), - this, TQT_SLOT (recalculateStatusBarMessage ())); - disconnect (previousTool, TQT_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)), - this, TQT_SLOT (recalculateStatusBarShape ())); - disconnect (previousTool, TQT_SIGNAL (userShapeSizeChanged (const TQSize &)), - this, TQT_SLOT (recalculateStatusBarShape ())); - - disconnect (m_colorToolBar, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), - previousTool, TQT_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &))); - disconnect (m_colorToolBar, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), - previousTool, TQT_SLOT (slotForegroundColorChangedInternal (const kpColor &))); - disconnect (m_colorToolBar, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), - previousTool, TQT_SLOT (slotBackgroundColorChangedInternal (const kpColor &))); - disconnect (m_colorToolBar, TQT_SIGNAL (colorSimilarityChanged (double, int)), - previousTool, TQT_SLOT (slotColorSimilarityChangedInternal (double, int))); + disconnect (previousTool, TQ_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)), + this, TQ_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *))); + disconnect (previousTool, TQ_SIGNAL (endedDraw (const TQPoint &)), + this, TQ_SLOT (slotEndDragScroll ())); + disconnect (previousTool, TQ_SIGNAL (cancelledShape (const TQPoint &)), + this, TQ_SLOT (slotEndDragScroll ())); + + disconnect (previousTool, TQ_SIGNAL (userMessageChanged (const TQString &)), + this, TQ_SLOT (recalculateStatusBarMessage ())); + disconnect (previousTool, TQ_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)), + this, TQ_SLOT (recalculateStatusBarShape ())); + disconnect (previousTool, TQ_SIGNAL (userShapeSizeChanged (const TQSize &)), + this, TQ_SLOT (recalculateStatusBarShape ())); + + disconnect (m_colorToolBar, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), + previousTool, TQ_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &))); + disconnect (m_colorToolBar, TQ_SIGNAL (foregroundColorChanged (const kpColor &)), + previousTool, TQ_SLOT (slotForegroundColorChangedInternal (const kpColor &))); + disconnect (m_colorToolBar, TQ_SIGNAL (backgroundColorChanged (const kpColor &)), + previousTool, TQ_SLOT (slotBackgroundColorChangedInternal (const kpColor &))); + disconnect (m_colorToolBar, TQ_SIGNAL (colorSimilarityChanged (double, int)), + previousTool, TQ_SLOT (slotColorSimilarityChangedInternal (double, int))); } if (tool) { - connect (tool, TQT_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)), - this, TQT_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *))); - connect (tool, TQT_SIGNAL (endedDraw (const TQPoint &)), - this, TQT_SLOT (slotEndDragScroll ())); - connect (tool, TQT_SIGNAL (cancelledShape (const TQPoint &)), - this, TQT_SLOT (slotEndDragScroll ())); - - connect (tool, TQT_SIGNAL (userMessageChanged (const TQString &)), - this, TQT_SLOT (recalculateStatusBarMessage ())); - connect (tool, TQT_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)), - this, TQT_SLOT (recalculateStatusBarShape ())); - connect (tool, TQT_SIGNAL (userShapeSizeChanged (const TQSize &)), - this, TQT_SLOT (recalculateStatusBarShape ())); + connect (tool, TQ_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)), + this, TQ_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *))); + connect (tool, TQ_SIGNAL (endedDraw (const TQPoint &)), + this, TQ_SLOT (slotEndDragScroll ())); + connect (tool, TQ_SIGNAL (cancelledShape (const TQPoint &)), + this, TQ_SLOT (slotEndDragScroll ())); + + connect (tool, TQ_SIGNAL (userMessageChanged (const TQString &)), + this, TQ_SLOT (recalculateStatusBarMessage ())); + connect (tool, TQ_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)), + this, TQ_SLOT (recalculateStatusBarShape ())); + connect (tool, TQ_SIGNAL (userShapeSizeChanged (const TQSize &)), + this, TQ_SLOT (recalculateStatusBarShape ())); recalculateStatusBar (); - connect (m_colorToolBar, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), - tool, TQT_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &))); - connect (m_colorToolBar, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), - tool, TQT_SLOT (slotForegroundColorChangedInternal (const kpColor &))); - connect (m_colorToolBar, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), - tool, TQT_SLOT (slotBackgroundColorChangedInternal (const kpColor &))); - connect (m_colorToolBar, TQT_SIGNAL (colorSimilarityChanged (double, int)), - tool, TQT_SLOT (slotColorSimilarityChangedInternal (double, int))); + connect (m_colorToolBar, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), + tool, TQ_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &))); + connect (m_colorToolBar, TQ_SIGNAL (foregroundColorChanged (const kpColor &)), + tool, TQ_SLOT (slotForegroundColorChangedInternal (const kpColor &))); + connect (m_colorToolBar, TQ_SIGNAL (backgroundColorChanged (const kpColor &)), + tool, TQ_SLOT (slotBackgroundColorChangedInternal (const kpColor &))); + connect (m_colorToolBar, TQ_SIGNAL (colorSimilarityChanged (double, int)), + tool, TQ_SLOT (slotColorSimilarityChangedInternal (double, int))); saveLastTool (); diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index 39d6cab3..e45888e9 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -67,18 +67,18 @@ void kpMainWindow::setupViewMenuActions () m_actionFullScreen->setEnabled (false);*/ - m_actionActualSize = KStdAction::actualSize (this, TQT_SLOT (slotActualSize ()), ac); - /*m_actionFitToPage = KStdAction::fitToPage (this, TQT_SLOT (slotFitToPage ()), ac); - m_actionFitToWidth = KStdAction::fitToWidth (this, TQT_SLOT (slotFitToWidth ()), ac); - m_actionFitToHeight = KStdAction::fitToHeight (this, TQT_SLOT (slotFitToHeight ()), ac);*/ + m_actionActualSize = KStdAction::actualSize (this, TQ_SLOT (slotActualSize ()), ac); + /*m_actionFitToPage = KStdAction::fitToPage (this, TQ_SLOT (slotFitToPage ()), ac); + m_actionFitToWidth = KStdAction::fitToWidth (this, TQ_SLOT (slotFitToWidth ()), ac); + m_actionFitToHeight = KStdAction::fitToHeight (this, TQ_SLOT (slotFitToHeight ()), ac);*/ - m_actionZoomIn = KStdAction::zoomIn (this, TQT_SLOT (slotZoomIn ()), ac); - m_actionZoomOut = KStdAction::zoomOut (this, TQT_SLOT (slotZoomOut ()), ac); + m_actionZoomIn = KStdAction::zoomIn (this, TQ_SLOT (slotZoomIn ()), ac); + m_actionZoomOut = KStdAction::zoomOut (this, TQ_SLOT (slotZoomOut ()), ac); m_actionZoom = new TDESelectAction (i18n ("&Zoom"), 0, - this, TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to"); + this, TQ_SLOT (slotZoom ()), actionCollection (), "view_zoom_to"); m_actionZoom->setEditable (true); // create the zoom list for the 1st call to zoomTo() below @@ -91,7 +91,7 @@ void kpMainWindow::setupViewMenuActions () m_actionShowGrid = new TDEToggleAction (i18n ("Show &Grid"), CTRL + Key_G, - this, TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid"); + this, TQ_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid"); m_actionShowGrid->setCheckedState (i18n ("Hide &Grid")); @@ -99,12 +99,12 @@ void kpMainWindow::setupViewMenuActions () // Testcase: Press CTRL+H twice on a fresh KolourPaint. // The second CTRL+H doesn't close the thumbnail. m_actionShowThumbnail = new TDEToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H, - this, TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail"); + this, TQ_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail"); m_actionShowThumbnail->setCheckedState (i18n ("Hide T&humbnail")); // Please do not use setCheckedState() here - it wouldn't make sense m_actionZoomedThumbnail = new TDEToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0, - this, TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail"); + this, TQ_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail"); // For consistency with the above action, don't use setCheckedState() // @@ -114,7 +114,7 @@ void kpMainWindow::setupViewMenuActions () d->m_actionShowThumbnailRectangle = new TDEToggleAction ( i18n ("Enable Thumbnail &Rectangle"), 0, - this, TQT_SLOT (slotThumbnailShowRectangleToggled ()), + this, TQ_SLOT (slotThumbnailShowRectangleToggled ()), actionCollection (), "view_show_thumbnail_rectangle"); @@ -511,7 +511,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor) // caused mainly by m_scrollView->center() // // TODO: remove flicker completely - //TQTimer::singleShot (0, this, TQT_SLOT (finishZoomTo ())); + //TQTimer::singleShot (0, this, TQ_SLOT (finishZoomTo ())); // Later: I don't think there is an update() that needs to be queued // - let's reduce latency instead. @@ -822,8 +822,8 @@ void kpMainWindow::notifyThumbnailGeometryChanged () if (!m_thumbnailSaveConfigTimer) { m_thumbnailSaveConfigTimer = new TQTimer (this); - connect (m_thumbnailSaveConfigTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (slotSaveThumbnailGeometry ())); + connect (m_thumbnailSaveConfigTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (slotSaveThumbnailGeometry ())); } m_thumbnailSaveConfigTimer->start (500/*msec*/, true/*single shot*/); @@ -1121,8 +1121,8 @@ void kpMainWindow::updateThumbnail () #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\t\tconnecting thumbnail::visibilityChange to destroy slot" << endl; #endif - connect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)), - this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); + connect (m_thumbnail, TQ_SIGNAL (visibilityChanged (bool)), + this, TQ_SLOT (slotDestroyThumbnailIfNotVisible (bool))); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\t\tDONE" << endl; #endif @@ -1143,8 +1143,8 @@ void kpMainWindow::updateThumbnail () destroyThumbnailView (); - disconnect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)), - this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); + disconnect (m_thumbnail, TQ_SIGNAL (visibilityChanged (bool)), + this, TQ_SLOT (slotDestroyThumbnailIfNotVisible (bool))); m_thumbnail->deleteLater (); m_thumbnail = 0; } diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp index dbf6ff01..5aa2a4fa 100644 --- a/kolourpaint/kpthumbnail.cpp +++ b/kolourpaint/kpthumbnail.cpp @@ -109,10 +109,10 @@ void kpThumbnail::setView (kpThumbnailView *view) if (m_view) { - disconnect (m_view, TQT_SIGNAL (destroyed ()), - this, TQT_SLOT (slotViewDestroyed ())); - disconnect (m_view, TQT_SIGNAL (zoomLevelChanged (int, int)), - this, TQT_SLOT (updateCaption ())); + disconnect (m_view, TQ_SIGNAL (destroyed ()), + this, TQ_SLOT (slotViewDestroyed ())); + disconnect (m_view, TQ_SIGNAL (zoomLevelChanged (int, int)), + this, TQ_SLOT (updateCaption ())); boxLayout ()->remove (m_view); } @@ -121,10 +121,10 @@ void kpThumbnail::setView (kpThumbnailView *view) if (m_view) { - connect (m_view, TQT_SIGNAL (destroyed ()), - this, TQT_SLOT (slotViewDestroyed ())); - connect (m_view, TQT_SIGNAL (zoomLevelChanged (int, int)), - this, TQT_SLOT (updateCaption ())); + connect (m_view, TQ_SIGNAL (destroyed ()), + this, TQ_SLOT (slotViewDestroyed ())); + connect (m_view, TQ_SIGNAL (zoomLevelChanged (int, int)), + this, TQ_SLOT (updateCaption ())); updateCaption (); boxLayout ()->addWidget (m_view); diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index ff6a3271..15f1c895 100644 --- a/kolourpaint/kptool.cpp +++ b/kolourpaint/kptool.cpp @@ -151,13 +151,13 @@ void kpTool::createAction () m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key), - this, TQT_SLOT (slotActionActivated ()), + this, TQ_SLOT (slotActionActivated ()), m_mainWindow->actionCollection (), name ()); m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions")); m_action->setWhatsThis (description ()); - connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)), - this, TQT_SLOT (slotActionToolTipChanged (const TQString &))); + connect (m_action, TQ_SIGNAL (toolTipChanged (const TQString &)), + this, TQ_SLOT (slotActionToolTipChanged (const TQString &))); } diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp index da3097e1..8447b966 100644 --- a/kolourpaint/kpview.cpp +++ b/kolourpaint/kpview.cpp @@ -297,55 +297,55 @@ void kpView::showBuddyViewScrollableContainerRectangle (bool yes) // Got these connect statements by analysing deps of // updateBuddyViewScrollableContainerRectangle() rect update code. - connect (this, TQT_SIGNAL (zoomLevelChanged (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); - connect (this, TQT_SIGNAL (originChanged (const TQPoint &)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (this, TQ_SIGNAL (zoomLevelChanged (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (this, TQ_SIGNAL (originChanged (const TQPoint &)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); if (buddyViewScrollableContainer ()) { - connect (buddyViewScrollableContainer (), TQT_SIGNAL (contentsMovingSoon (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); - connect (buddyViewScrollableContainer (), TQT_SIGNAL (resized ()), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (buddyViewScrollableContainer (), TQ_SIGNAL (contentsMovingSoon (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (buddyViewScrollableContainer (), TQ_SIGNAL (resized ()), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); } if (buddyView ()) { - connect (buddyView (), TQT_SIGNAL (zoomLevelChanged (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); - connect (buddyView (), TQT_SIGNAL (originChanged (const TQPoint &)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (buddyView (), TQ_SIGNAL (zoomLevelChanged (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (buddyView (), TQ_SIGNAL (originChanged (const TQPoint &)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); - connect (buddyView (), TQT_SIGNAL (sizeChanged (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + connect (buddyView (), TQ_SIGNAL (sizeChanged (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); } } else { - disconnect (this, TQT_SIGNAL (zoomLevelChanged (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); - disconnect (this, TQT_SIGNAL (originChanged (const TQPoint &)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (this, TQ_SIGNAL (zoomLevelChanged (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (this, TQ_SIGNAL (originChanged (const TQPoint &)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); if (buddyViewScrollableContainer ()) { - disconnect (buddyViewScrollableContainer (), TQT_SIGNAL (contentsMovingSoon (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); - disconnect (buddyViewScrollableContainer (), TQT_SIGNAL (resized ()), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (buddyViewScrollableContainer (), TQ_SIGNAL (contentsMovingSoon (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (buddyViewScrollableContainer (), TQ_SIGNAL (resized ()), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); } if (buddyView ()) { - disconnect (buddyView (), TQT_SIGNAL (zoomLevelChanged (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); - disconnect (buddyView (), TQT_SIGNAL (originChanged (const TQPoint &)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (buddyView (), TQ_SIGNAL (zoomLevelChanged (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (buddyView (), TQ_SIGNAL (originChanged (const TQPoint &)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); - disconnect (buddyView (), TQT_SIGNAL (sizeChanged (int, int)), - this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ())); + disconnect (buddyView (), TQ_SIGNAL (sizeChanged (int, int)), + this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ())); } } diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp index 71b58a2c..8764b91b 100644 --- a/kolourpaint/kpviewmanager.cpp +++ b/kolourpaint/kpviewmanager.cpp @@ -229,8 +229,8 @@ void kpViewManager::setTextCursorEnabled (bool yes) if (yes) { m_textCursorBlinkTimer = new TQTimer (this); - connect (m_textCursorBlinkTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (slotTextCursorBlink ())); + connect (m_textCursorBlinkTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (slotTextCursorBlink ())); slotTextCursorBlink (); } // TODO: What if !yes - shouldn't it clear the cursor? diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp index 65b0da89..47c842d9 100644 --- a/kolourpaint/kpviewscrollablecontainer.cpp +++ b/kolourpaint/kpviewscrollablecontainer.cpp @@ -424,11 +424,11 @@ kpViewScrollableContainer::kpViewScrollableContainer (kpMainWindow *parent, connectGripSignals (m_bottomRightGrip); - connect (this, TQT_SIGNAL (contentsMoving (int, int)), - this, TQT_SLOT (slotContentsMoving (int, int))); + connect (this, TQ_SIGNAL (contentsMoving (int, int)), + this, TQ_SLOT (slotContentsMoving (int, int))); - connect (m_dragScrollTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (slotDragScroll ())); + connect (m_dragScrollTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (slotDragScroll ())); } kpViewScrollableContainer::~kpViewScrollableContainer () @@ -458,20 +458,20 @@ int kpViewScrollableContainer::contentsYSoon () // protected void kpViewScrollableContainer::connectGripSignals (kpGrip *grip) { - connect (grip, TQT_SIGNAL (beganDraw ()), - this, TQT_SLOT (slotGripBeganDraw ())); - connect (grip, TQT_SIGNAL (continuedDraw (int, int, bool)), - this, TQT_SLOT (slotGripContinuedDraw (int, int, bool))); - connect (grip, TQT_SIGNAL (cancelledDraw ()), - this, TQT_SLOT (slotGripCancelledDraw ())); - connect (grip, TQT_SIGNAL (endedDraw (int, int)), - this, TQT_SLOT (slotGripEndedDraw (int, int))); + connect (grip, TQ_SIGNAL (beganDraw ()), + this, TQ_SLOT (slotGripBeganDraw ())); + connect (grip, TQ_SIGNAL (continuedDraw (int, int, bool)), + this, TQ_SLOT (slotGripContinuedDraw (int, int, bool))); + connect (grip, TQ_SIGNAL (cancelledDraw ()), + this, TQ_SLOT (slotGripCancelledDraw ())); + connect (grip, TQ_SIGNAL (endedDraw (int, int)), + this, TQ_SLOT (slotGripEndedDraw (int, int))); - connect (grip, TQT_SIGNAL (statusMessageChanged (const TQString &)), - this, TQT_SLOT (slotGripStatusMessageChanged (const TQString &))); + connect (grip, TQ_SIGNAL (statusMessageChanged (const TQString &)), + this, TQ_SLOT (slotGripStatusMessageChanged (const TQString &))); - connect (grip, TQT_SIGNAL (releasedAllButtons ()), - this, TQT_SLOT (recalculateStatusMessage ())); + connect (grip, TQ_SIGNAL (releasedAllButtons ()), + this, TQ_SLOT (recalculateStatusMessage ())); } @@ -946,7 +946,7 @@ void kpViewScrollableContainer::slotContentsMoving (int x, int y) // Reduce flicker - don't let TQScrollView scroll to-be-erased lines eraseResizeLines (); - TQTimer::singleShot (0, this, TQT_SLOT (slotContentsMoved ())); + TQTimer::singleShot (0, this, TQ_SLOT (slotContentsMoved ())); } // protected slot @@ -972,19 +972,19 @@ void kpViewScrollableContainer::slotContentsMoved () // protected void kpViewScrollableContainer::disconnectViewSignals () { - disconnect (m_view, TQT_SIGNAL (sizeChanged (const TQSize &)), - this, TQT_SLOT (updateGrips ())); - disconnect (m_view, TQT_SIGNAL (destroyed ()), - this, TQT_SLOT (slotViewDestroyed ())); + disconnect (m_view, TQ_SIGNAL (sizeChanged (const TQSize &)), + this, TQ_SLOT (updateGrips ())); + disconnect (m_view, TQ_SIGNAL (destroyed ()), + this, TQ_SLOT (slotViewDestroyed ())); } // protected void kpViewScrollableContainer::connectViewSignals () { - connect (m_view, TQT_SIGNAL (sizeChanged (const TQSize &)), - this, TQT_SLOT (updateGrips ())); - connect (m_view, TQT_SIGNAL (destroyed ()), - this, TQT_SLOT (slotViewDestroyed ())); + connect (m_view, TQ_SIGNAL (sizeChanged (const TQSize &)), + this, TQ_SLOT (updateGrips ())); + connect (m_view, TQ_SIGNAL (destroyed ()), + this, TQ_SLOT (slotViewDestroyed ())); } diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff index 22565194..112b48d1 100644 --- a/kolourpaint/patches/doc_resize_no_flicker.diff +++ b/kolourpaint/patches/doc_resize_no_flicker.diff @@ -389,7 +389,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp + //m_resizeLinesNeedErase = false; + - QTimer::singleShot (0, this, SLOT (slotContentsMoved ())); + QTimer::singleShot (0, this, TQ_SLOT (slotContentsMoved ())); } @@ -874,9 +982,27 @@ void kpViewScrollableContainer::slotCont << " grip=" << grip << endl; @@ -466,7 +466,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp + QScrollView::windowActivationChange (wasActive); + + // Wait for m_view to update -+ QTimer::singleShot (0, this, SLOT (windowActivationChanged ())); ++ QTimer::singleShot (0, this, TQ_SLOT (windowActivationChanged ())); +} + + diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index a6b0a7ac..d9b503d6 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp @@ -327,28 +327,28 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection, // (no need for settingsChangedDelayed() since BCG effect is so fast :)) - connect (m_brightnessInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SIGNAL (settingsChangedNoWaitCursor ())); - connect (m_contrastInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SIGNAL (settingsChangedNoWaitCursor ())); - - connect (m_gammaInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (recalculateGammaLabel ())); - connect (m_gammaInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SIGNAL (settingsChangedNoWaitCursor ())); - - connect (m_channelsComboBox, TQT_SIGNAL (activated (int)), - this, TQT_SIGNAL (settingsChanged ())); - - connect (brightnessResetPushButton, TQT_SIGNAL (clicked ()), - this, TQT_SLOT (resetBrightness ())); - connect (contrastResetPushButton, TQT_SIGNAL (clicked ()), - this, TQT_SLOT (resetContrast ())); - connect (gammaResetPushButton, TQT_SIGNAL (clicked ()), - this, TQT_SLOT (resetGamma ())); - - connect (resetPushButton, TQT_SIGNAL (clicked ()), - this, TQT_SLOT (resetAll ())); + connect (m_brightnessInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SIGNAL (settingsChangedNoWaitCursor ())); + connect (m_contrastInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SIGNAL (settingsChangedNoWaitCursor ())); + + connect (m_gammaInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (recalculateGammaLabel ())); + connect (m_gammaInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SIGNAL (settingsChangedNoWaitCursor ())); + + connect (m_channelsComboBox, TQ_SIGNAL (activated (int)), + this, TQ_SIGNAL (settingsChanged ())); + + connect (brightnessResetPushButton, TQ_SIGNAL (clicked ()), + this, TQ_SLOT (resetBrightness ())); + connect (contrastResetPushButton, TQ_SIGNAL (clicked ()), + this, TQ_SLOT (resetContrast ())); + connect (gammaResetPushButton, TQ_SIGNAL (clicked ()), + this, TQ_SLOT (resetGamma ())); + + connect (resetPushButton, TQ_SIGNAL (clicked ()), + this, TQ_SLOT (resetAll ())); recalculateGammaLabel (); diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp index 000b2114..f92ac99d 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp @@ -149,11 +149,11 @@ kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection, lay->setColStretch (1, 1); - connect (m_amountInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SIGNAL (settingsChangedDelayed ())); + connect (m_amountInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SIGNAL (settingsChangedDelayed ())); - connect (m_amountInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotUpdateTypeLabel ())); + connect (m_amountInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotUpdateTypeLabel ())); } kpEffectBlurSharpenWidget::~kpEffectBlurSharpenWidget () diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp index 87cb7d14..9ed8eb17 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.cpp +++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp @@ -131,8 +131,8 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection, lay->setColStretch (1, 1); - connect (m_amountInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SIGNAL (settingsChanged ())); + connect (m_amountInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SIGNAL (settingsChanged ())); #endif m_enableCheckBox = new TQCheckBox (i18n ("E&nable"), this); @@ -144,8 +144,8 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection, // (settingsChangedDelayed() instead of settingsChanged() so that the // user can quickly press OK to apply effect to document directly and // not have to wait for the also slow preview) - connect (m_enableCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SIGNAL (settingsChangedDelayed ())); + connect (m_enableCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SIGNAL (settingsChangedDelayed ())); } kpEffectEmbossWidget::~kpEffectEmbossWidget () diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp index 51d74381..a6b482bb 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.cpp +++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp @@ -168,13 +168,13 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection, lay->addWidget (colorButtonContainer); - connect (m_enableCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotEnableChanged (bool))); + connect (m_enableCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotEnableChanged (bool))); - connect (m_color1Button, TQT_SIGNAL (changed (const TQColor &)), - this, TQT_SIGNAL (settingsChanged ())); - connect (m_color2Button, TQT_SIGNAL (changed (const TQColor &)), - this, TQT_SIGNAL (settingsChanged ())); + connect (m_color1Button, TQ_SIGNAL (changed (const TQColor &)), + this, TQ_SIGNAL (settingsChanged ())); + connect (m_color2Button, TQ_SIGNAL (changed (const TQColor &)), + this, TQ_SIGNAL (settingsChanged ())); } kpEffectFlattenWidget::~kpEffectFlattenWidget () diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp index d6229aca..20a55726 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.cpp +++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp @@ -192,15 +192,15 @@ kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection, m_inSignalHandler = false; - connect (m_redCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotRGBCheckBoxToggled ())); - connect (m_greenCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotRGBCheckBoxToggled ())); - connect (m_blueCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotRGBCheckBoxToggled ())); - - connect (m_allCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotAllCheckBoxToggled ())); + connect (m_redCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotRGBCheckBoxToggled ())); + connect (m_greenCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotRGBCheckBoxToggled ())); + connect (m_blueCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotRGBCheckBoxToggled ())); + + connect (m_allCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotAllCheckBoxToggled ())); } kpEffectInvertWidget::~kpEffectInvertWidget () diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index b6fbd6bb..528acf27 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp @@ -361,16 +361,16 @@ kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection, lay->addWidget (m_24BitRadioButton); - connect (m_blackAndWhiteRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SIGNAL (settingsChanged ())); - connect (m_blackAndWhiteDitheredRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SIGNAL (settingsChanged ())); - connect (m_8BitRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SIGNAL (settingsChanged ())); - connect (m_8BitDitheredRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SIGNAL (settingsChanged ())); - connect (m_24BitRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SIGNAL (settingsChanged ())); + connect (m_blackAndWhiteRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SIGNAL (settingsChanged ())); + connect (m_blackAndWhiteDitheredRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SIGNAL (settingsChanged ())); + connect (m_8BitRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SIGNAL (settingsChanged ())); + connect (m_8BitDitheredRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SIGNAL (settingsChanged ())); + connect (m_24BitRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SIGNAL (settingsChanged ())); } kpEffectReduceColorsWidget::~kpEffectReduceColorsWidget () diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index c23c028f..87ef6859 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp @@ -84,8 +84,8 @@ kpEffectsDialog::kpEffectsDialog (bool actOnSelection, setCaption (i18n ("More Image Effects")); - connect (m_delayedUpdateTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (slotUpdateWithWaitCursor ())); + connect (m_delayedUpdateTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (slotUpdateWithWaitCursor ())); TQHBox *effectContainer = new TQHBox (mainWidget ()); @@ -116,8 +116,8 @@ kpEffectsDialog::kpEffectsDialog (bool actOnSelection, addCustomWidgetToBack (m_settingsGroupBox); - connect (m_effectsComboBox, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (selectEffect (int))); + connect (m_effectsComboBox, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (selectEffect (int))); selectEffect (0); @@ -308,12 +308,12 @@ void kpEffectsDialog::selectEffect (int which) #endif - connect (m_colorEffectWidget, TQT_SIGNAL (settingsChangedNoWaitCursor ()), - this, TQT_SLOT (slotUpdate ())); - connect (m_colorEffectWidget, TQT_SIGNAL (settingsChanged ()), - this, TQT_SLOT (slotUpdateWithWaitCursor ())); - connect (m_colorEffectWidget, TQT_SIGNAL (settingsChangedDelayed ()), - this, TQT_SLOT (slotDelayedUpdate ())); + connect (m_colorEffectWidget, TQ_SIGNAL (settingsChangedNoWaitCursor ()), + this, TQ_SLOT (slotUpdate ())); + connect (m_colorEffectWidget, TQ_SIGNAL (settingsChanged ()), + this, TQ_SLOT (slotUpdateWithWaitCursor ())); + connect (m_colorEffectWidget, TQ_SIGNAL (settingsChangedDelayed ()), + this, TQ_SLOT (slotDelayedUpdate ())); slotUpdateWithWaitCursor (); #if DEBUG_KP_EFFECTS_DIALOG kdDebug () << "\tafter slotUpdateWithWaitCursor, previewGroupBox.size=" diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp index dc2b4a23..5450a79e 100644 --- a/kolourpaint/tools/kptoolairspray.cpp +++ b/kolourpaint/tools/kptoolairspray.cpp @@ -65,7 +65,7 @@ kpToolAirSpray::kpToolAirSpray (kpMainWindow *mainWindow) m_currentCommand (0) { m_timer = new TQTimer (this); - connect (m_timer, TQT_SIGNAL (timeout ()), this, TQT_SLOT (actuallyDraw ())); + connect (m_timer, TQ_SIGNAL (timeout ()), this, TQ_SLOT (actuallyDraw ())); } kpToolAirSpray::~kpToolAirSpray () @@ -95,8 +95,8 @@ void kpToolAirSpray::begin () if (m_toolWidgetSpraycanSize) { m_size = m_toolWidgetSpraycanSize->spraycanSize (); - connect (m_toolWidgetSpraycanSize, TQT_SIGNAL (spraycanSizeChanged (int)), - this, TQT_SLOT (slotSpraycanSizeChanged (int))); + connect (m_toolWidgetSpraycanSize, TQ_SIGNAL (spraycanSizeChanged (int)), + this, TQ_SLOT (slotSpraycanSizeChanged (int))); m_toolWidgetSpraycanSize->show (); } @@ -110,8 +110,8 @@ void kpToolAirSpray::end () { if (m_toolWidgetSpraycanSize) { - disconnect (m_toolWidgetSpraycanSize, TQT_SIGNAL (spraycanSizeChanged (int)), - this, TQT_SLOT (slotSpraycanSizeChanged (int))); + disconnect (m_toolWidgetSpraycanSize, TQ_SIGNAL (spraycanSizeChanged (int)), + this, TQ_SLOT (slotSpraycanSizeChanged (int))); m_toolWidgetSpraycanSize = 0; } diff --git a/kolourpaint/tools/kptoolflip.cpp b/kolourpaint/tools/kptoolflip.cpp index 49aed85f..c3d13f9b 100644 --- a/kolourpaint/tools/kptoolflip.cpp +++ b/kolourpaint/tools/kptoolflip.cpp @@ -171,10 +171,10 @@ kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *parent) m_verticalFlipRadioButton->setChecked (s_lastIsVerticalFlip); m_horizontalFlipRadioButton->setChecked (!s_lastIsVerticalFlip); - connect (m_verticalFlipRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotIsVerticalFlipChanged ())); - connect (m_horizontalFlipRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotIsVerticalFlipChanged ())); + connect (m_verticalFlipRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotIsVerticalFlipChanged ())); + connect (m_horizontalFlipRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotIsVerticalFlipChanged ())); } } diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp index 387f4bb7..fe8ab3c5 100644 --- a/kolourpaint/tools/kptoolpen.cpp +++ b/kolourpaint/tools/kptoolpen.cpp @@ -133,8 +133,8 @@ void kpToolPen::begin () if (m_mode & SquareBrushes) { m_toolWidgetEraserSize = tb->toolWidgetEraserSize (); - connect (m_toolWidgetEraserSize, TQT_SIGNAL (eraserSizeChanged (int)), - this, TQT_SLOT (slotEraserSizeChanged (int))); + connect (m_toolWidgetEraserSize, TQ_SIGNAL (eraserSizeChanged (int)), + this, TQ_SLOT (slotEraserSizeChanged (int))); m_toolWidgetEraserSize->show (); slotEraserSizeChanged (m_toolWidgetEraserSize->eraserSize ()); @@ -145,8 +145,8 @@ void kpToolPen::begin () if (m_mode & DiverseBrushes) { m_toolWidgetBrush = tb->toolWidgetBrush (); - connect (m_toolWidgetBrush, TQT_SIGNAL (brushChanged (const TQPixmap &, bool)), - this, TQT_SLOT (slotBrushChanged (const TQPixmap &, bool))); + connect (m_toolWidgetBrush, TQ_SIGNAL (brushChanged (const TQPixmap &, bool)), + this, TQ_SLOT (slotBrushChanged (const TQPixmap &, bool))); m_toolWidgetBrush->show (); slotBrushChanged (m_toolWidgetBrush->brush (), @@ -163,15 +163,15 @@ void kpToolPen::end () { if (m_toolWidgetEraserSize) { - disconnect (m_toolWidgetEraserSize, TQT_SIGNAL (eraserSizeChanged (int)), - this, TQT_SLOT (slotEraserSizeChanged (int))); + disconnect (m_toolWidgetEraserSize, TQ_SIGNAL (eraserSizeChanged (int)), + this, TQ_SLOT (slotEraserSizeChanged (int))); m_toolWidgetEraserSize = 0; } if (m_toolWidgetBrush) { - disconnect (m_toolWidgetBrush, TQT_SIGNAL (brushChanged (const TQPixmap &, bool)), - this, TQT_SLOT (slotBrushChanged (const TQPixmap &, bool))); + disconnect (m_toolWidgetBrush, TQ_SIGNAL (brushChanged (const TQPixmap &, bool)), + this, TQ_SLOT (slotBrushChanged (const TQPixmap &, bool))); m_toolWidgetBrush = 0; } diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp index f71ff6f8..65f380c7 100644 --- a/kolourpaint/tools/kptoolpolygon.cpp +++ b/kolourpaint/tools/kptoolpolygon.cpp @@ -370,11 +370,11 @@ void kpToolPolygon::begin () if (m_toolWidgetFillStyle) { - connect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), - this, TQT_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle))); + connect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), + this, TQ_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle))); } - connect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)), - this, TQT_SLOT (slotLineWidthChanged (int))); + connect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)), + this, TQ_SLOT (slotLineWidthChanged (int))); if (m_toolWidgetFillStyle) m_toolWidgetFillStyle->show (); @@ -404,15 +404,15 @@ void kpToolPolygon::end () if (m_toolWidgetFillStyle) { - disconnect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), - this, TQT_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle))); + disconnect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), + this, TQ_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle))); m_toolWidgetFillStyle = 0; } if (m_toolWidgetLineWidth) { - disconnect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)), - this, TQT_SLOT (slotLineWidthChanged (int))); + disconnect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)), + this, TQ_SLOT (slotLineWidthChanged (int))); m_toolWidgetLineWidth = 0; } diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp index 65afb587..d28ab542 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.cpp +++ b/kolourpaint/tools/kptoolpreviewdialog.cpp @@ -162,13 +162,13 @@ void kpToolPreviewDialog::createPreviewGroupBox () m_previewPixmapLabel = new kpResizeSignallingLabel (m_previewGroupBox); m_previewPixmapLabel->setMinimumSize (150, 110); - connect (m_previewPixmapLabel, TQT_SIGNAL (resized ()), - this, TQT_SLOT (updatePreview ())); + connect (m_previewPixmapLabel, TQ_SIGNAL (resized ()), + this, TQ_SLOT (updatePreview ())); TQPushButton *updatePushButton = new TQPushButton (i18n ("&Update"), m_previewGroupBox); - connect (updatePushButton, TQT_SIGNAL (clicked ()), - this, TQT_SLOT (slotUpdateWithWaitCursor ())); + connect (updatePushButton, TQ_SIGNAL (clicked ()), + this, TQ_SLOT (slotUpdateWithWaitCursor ())); TQVBoxLayout *previewLayout = new TQVBoxLayout (m_previewGroupBox, diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp index 90a7352d..efc9cd16 100644 --- a/kolourpaint/tools/kptoolrectangle.cpp +++ b/kolourpaint/tools/kptoolrectangle.cpp @@ -323,16 +323,16 @@ void kpToolRectangle::begin () if (tb) { m_toolWidgetLineWidth = tb->toolWidgetLineWidth (); - connect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)), - this, TQT_SLOT (slotLineWidthChanged ())); + connect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)), + this, TQ_SLOT (slotLineWidthChanged ())); m_toolWidgetLineWidth->show (); updatePens (); m_toolWidgetFillStyle = tb->toolWidgetFillStyle (); - connect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), - this, TQT_SLOT (slotFillStyleChanged ())); + connect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), + this, TQ_SLOT (slotFillStyleChanged ())); m_toolWidgetFillStyle->show (); updateBrushes (); @@ -356,15 +356,15 @@ void kpToolRectangle::end () if (m_toolWidgetLineWidth) { - disconnect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)), - this, TQT_SLOT (slotLineWidthChanged ())); + disconnect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)), + this, TQ_SLOT (slotLineWidthChanged ())); m_toolWidgetLineWidth = 0; } if (m_toolWidgetFillStyle) { - disconnect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), - this, TQT_SLOT (slotFillStyleChanged ())); + disconnect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)), + this, TQ_SLOT (slotFillStyleChanged ())); m_toolWidgetFillStyle = 0; } diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp index 73e6303c..dc9d88ff 100644 --- a/kolourpaint/tools/kptoolresizescale.cpp +++ b/kolourpaint/tools/kptoolresizescale.cpp @@ -591,8 +591,8 @@ void kpToolResizeScaleDialog::createActOnBox (TQWidget *baseWidget) m_actOnBox->setStretchFactor (m_actOnCombo, 1); - connect (m_actOnCombo, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (slotActOnChanged ())); + connect (m_actOnCombo, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (slotActOnChanged ())); } @@ -713,12 +713,12 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget) //operationLayout->addWidget (m_smoothScaleLabel, 1, 2, TQt::AlignCenter); - connect (m_resizeButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotTypeChanged ())); - connect (m_scaleButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotTypeChanged ())); - connect (m_smoothScaleButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotTypeChanged ())); + connect (m_resizeButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotTypeChanged ())); + connect (m_scaleButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotTypeChanged ())); + connect (m_smoothScaleButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotTypeChanged ())); } // private @@ -800,18 +800,18 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget) dimensionsLayout->setRowSpacing (4/*row*/, dimensionsLayout->rowSpacing (4) * 2); - connect (m_newWidthInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotWidthChanged (int))); - connect (m_newHeightInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotHeightChanged (int))); + connect (m_newWidthInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotWidthChanged (int))); + connect (m_newHeightInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotHeightChanged (int))); - connect (m_percentWidthInput, TQT_SIGNAL (valueChanged (double)), - this, TQT_SLOT (slotPercentWidthChanged (double))); - connect (m_percentHeightInput, TQT_SIGNAL (valueChanged (double)), - this, TQT_SLOT (slotPercentHeightChanged (double))); + connect (m_percentWidthInput, TQ_SIGNAL (valueChanged (double)), + this, TQ_SLOT (slotPercentWidthChanged (double))); + connect (m_percentHeightInput, TQ_SIGNAL (valueChanged (double)), + this, TQ_SLOT (slotPercentHeightChanged (double))); - connect (m_keepAspectRatioCheckBox, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (setKeepAspectRatio (bool))); + connect (m_keepAspectRatioCheckBox, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (setKeepAspectRatio (bool))); } diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp index 28e05d3e..c70836a5 100644 --- a/kolourpaint/tools/kptoolrotate.cpp +++ b/kolourpaint/tools/kptoolrotate.cpp @@ -300,10 +300,10 @@ void kpToolRotateDialog::createDirectionGroupBox () directionLayout->addWidget (m_clockwiseRadioButton, 1, 1, TQt::AlignCenter); - connect (m_antiClockwiseRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotUpdate ())); - connect (m_clockwiseRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotUpdate ())); + connect (m_antiClockwiseRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotUpdate ())); + connect (m_clockwiseRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotUpdate ())); } // private @@ -351,20 +351,20 @@ void kpToolRotateDialog::createAngleGroupBox () angleLayout->setColStretch (1, 2); // Stretch Custom Angle Input - connect (m_angle90RadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotUpdate ())); - connect (m_angle180RadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotUpdate ())); - connect (m_angle270RadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotUpdate ())); + connect (m_angle90RadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotUpdate ())); + connect (m_angle180RadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotUpdate ())); + connect (m_angle270RadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotUpdate ())); - connect (m_angleCustomRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotAngleCustomRadioButtonToggled (bool))); - connect (m_angleCustomRadioButton, TQT_SIGNAL (toggled (bool)), - this, TQT_SLOT (slotUpdate ())); + connect (m_angleCustomRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotAngleCustomRadioButtonToggled (bool))); + connect (m_angleCustomRadioButton, TQ_SIGNAL (toggled (bool)), + this, TQ_SLOT (slotUpdate ())); - connect (m_angleCustomInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotUpdate ())); + connect (m_angleCustomInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotUpdate ())); } diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp index 8fbdee55..c6ee4bba 100644 --- a/kolourpaint/tools/kptoolselection.cpp +++ b/kolourpaint/tools/kptoolselection.cpp @@ -68,10 +68,10 @@ kpToolSelection::kpToolSelection (Mode mode, m_createNOPTimer (new TQTimer (this)), m_RMBMoveUpdateGUITimer (new TQTimer (this)) { - connect (m_createNOPTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (delayedDraw ())); - connect (m_RMBMoveUpdateGUITimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (slotRMBMoveUpdateGUI ())); + connect (m_createNOPTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (delayedDraw ())); + connect (m_RMBMoveUpdateGUITimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (slotRMBMoveUpdateGUI ())); } kpToolSelection::~kpToolSelection () @@ -180,8 +180,8 @@ void kpToolSelection::begin () if (m_toolWidgetOpaqueOrTransparent) { - connect (m_toolWidgetOpaqueOrTransparent, TQT_SIGNAL (isOpaqueChanged (bool)), - this, TQT_SLOT (slotIsOpaqueChanged ())); + connect (m_toolWidgetOpaqueOrTransparent, TQ_SIGNAL (isOpaqueChanged (bool)), + this, TQ_SLOT (slotIsOpaqueChanged ())); m_toolWidgetOpaqueOrTransparent->show (); } } @@ -225,8 +225,8 @@ void kpToolSelection::end () if (m_toolWidgetOpaqueOrTransparent) { - disconnect (m_toolWidgetOpaqueOrTransparent, TQT_SIGNAL (isOpaqueChanged (bool)), - this, TQT_SLOT (slotIsOpaqueChanged ())); + disconnect (m_toolWidgetOpaqueOrTransparent, TQ_SIGNAL (isOpaqueChanged (bool)), + this, TQ_SLOT (slotIsOpaqueChanged ())); m_toolWidgetOpaqueOrTransparent = 0; } @@ -2037,8 +2037,8 @@ kpToolSelectionResizeScaleCommand::kpToolSelectionResizeScaleCommand ( m_newWidth = selection ()->width (); m_newHeight = selection ()->height (); - connect (m_smoothScaleTimer, TQT_SIGNAL (timeout ()), - this, TQT_SLOT (resizeScaleAndMove ())); + connect (m_smoothScaleTimer, TQ_SIGNAL (timeout ()), + this, TQ_SLOT (resizeScaleAndMove ())); } kpToolSelectionResizeScaleCommand::~kpToolSelectionResizeScaleCommand () diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp index 230db783..5cdeeb9e 100644 --- a/kolourpaint/tools/kptoolskew.cpp +++ b/kolourpaint/tools/kptoolskew.cpp @@ -296,10 +296,10 @@ void kpToolSkewDialog::createAngleGroupBox () angleLayout->addWidget (verticalSkewDegreesLabel, 1, 3); - connect (m_horizontalSkewInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotUpdate ())); - connect (m_verticalSkewInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotUpdate ())); + connect (m_horizontalSkewInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotUpdate ())); + connect (m_verticalSkewInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotUpdate ())); } diff --git a/kolourpaint/views/kpunzoomedthumbnailview.cpp b/kolourpaint/views/kpunzoomedthumbnailview.cpp index 59b91f85..139366eb 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.cpp +++ b/kolourpaint/views/kpunzoomedthumbnailview.cpp @@ -61,9 +61,9 @@ kpUnzoomedThumbnailView::kpUnzoomedThumbnailView ( if (buddyViewScrollableContainer ()) { connect (buddyViewScrollableContainer (), - TQT_SIGNAL (contentsMovingSoon (int, int)), + TQ_SIGNAL (contentsMovingSoon (int, int)), this, - TQT_SLOT (adjustToEnvironment ())); + TQ_SLOT (adjustToEnvironment ())); } // Call to virtual function - this is why the class is sealed diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp index f55f9d14..a2783f2d 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp @@ -69,8 +69,8 @@ kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow, cubeLayout->addWidget (updatePushButton, 0/*stretch*/, TQt::AlignHCenter); - connect (updatePushButton, TQT_SIGNAL (clicked ()), - this, TQT_SLOT (slotColorSimilarityValueChanged ())); + connect (updatePushButton, TQ_SIGNAL (clicked ()), + this, TQ_SLOT (slotColorSimilarityValueChanged ())); TQGroupBox *inputGroupBox = new TQGroupBox (i18n ("RGB Color Cube Distance"), baseWidget); @@ -86,8 +86,8 @@ kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow, inputLayout->addWidget (m_colorSimilarityInput); - connect (m_colorSimilarityInput, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (slotColorSimilarityValueChanged ())); + connect (m_colorSimilarityInput, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (slotColorSimilarityValueChanged ())); TQVBoxLayout *baseLayout = new TQVBoxLayout (baseWidget, 0/*margin*/, spacingHint () * 2); diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index b60f70ed..67e1e7e8 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -476,8 +476,8 @@ kpColorCells::kpColorCells (TQWidget *parent, setAcceptDrops (true); setAcceptDrags (true); - connect (this, TQT_SIGNAL (colorDoubleClicked (int)), - TQT_SLOT (slotColorDoubleClicked (int))); + connect (this, TQ_SIGNAL (colorDoubleClicked (int)), + TQ_SLOT (slotColorDoubleClicked (int))); if (!ownColorsInitialised) { @@ -674,9 +674,9 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e) m_mouseButton = 1; } - connect (this, TQT_SIGNAL (colorSelected (int)), this, TQT_SLOT (slotColorSelected (int))); + connect (this, TQ_SIGNAL (colorSelected (int)), this, TQ_SLOT (slotColorSelected (int))); KColorCells::mouseReleaseEvent (e); - disconnect (this, TQT_SIGNAL (colorSelected (int)), this, TQT_SLOT (slotColorSelected (int))); + disconnect (this, TQ_SIGNAL (colorSelected (int)), this, TQ_SLOT (slotColorSelected (int))); #if DEBUG_KP_COLOR_TOOL_BAR kdDebug () << "kpColorCells::mouseReleaseEvent() setting m_mouseButton back to -1" << endl; @@ -830,16 +830,16 @@ kpColorPalette::kpColorPalette (TQWidget *parent, m_transparentColorCell = new kpTransparentColorCell (this); m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), - this, TQT_SIGNAL (foregroundColorChanged (const kpColor &))); - connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), - this, TQT_SIGNAL (backgroundColorChanged (const kpColor &))); + connect (m_transparentColorCell, TQ_SIGNAL (foregroundColorChanged (const kpColor &)), + this, TQ_SIGNAL (foregroundColorChanged (const kpColor &))); + connect (m_transparentColorCell, TQ_SIGNAL (backgroundColorChanged (const kpColor &)), + this, TQ_SIGNAL (backgroundColorChanged (const kpColor &))); m_colorCells = new kpColorCells (this); - connect (m_colorCells, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), - this, TQT_SIGNAL (foregroundColorChanged (const kpColor &))); - connect (m_colorCells, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), - this, TQT_SIGNAL (backgroundColorChanged (const kpColor &))); + connect (m_colorCells, TQ_SIGNAL (foregroundColorChanged (const kpColor &)), + this, TQ_SIGNAL (foregroundColorChanged (const kpColor &))); + connect (m_colorCells, TQ_SIGNAL (backgroundColorChanged (const kpColor &)), + this, TQ_SIGNAL (backgroundColorChanged (const kpColor &))); setOrientation (o); } @@ -965,25 +965,25 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, m_dualColorButton = new kpDualColorButton (mainWindow, base); m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), - this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &))); - connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), - this, TQT_SIGNAL (foregroundColorChanged (const kpColor &))); - connect (m_dualColorButton, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), - this, TQT_SIGNAL (backgroundColorChanged (const kpColor &))); + connect (m_dualColorButton, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), + this, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &))); + connect (m_dualColorButton, TQ_SIGNAL (foregroundColorChanged (const kpColor &)), + this, TQ_SIGNAL (foregroundColorChanged (const kpColor &))); + connect (m_dualColorButton, TQ_SIGNAL (backgroundColorChanged (const kpColor &)), + this, TQ_SIGNAL (backgroundColorChanged (const kpColor &))); m_boxLayout->addWidget (m_dualColorButton, 0/*stretch*/); m_colorPalette = new kpColorPalette (base); - connect (m_colorPalette, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), - m_dualColorButton, TQT_SLOT (setForegroundColor (const kpColor &))); - connect (m_colorPalette, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), - m_dualColorButton, TQT_SLOT (setBackgroundColor (const kpColor &))); + connect (m_colorPalette, TQ_SIGNAL (foregroundColorChanged (const kpColor &)), + m_dualColorButton, TQ_SLOT (setForegroundColor (const kpColor &))); + connect (m_colorPalette, TQ_SIGNAL (backgroundColorChanged (const kpColor &)), + m_dualColorButton, TQ_SLOT (setBackgroundColor (const kpColor &))); m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/); m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base); m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)), - this, TQT_SIGNAL (colorSimilarityChanged (double, int))); + connect (m_colorSimilarityToolBarItem, TQ_SIGNAL (colorSimilarityChanged (double, int)), + this, TQ_SIGNAL (colorSimilarityChanged (double, int))); m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/); // HACK: couldn't get TQSpacerItem to work diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index dcd79e77..0df59f2e 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -131,8 +131,8 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i it != m_toolWidgets.end (); it++) { - connect (*it, TQT_SIGNAL (optionSelected (int, int)), - this, TQT_SIGNAL (toolWidgetOptionSelected ())); + connect (*it, TQ_SIGNAL (optionSelected (int, int)), + this, TQ_SIGNAL (toolWidgetOptionSelected ())); } #if DEBUG_KP_TOOL_TOOL_BAR @@ -151,7 +151,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i m_buttonGroup = new TQButtonGroup (); // invisible m_buttonGroup->setExclusive (true); - connect (m_buttonGroup, TQT_SIGNAL (clicked (int)), TQT_SLOT (slotToolButtonClicked ())); + connect (m_buttonGroup, TQ_SIGNAL (clicked (int)), TQ_SLOT (slotToolButtonClicked ())); hideAllToolWidgets (); } @@ -247,10 +247,10 @@ void kpToolToolBar::registerTool (kpTool *tool) m_buttonToolPairs.append (kpButtonToolPair (b, tool)); - connect (tool, TQT_SIGNAL (actionActivated ()), - this, TQT_SLOT (slotToolActionActivated ())); - connect (tool, TQT_SIGNAL (actionToolTipChanged (const TQString &)), - this, TQT_SLOT (slotToolActionToolTipChanged ())); + connect (tool, TQ_SIGNAL (actionActivated ()), + this, TQ_SLOT (slotToolActionActivated ())); + connect (tool, TQ_SIGNAL (actionToolTipChanged (const TQString &)), + this, TQ_SLOT (slotToolActionToolTipChanged ())); } // public @@ -265,10 +265,10 @@ void kpToolToolBar::unregisterTool (kpTool *tool) delete ((*it).m_button); m_buttonToolPairs.erase (it); - disconnect (tool, TQT_SIGNAL (actionActivated ()), - this, TQT_SLOT (slotToolActionActivated ())); - disconnect (tool, TQT_SIGNAL (actionToolTipChanged (const TQString &)), - this, TQT_SLOT (slotToolActionToolTipChanged ())); + disconnect (tool, TQ_SIGNAL (actionActivated ()), + this, TQ_SLOT (slotToolActionActivated ())); + disconnect (tool, TQ_SIGNAL (actionToolTipChanged (const TQString &)), + this, TQ_SLOT (slotToolActionToolTipChanged ())); break; } } diff --git a/kooka/dwmenuaction.cpp b/kooka/dwmenuaction.cpp index c8e75c00..4527e247 100644 --- a/kooka/dwmenuaction.cpp +++ b/kooka/dwmenuaction.cpp @@ -36,9 +36,9 @@ dwMenuAction::dwMenuAction( const TQString& text, const TDEShortcut& cut, KDockMainWindow *mw, const char* name ) :TDEToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw) { - connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); - connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); - connect(m_dw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWidgetDestroyed())); + connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); + connect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged())); + connect(m_dw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWidgetDestroyed())); setChecked(m_dw->mayBeHide()); } diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp index 4b83c5bc..61cefeb0 100644 --- a/kooka/imageselectline.cpp +++ b/kooka/imageselectline.cpp @@ -58,11 +58,11 @@ ImageSelectLine::ImageSelectLine( TQWidget *parent, const TQString& text ) m_urlCombo->setMaxItems(5); - connect( m_urlCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( slUrlActivated( const KURL& ))); + connect( m_urlCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( slUrlActivated( const KURL& ))); - connect( m_buttFileSelect, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slSelectFile())); + connect( m_buttFileSelect, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slSelectFile())); } void ImageSelectLine::slSelectFile() diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 8eb12701..2b6f6037 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -108,8 +108,8 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name #endif kdDebug(28000) << "#### have " << fo.count() << " image types" << endl; lb_format->insertStringList( fo ); - connect( lb_format, TQT_SIGNAL( highlighted(const TQString&)), - TQT_SLOT( showHelp(const TQString&))); + connect( lb_format, TQ_SIGNAL( highlighted(const TQString&)), + TQ_SLOT( showHelp(const TQString&))); // Insert label for helptext l_help = new TQLabel( page ); diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index caf5ac52..1c25cc15 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -59,7 +59,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n m_scaleRadios = new TQButtonGroup( 2, TQt::Vertical, i18n("Image Print Size"), this ); m_scaleRadios->setRadioButtonExclusive(true); - connect( m_scaleRadios, TQT_SIGNAL(clicked(int)), TQT_SLOT(slScaleChanged(int))); + connect( m_scaleRadios, TQ_SIGNAL(clicked(int)), TQ_SLOT(slScaleChanged(int))); m_rbScreen = new TQRadioButton( i18n("Scale to same size as on screen"), m_scaleRadios ); @@ -116,11 +116,11 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n m_sizeW = new KIntNumInput( group ); m_sizeW->setLabel( i18n("Image width:"), AlignVCenter ); m_sizeW->setSuffix( i18n(" mm")); - connect( m_sizeW, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slCustomWidthChanged(int))); + connect( m_sizeW, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slCustomWidthChanged(int))); m_sizeH = new KIntNumInput( m_sizeW, AlignVCenter, group ); m_sizeH->setLabel( i18n("Image height:"), AlignVCenter); m_sizeH->setSuffix( i18n(" mm")); - connect( m_sizeH, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slCustomHeightChanged(int))); + connect( m_sizeH, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slCustomHeightChanged(int))); m_ratio = new TQCheckBox( i18n("Maintain aspect ratio"), group, "cbAspectRatio" ); m_ratio->setChecked(true); diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index f1c77077..a6d5cebd 100644 --- a/kooka/kocrbase.cpp +++ b/kooka/kocrbase.cpp @@ -86,9 +86,9 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig, m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_TDESPELL, true); /* Connect signals which disable the fields and store the configuration */ - connect( this, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( writeConfig())); - connect( this, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( startOCR() )); - connect( this, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT( stopOCR() )); + connect( this, TQ_SIGNAL( user1Clicked()), this, TQ_SLOT( writeConfig())); + connect( this, TQ_SIGNAL( user1Clicked()), this, TQ_SLOT( startOCR() )); + connect( this, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT( stopOCR() )); m_previewSize.setWidth(200); m_previewSize.setHeight(300); @@ -191,13 +191,13 @@ void KOCRBase::spellCheckIntro() spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); /* connect toggle button */ - connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool))); + connect( m_cbWantCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slWantSpellcheck(bool))); m_cbWantCheck->setChecked( m_userWantsSpellCheck ); m_gbSpellOpts->setEnabled( m_userWantsSpellCheck ); m_spellConfig = sCfg; - connect( sCfg, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(slSpellConfigChanged())); + connect( sCfg, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(slSpellConfigChanged())); } void KOCRBase::slSpellConfigChanged() @@ -242,10 +242,10 @@ void KOCRBase::introduceImage( KookaImage* img) if( m_job ) { - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slPreviewResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slPreviewResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); /* TDEIO::Jo result is called in any way: Success, Failed, Error, * thus connecting the failed is not really necessary. */ diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 6769205d..b5ef9da4 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -291,7 +291,7 @@ EngineError KadmosDialog::setupGui() m_cbLang = new TQComboBox( m_gbLang ); m_cbLang->setCurrentText( TDELocale::defaultCountry() ); - connect( m_bbFont, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slFontChanged(int) )); + connect( m_bbFont, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slFontChanged(int) )); m_rbMachine->setChecked(true); /* --- */ diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp index 04440b2c..2627311b 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -213,8 +213,8 @@ void ocradDialog::version( const TQString& exe ) *m_proc << exe; *m_proc << TQString("-V"); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(slReceiveStdIn(TDEProcess *, char *, int ))); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(slReceiveStdIn(TDEProcess *, char *, int ))); if( ! m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 0f5dbe2c..af8f5dd6 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -87,12 +87,12 @@ Kooka::Kooka( const TQCString& deviceToUse) statusBar()->show(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalCleanStatusbar(void)), - this, TQT_SLOT(cleanStatusbar())); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalCleanStatusbar(void)), + this, TQ_SLOT(cleanStatusbar())); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); changeCaption( i18n( "TDE Scanning" )); @@ -125,39 +125,39 @@ void Kooka::startup( void ) void Kooka::setupActions() { - KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(this , TQT_SLOT(close()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(this , TQ_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); m_view->createDockMenu(actionCollection(), this, "settings_show_docks" ); /* Image Viewer action Toolbar - OCR, Scaling etc. */ (void) new TDEAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O, - m_view, TQT_SLOT(doOCR()), + m_view, TQ_SLOT(doOCR()), actionCollection(), "ocrImage" ); (void) new TDEAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C, - m_view, TQT_SLOT(doOCRonSelection()), + m_view, TQ_SLOT(doOCRonSelection()), actionCollection(), "ocrImageSelect" ); TDEAction *act; act = new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I, - m_view, TQT_SLOT( slIVScaleToWidth()), + m_view, TQ_SLOT( slIVScaleToWidth()), actionCollection(), "scaleToWidth" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H, - m_view, TQT_SLOT( slIVScaleToHeight()), + m_view, TQ_SLOT( slIVScaleToHeight()), actionCollection(), "scaleToHeight" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S, - m_view, TQT_SLOT( slIVScaleOriginal()), + m_view, TQ_SLOT( slIVScaleOriginal()), actionCollection(), "scaleOriginal" ); m_view->connectViewerAction( act ); @@ -173,100 +173,100 @@ actionCollection()); actionCollection(), "keepZoom" ); #endif - connect( act, TQT_SIGNAL( toggled( bool ) ), m_view->getImageViewer(), - TQT_SLOT(setKeepZoom(bool))); + connect( act, TQ_SIGNAL( toggled( bool ) ), m_view->getImageViewer(), + TQ_SLOT(setKeepZoom(bool))); m_view->connectViewerAction( act ); /* thumbview and gallery actions */ act = new TDEAction(i18n("Set Zoom..."), "viewmag", 0, - m_view, TQT_SLOT( slIVShowZoomDialog()), + m_view, TQ_SLOT( slIVShowZoomDialog()), actionCollection(), "showZoomDialog" ); m_view->connectViewerAction( act ); (void) new TDEAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N, - m_view, TQT_SLOT( slCreateNewImgFromSelection() ), + m_view, TQ_SLOT( slCreateNewImgFromSelection() ), actionCollection(), "createFromSelection" ); (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V, - this, TQT_SLOT( slMirrorVertical() ), + this, TQ_SLOT( slMirrorVertical() ), actionCollection(), "mirrorVertical" ); (void) new TDEAction(i18n("&Mirror Image Horizontally"), "mirror-horiz", CTRL+Key_M, - this, TQT_SLOT( slMirrorHorizontal() ), + this, TQ_SLOT( slMirrorHorizontal() ), actionCollection(), "mirrorHorizontal" ); (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B, - this, TQT_SLOT( slMirrorBoth() ), + this, TQ_SLOT( slMirrorBoth() ), actionCollection(), "mirrorBoth" ); (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "document-open", CTRL+Key_G, - m_view, TQT_SLOT( slOpenCurrInGraphApp() ), + m_view, TQ_SLOT( slOpenCurrInGraphApp() ), actionCollection(), "openInGraphApp" ); act = new TDEAction(i18n("&Rotate Image Clockwise"), "object-rotate-right", CTRL+Key_R, - this, TQT_SLOT( slRotateClockWise() ), + this, TQ_SLOT( slRotateClockWise() ), actionCollection(), "rotateClockwise" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "object-rotate-left", CTRL+Key_W, - this, TQT_SLOT( slRotateCounterClockWise() ), + this, TQ_SLOT( slRotateCounterClockWise() ), actionCollection(), "rotateCounterClockwise" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D, - this, TQT_SLOT( slRotate180() ), + this, TQ_SLOT( slRotate180() ), actionCollection(), "upsitedown" ); m_view->connectViewerAction( act ); /* Gallery actions */ act = new TDEAction(i18n("&Create Folder..."), "folder-new", 0, - m_view->gallery(),TQT_SLOT( slotCreateFolder() ), + m_view->gallery(),TQ_SLOT( slotCreateFolder() ), actionCollection(), "foldernew" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Save Image..."), "document-save", 0, - m_view->gallery(),TQT_SLOT( slotExportFile() ), + m_view->gallery(),TQ_SLOT( slotExportFile() ), actionCollection(), "saveImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Import Image..."), "inline_image", 0, - m_view->gallery(),TQT_SLOT( slotImportFile() ), + m_view->gallery(),TQ_SLOT( slotImportFile() ), actionCollection(), "importImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Delete Image"), "edittrash", 0, - m_view->gallery(),TQT_SLOT( slotDeleteItems() ), + m_view->gallery(),TQ_SLOT( slotDeleteItems() ), actionCollection(), "deleteImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Unload Image"), "window-close", 0, - m_view->gallery(),TQT_SLOT( slotUnloadItems() ), + m_view->gallery(),TQ_SLOT( slotUnloadItems() ), actionCollection(), "unloadImage" ); m_view->connectGalleryAction( act ); #if 0 /* not yet supported actions - coming post 3.1 */ (void) new TDEAction(i18n("&Load Scan Parameters"), "bookmark_add", CTRL+Key_L, - m_view, TQT_SLOT(slLoadScanParams()), + m_view, TQ_SLOT(slLoadScanParams()), actionCollection(), "loadscanparam" ); (void) new TDEAction(i18n("Save &Scan Parameters"), "bookmark_add", CTRL+Key_S, - m_view, TQT_SLOT(slSaveScanParams()), + m_view, TQ_SLOT(slSaveScanParams()), actionCollection(), "savescanparam" ); #endif (void) new TDEAction(i18n("Select Scan Device"), "scanner", 0, - m_view, TQT_SLOT( slSelectDevice()), + m_view, TQ_SLOT( slSelectDevice()), actionCollection(), "selectsource" ); (void) new TDEAction( i18n("Enable All Warnings && Messages"), 0, - this, TQT_SLOT(slEnableWarnings()), + this, TQ_SLOT(slEnableWarnings()), actionCollection(), "enable_msgs"); m_saveOCRTextAction = new TDEAction( i18n("Save OCR Res&ult Text"), "document-save-as", CTRL+Key_U, - m_view, TQT_SLOT(slSaveOCRResult()), + m_view, TQ_SLOT(slSaveOCRResult()), actionCollection(), "saveOCRResult"); } @@ -387,7 +387,7 @@ void Kooka::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -402,7 +402,7 @@ void Kooka::optionsPreferences() // popup some sort of preference dialog, here KookaPreferences dlg; dlg.showPage( m_prefDialogIndex ); - connect( &dlg, TQT_SIGNAL( dataSaved() ), m_view, TQT_SLOT(slFreshUpThumbView())); + connect( &dlg, TQ_SIGNAL( dataSaved() ), m_view, TQ_SLOT(slFreshUpThumbView())); if (dlg.exec()) { diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index d813cfb1..e8900668 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -100,8 +100,8 @@ void KookaPreferences::setupOCRPage() */ TQVGroupBox *gp = new TQVGroupBox( i18n("GOCR OCR"), page ); m_urlReqGocr = binaryCheckBox( gp, "gocr" ); - connect( m_urlReqGocr, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( slCheckOnGOCR( const TQString& ))); + connect( m_urlReqGocr, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( slCheckOnGOCR( const TQString& ))); TQString cmdGocr = tryFindBinary( "gocr", CFG_GOCR_BINARY ); kdDebug(28000) << "Found gocr command: " << cmdGocr << endl; m_gocrBut->setEnabled(false); @@ -119,8 +119,8 @@ void KookaPreferences::setupOCRPage() */ gp = new TQVGroupBox( i18n("OCRAD OCR"), page ); m_urlReqOcrad = binaryCheckBox( gp, "ocrad" ); - connect( m_urlReqOcrad, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( slCheckOnOCRAD( const TQString& ))); + connect( m_urlReqOcrad, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( slCheckOnOCRAD( const TQString& ))); TQString cmdOcrad = tryFindBinary( "ocrad", CFG_OCRAD_BINARY ); kdDebug(28000) << "Found ocrad command: " << cmdOcrad << endl; m_ocradBut->setEnabled(false); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 2bbb4756..108b887f 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -112,8 +112,8 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU img_canvas = new ImageCanvas( m_mainDock ); img_canvas->setMinimumSize(100,200); img_canvas->enableContextMenu(true); - connect( img_canvas, TQT_SIGNAL( imageReadOnly(bool)), - this, TQT_SLOT(slViewerReadOnly(bool))); + connect( img_canvas, TQ_SIGNAL( imageReadOnly(bool)), + this, TQ_SLOT(slViewerReadOnly(bool))); TDEPopupMenu *ctxtmenu = static_cast<TDEPopupMenu*>(img_canvas->contextMenu()); if( ctxtmenu ) @@ -147,10 +147,10 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU 30 ); // relation target/this (in percent) - connect( packager, TQT_SIGNAL(showThumbnails( KFileTreeViewItem* )), - this, TQT_SLOT( slShowThumbnails( KFileTreeViewItem* ))); - connect( m_thumbview, TQT_SIGNAL( selectFromThumbnail( const KURL& )), - packager, TQT_SLOT( slSelectImage(const KURL&))); + connect( packager, TQ_SIGNAL(showThumbnails( KFileTreeViewItem* )), + this, TQ_SLOT( slShowThumbnails( KFileTreeViewItem* ))); + connect( m_thumbview, TQ_SIGNAL( selectFromThumbnail( const KURL& )), + packager, TQ_SLOT( slSelectImage(const KURL&))); /* * Create a Kombobox that holds the last folders visible even on the preview page @@ -174,14 +174,14 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU - connect( packager, TQT_SIGNAL( galleryPathSelected( KFileTreeBranch*, const TQString&)), - recentFolder, TQT_SLOT( slotGalleryPathChanged( KFileTreeBranch*, const TQString& ))); + connect( packager, TQ_SIGNAL( galleryPathSelected( KFileTreeBranch*, const TQString&)), + recentFolder, TQ_SLOT( slotGalleryPathChanged( KFileTreeBranch*, const TQString& ))); - connect( packager, TQT_SIGNAL( directoryToRemove( KFileTreeBranch*, const TQString&)), - recentFolder, TQT_SLOT( slotPathRemove( KFileTreeBranch*, const TQString& ))); + connect( packager, TQ_SIGNAL( directoryToRemove( KFileTreeBranch*, const TQString&)), + recentFolder, TQ_SLOT( slotPathRemove( KFileTreeBranch*, const TQString& ))); - connect( recentFolder, TQT_SIGNAL(activated( const TQString& )), - packager, TQT_SLOT(slotSelectDirectory( const TQString& ))); + connect( recentFolder, TQ_SIGNAL(activated( const TQString& )), + packager, TQ_SLOT(slotSelectDirectory( const TQString& ))); /* the object from the kscan lib to handle low level scanning */ m_dockScanParam = parent->createDockWidget( "Scan Parameter", @@ -246,33 +246,33 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU } /* New image created after scanning */ - connect(sane, TQT_SIGNAL(sigNewImage(TQImage*,ImgScanInfo*)), this, TQT_SLOT(slNewImageScanned(TQImage*,ImgScanInfo*))); + connect(sane, TQ_SIGNAL(sigNewImage(TQImage*,ImgScanInfo*)), this, TQ_SLOT(slNewImageScanned(TQImage*,ImgScanInfo*))); /* New preview image */ - connect(sane, TQT_SIGNAL(sigNewPreview(TQImage*,ImgScanInfo *)), this, TQT_SLOT( slNewPreview(TQImage*,ImgScanInfo *))); + connect(sane, TQ_SIGNAL(sigNewPreview(TQImage*,ImgScanInfo *)), this, TQ_SLOT( slNewPreview(TQImage*,ImgScanInfo *))); - connect( sane, TQT_SIGNAL( sigScanStart() ), this, TQT_SLOT( slScanStart())); - connect( sane, TQT_SIGNAL( sigScanFinished(KScanStat)), this, TQT_SLOT(slScanFinished(KScanStat))); - connect( sane, TQT_SIGNAL( sigAcquireStart()), this, TQT_SLOT( slAcquireStart())); + connect( sane, TQ_SIGNAL( sigScanStart() ), this, TQ_SLOT( slScanStart())); + connect( sane, TQ_SIGNAL( sigScanFinished(KScanStat)), this, TQ_SLOT(slScanFinished(KScanStat))); + connect( sane, TQ_SIGNAL( sigAcquireStart()), this, TQ_SLOT( slAcquireStart())); /* Image canvas should show a new document */ - connect( packager, TQT_SIGNAL( showImage( KookaImage* )), - this, TQT_SLOT( slShowAImage( KookaImage*))); + connect( packager, TQ_SIGNAL( showImage( KookaImage* )), + this, TQ_SLOT( slShowAImage( KookaImage*))); - connect( packager, TQT_SIGNAL( aboutToShowImage(const KURL&)), - this, TQT_SLOT( slStartLoading( const KURL& ))); + connect( packager, TQ_SIGNAL( aboutToShowImage(const KURL&)), + this, TQ_SLOT( slStartLoading( const KURL& ))); /* Packager unloads the image */ - connect( packager, TQT_SIGNAL( unloadImage( KookaImage* )), - this, TQT_SLOT( slUnloadAImage( KookaImage*))); + connect( packager, TQ_SIGNAL( unloadImage( KookaImage* )), + this, TQ_SLOT( slUnloadAImage( KookaImage*))); /* a image changed mostly through a image manipulation method like rotate */ - connect( packager, TQT_SIGNAL( fileChanged( KFileItem* )), - m_thumbview, TQT_SLOT( slImageChanged( KFileItem* ))); + connect( packager, TQ_SIGNAL( fileChanged( KFileItem* )), + m_thumbview, TQ_SLOT( slImageChanged( KFileItem* ))); - connect( packager, TQT_SIGNAL( fileRenamed( KFileItem*, const KURL& )), - m_thumbview, TQT_SLOT( slImageRenamed( KFileItem*, const KURL& ))); + connect( packager, TQ_SIGNAL( fileRenamed( KFileItem*, const KURL& )), + m_thumbview, TQ_SLOT( slImageRenamed( KFileItem*, const KURL& ))); - connect( packager, TQT_SIGNAL( fileDeleted( KFileItem* )), - m_thumbview, TQT_SLOT( slImageDeleted( KFileItem* ))); + connect( packager, TQ_SIGNAL( fileDeleted( KFileItem* )), + m_thumbview, TQ_SLOT( slImageDeleted( KFileItem* ))); packager->openRoots(); @@ -346,8 +346,8 @@ bool KookaView::slSelectDevice( const TQCString& useDevice ) if( sane->openDevice( selDevice ) == KSCAN_OK ) { - connect( scan_params, TQT_SIGNAL( scanResolutionChanged( int, int )), - preview_canvas, TQT_SLOT( slNewScanResolutions( int, int ))); + connect( scan_params, TQ_SIGNAL( scanResolutionChanged( int, int )), + preview_canvas, TQ_SLOT( slNewScanResolutions( int, int ))); if( ! scan_params->connectDevice( sane ) ) { @@ -360,12 +360,12 @@ bool KookaView::slSelectDevice( const TQCString& useDevice ) /* New Rectangle selection in the preview, now scanimge exists */ ImageCanvas *previewCanvas = preview_canvas->getImageCanvas(); - connect( previewCanvas , TQT_SIGNAL( newRect(TQRect)), - scan_params, TQT_SLOT(slCustomScanSize(TQRect))); - connect( previewCanvas, TQT_SIGNAL( noRect()), - scan_params, TQT_SLOT(slMaximalScanSize())); - // connect( scan_params, TQT_SIGNAL( scanResolutionChanged( int, int )), - // preview_canvas, TQT_SLOT( slNewScanResolutions( int, int ))); + connect( previewCanvas , TQ_SIGNAL( newRect(TQRect)), + scan_params, TQ_SLOT(slCustomScanSize(TQRect))); + connect( previewCanvas, TQ_SIGNAL( noRect()), + scan_params, TQ_SLOT(slMaximalScanSize())); + // connect( scan_params, TQ_SIGNAL( scanResolutionChanged( int, int )), + // preview_canvas, TQ_SLOT( slNewScanResolutions( int, int ))); /* load the preview image */ if( preview_canvas ) { @@ -558,32 +558,32 @@ void KookaView::startOCR( KookaImage *img ) ocrFabric = new KSANEOCR( m_mainDock, TDEGlobal::config() ); ocrFabric->setImageCanvas( img_canvas ); - connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )), - m_ocrResEdit, TQT_SLOT(setText( const TQString& ))); + connect( ocrFabric, TQ_SIGNAL( newOCRResultText( const TQString& )), + m_ocrResEdit, TQ_SLOT(setText( const TQString& ))); - connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )), - m_dockOCRText, TQT_SLOT( show() )); + connect( ocrFabric, TQ_SIGNAL( newOCRResultText( const TQString& )), + m_dockOCRText, TQ_SLOT( show() )); - connect( ocrFabric, TQT_SIGNAL( repaintOCRResImage( )), - img_canvas, TQT_SLOT(repaint())); + connect( ocrFabric, TQ_SIGNAL( repaintOCRResImage( )), + img_canvas, TQ_SLOT(repaint())); - connect( ocrFabric, TQT_SIGNAL( clearOCRResultText()), - m_ocrResEdit, TQT_SLOT(clear())); + connect( ocrFabric, TQ_SIGNAL( clearOCRResultText()), + m_ocrResEdit, TQ_SLOT(clear())); - connect( ocrFabric, TQT_SIGNAL( updateWord(int, const TQString&, const TQString& )), - m_ocrResEdit, TQT_SLOT( slUpdateOCRResult( int, const TQString&, const TQString& ))); + connect( ocrFabric, TQ_SIGNAL( updateWord(int, const TQString&, const TQString& )), + m_ocrResEdit, TQ_SLOT( slUpdateOCRResult( int, const TQString&, const TQString& ))); - connect( ocrFabric, TQT_SIGNAL( ignoreWord(int, const ocrWord&)), - m_ocrResEdit, TQT_SLOT( slIgnoreWrongWord( int, const ocrWord& ))); + connect( ocrFabric, TQ_SIGNAL( ignoreWord(int, const ocrWord&)), + m_ocrResEdit, TQ_SLOT( slIgnoreWrongWord( int, const ocrWord& ))); - connect( ocrFabric, TQT_SIGNAL( markWordWrong(int, const ocrWord& )), - m_ocrResEdit, TQT_SLOT( slMarkWordWrong( int, const ocrWord& ))); + connect( ocrFabric, TQ_SIGNAL( markWordWrong(int, const ocrWord& )), + m_ocrResEdit, TQ_SLOT( slMarkWordWrong( int, const ocrWord& ))); - connect( ocrFabric, TQT_SIGNAL( readOnlyEditor( bool )), - m_ocrResEdit, TQT_SLOT( setReadOnly( bool ))); + connect( ocrFabric, TQ_SIGNAL( readOnlyEditor( bool )), + m_ocrResEdit, TQ_SLOT( setReadOnly( bool ))); - connect( ocrFabric, TQT_SIGNAL( selectWord( int, const ocrWord& )), - m_ocrResEdit, TQT_SLOT( slSelectWord( int, const ocrWord& ))); + connect( ocrFabric, TQ_SIGNAL( selectWord( int, const ocrWord& )), + m_ocrResEdit, TQ_SLOT( slSelectWord( int, const ocrWord& ))); } diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 672989b1..774c66b2 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -224,9 +224,9 @@ bool KSANEOCR::startOCRVisible( TQWidget *parent ) m_ocrProcessDia->introduceImage( m_img ); visibleOCRRunning = true; - connect( m_ocrProcessDia, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( startOCRProcess() )); - connect( m_ocrProcessDia, TQT_SIGNAL( closeClicked()), this, TQT_SLOT( slotClose() )); - connect( m_ocrProcessDia, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT( slotStopOCR() )); + connect( m_ocrProcessDia, TQ_SIGNAL( user1Clicked()), this, TQ_SLOT( startOCRProcess() )); + connect( m_ocrProcessDia, TQ_SIGNAL( closeClicked()), this, TQ_SLOT( slotClose() )); + connect( m_ocrProcessDia, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT( slotStopOCR() )); m_ocrProcessDia->show(); } @@ -279,9 +279,9 @@ void KSANEOCR::finishedOCRVisible( bool success ) */ connect( new KSpell( m_parent, i18n("Kooka OCR Dictionary Check"), - this, TQT_SLOT( slSpellReady(KSpell*)), + this, TQ_SLOT( slSpellReady(KSpell*)), m_ocrProcessDia->spellConfig() ), - TQT_SIGNAL( death()), this, TQT_SLOT(slSpellDead())); + TQ_SIGNAL( death()), this, TQ_SLOT(slSpellDead())); } delete m_ocrProcessDia; @@ -425,12 +425,12 @@ void KSANEOCR::startOCRAD( ) m_ocrResultText = ""; - connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT( ocradExited(TDEProcess*))); - connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)), - this, TQT_SLOT( ocradStdIn(TDEProcess*, char*, int))); - connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)), - this, TQT_SLOT( ocradStdErr(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT( ocradExited(TDEProcess*))); + connect(daemon, TQ_SIGNAL(receivedStdout(TDEProcess *, char*, int)), + this, TQ_SLOT( ocradStdIn(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(receivedStderr(TDEProcess *, char*, int)), + this, TQ_SLOT( ocradStdErr(TDEProcess*, char*, int))); if (!daemon->start(TDEProcess::NotifyOnExit, TDEProcess::All)) { @@ -535,12 +535,12 @@ void KSANEOCR::startOCRProcess( void ) TQ_CHECK_PTR(daemon); m_ocrResultText = ""; - connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT( gocrExited(TDEProcess*))); - connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)), - this, TQT_SLOT( gocrStdIn(TDEProcess*, char*, int))); - connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)), - this, TQT_SLOT( gocrStdErr(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT( gocrExited(TDEProcess*))); + connect(daemon, TQ_SIGNAL(receivedStdout(TDEProcess *, char*, int)), + this, TQ_SLOT( gocrStdIn(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(receivedStderr(TDEProcess *, char*, int)), + this, TQ_SLOT( gocrStdErr(TDEProcess*, char*, int))); TQString opt; *daemon << TQFile::encodeName(cmd).data(); @@ -649,7 +649,7 @@ void KSANEOCR::startOCRProcess( void ) } #ifdef TQT_THREAD_SUPPORT /* start a timer and wait until it fires. */ - TQTimer::singleShot( 500, this, TQT_SLOT( slotKadmosResult() )); + TQTimer::singleShot( 500, this, TQ_SLOT( slotKadmosResult() )); #else slotKadmosResult(); #endif @@ -703,7 +703,7 @@ void KSANEOCR::slotKadmosResult() else { /* recognition thread is not yet finished. Wait another half a second. */ - TQTimer::singleShot( 500, this, TQT_SLOT( slotKadmosResult() )); + TQTimer::singleShot( 500, this, TQ_SLOT( slotKadmosResult() )); /* Never comes here if no threads exist on the system */ } #endif /* HAVE_KADMOS */ @@ -1347,18 +1347,18 @@ void KSANEOCR::slMisspelling( const TQString& originalword, const TQStringList& void KSANEOCR::slSpellReady( KSpell *spell ) { m_spell = spell; - connect ( m_spell, TQT_SIGNAL( misspelling( const TQString&, const TQStringList&, + connect ( m_spell, TQ_SIGNAL( misspelling( const TQString&, const TQStringList&, unsigned int )), - this, TQT_SLOT( slMisspelling(const TQString& , + this, TQ_SLOT( slMisspelling(const TQString& , const TQStringList& , unsigned int ))); - connect( m_spell, TQT_SIGNAL( corrected ( const TQString&, const TQString&, unsigned int )), - this, TQT_SLOT( slSpellCorrected( const TQString&, const TQString&, unsigned int ))); + connect( m_spell, TQ_SIGNAL( corrected ( const TQString&, const TQString&, unsigned int )), + this, TQ_SLOT( slSpellCorrected( const TQString&, const TQString&, unsigned int ))); - connect( m_spell, TQT_SIGNAL( ignoreword( const TQString& )), - this, TQT_SLOT( slSpellIgnoreWord( const TQString& ))); + connect( m_spell, TQ_SIGNAL( ignoreword( const TQString& )), + this, TQ_SLOT( slSpellIgnoreWord( const TQString& ))); - connect( m_spell, TQT_SIGNAL( done(bool)), this, TQT_SLOT(slCheckListDone(bool))); + connect( m_spell, TQ_SIGNAL( done(bool)), this, TQ_SLOT(slCheckListDone(bool))); kdDebug(28000) << "Spellcheck available" << endl; diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index c4c03b1e..3d47221c 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -90,8 +90,8 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent ) setDropVisualizer(true); setAcceptDrops(true); - connect( this, TQT_SIGNAL(dropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& )), - this, TQT_SLOT( slotUrlsDropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& ))); + connect( this, TQ_SIGNAL(dropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& )), + this, TQ_SLOT( slotUrlsDropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& ))); kdDebug(28000) << "connected Drop-Signal" << endl; setRenameable ( 0, true ); @@ -101,14 +101,14 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent ) setRootIsDecorated( false ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem*)), - TQT_SLOT( slClicked(TQListViewItem*))); + connect( this, TQ_SIGNAL( clicked( TQListViewItem*)), + TQ_SLOT( slClicked(TQListViewItem*))); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), - TQT_SLOT( slShowContextMenue(TQListViewItem *, const TQPoint &, int ))); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), + TQ_SLOT( slShowContextMenue(TQListViewItem *, const TQPoint &, int ))); - connect( this, TQT_SIGNAL(itemRenamed (TQListViewItem*, const TQString &, int ) ), this, - TQT_SLOT(slFileRename( TQListViewItem*, const TQString&, int))); + connect( this, TQ_SIGNAL(itemRenamed (TQListViewItem*, const TQString &, int ) ), this, + TQ_SLOT(slFileRename( TQListViewItem*, const TQString&, int))); img_counter = 1; @@ -158,17 +158,17 @@ KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool ) setDirOnlyMode( m_defaultBranch, false ); m_defaultBranch->setShowExtensions( true ); // false ); - connect( m_defaultBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), - this, TQT_SLOT( slotDecorate(KFileTreeBranch*, const KFileTreeViewItemList& ))); + connect( m_defaultBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), + this, TQ_SLOT( slotDecorate(KFileTreeBranch*, const KFileTreeViewItemList& ))); - connect( m_defaultBranch, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem* , int )), - this, TQT_SLOT( slotDirCount( KFileTreeViewItem *, int ))); + connect( m_defaultBranch, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem* , int )), + this, TQ_SLOT( slotDirCount( KFileTreeViewItem *, int ))); - connect( m_defaultBranch, TQT_SIGNAL( deleteItem( KFileItem* )), - this, TQT_SLOT( slotDeleteFromBranch(KFileItem*))); + connect( m_defaultBranch, TQ_SIGNAL( deleteItem( KFileItem* )), + this, TQ_SLOT( slotDeleteFromBranch(KFileItem*))); - connect( m_defaultBranch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotStartupFinished( KFileTreeViewItem * ))); + connect( m_defaultBranch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotStartupFinished( KFileTreeViewItem * ))); return( m_defaultBranch ); diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index 4f5c1d7a..08c11534 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -73,8 +73,8 @@ ThumbView::ThumbView( TQWidget *parent, const char *name ) slSetBackGround(); - connect( m_iconView, TQT_SIGNAL( executed( TQIconViewItem* )), - this, TQT_SLOT( slDoubleClicked( TQIconViewItem* ))); + connect( m_iconView, TQ_SIGNAL( executed( TQIconViewItem* )), + this, TQ_SLOT( slDoubleClicked( TQIconViewItem* ))); m_pendingJobs.setAutoDelete(false); } @@ -389,18 +389,18 @@ void ThumbView::slNewFileItems( const KFileItemList& items ) if( m_job ) { - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slPreviewResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slPreviewResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); m_pendingJobs.clear(); /* TDEIO::Jo result is called in any way: Success, Failed, Error, * thus connecting the failed is not really necessary. */ - // connect( job, TQT_SIGNAL( failed( const KFileItem* )), - // this, TQT_SLOT( slotFailed( const KFileItem* ) )); + // connect( job, TQ_SIGNAL( failed( const KFileItem* )), + // this, TQ_SLOT( slotFailed( const KFileItem* ) )); } } diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index f880645f..97bc6706 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -204,7 +204,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con if ( !d->saveBookmarksTimer ) { d->saveBookmarksTimer = new TQTimer( this ); - connect( d->saveBookmarksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( saveDocumentInfo() ) ); + connect( d->saveBookmarksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( saveDocumentInfo() ) ); } d->saveBookmarksTimer->start( 5 * 60 * 1000 ); @@ -212,7 +212,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con if ( !d->memCheckTimer ) { d->memCheckTimer = new TQTimer( this ); - connect( d->memCheckTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimedMemoryCheck() ) ); + connect( d->memCheckTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimedMemoryCheck() ) ); } d->memCheckTimer->start( 2000 ); diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 736db94a..97f1b5b4 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -120,11 +120,11 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_actionsSearched(false), m_searchStarted(false) { // connect the started signal to tell the job the mimetypes we like - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(setMimeTypes(TDEIO::Job *))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(setMimeTypes(TDEIO::Job *))); // connect the completed signal so we can put the window caption when loading remote files - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(emitWindowCaption())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(emitWindowCaption())); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(emitWindowCaption())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(emitWindowCaption())); // load catalog for translation TDEGlobal::locale()->insertCatalogue("kpdf"); @@ -144,17 +144,17 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, // build the document m_document = new KPDFDocument(widget()); - connect( m_document, TQT_SIGNAL( linkFind() ), this, TQT_SLOT( slotFind() ) ); - connect( m_document, TQT_SIGNAL( linkGoToPage() ), this, TQT_SLOT( slotGoToPage() ) ); - connect( m_document, TQT_SIGNAL( linkPresentation() ), this, TQT_SLOT( slotShowPresentation() ) ); - connect( m_document, TQT_SIGNAL( linkEndPresentation() ), this, TQT_SLOT( slotHidePresentation() ) ); - connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) ); - connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) ); + connect( m_document, TQ_SIGNAL( linkFind() ), this, TQ_SLOT( slotFind() ) ); + connect( m_document, TQ_SIGNAL( linkGoToPage() ), this, TQ_SLOT( slotGoToPage() ) ); + connect( m_document, TQ_SIGNAL( linkPresentation() ), this, TQ_SLOT( slotShowPresentation() ) ); + connect( m_document, TQ_SIGNAL( linkEndPresentation() ), this, TQ_SLOT( slotHidePresentation() ) ); + connect( m_document, TQ_SIGNAL( openURL(const KURL &) ), this, TQ_SLOT( openURLFromDocument(const KURL &) ) ); + connect( m_document, TQ_SIGNAL( close() ), this, TQ_SLOT( close() ) ); if (parent && parent->metaObject()->slotNames(true).contains("slotQuit()")) - connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) ); + connect( m_document, TQ_SIGNAL( quit() ), parent, TQ_SLOT( slotQuit() ) ); else - connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) ); + connect( m_document, TQ_SIGNAL( quit() ), this, TQ_SLOT( cannotQuit() ) ); // widgets: ^searchbar (toolbar containing label and SearchWidget) // m_searchToolBar = new TDEToolBar( parentWidget, "searchBar" ); @@ -169,7 +169,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_splitter->setOpaqueResize( true ); setWidget( m_splitter ); - m_showLeftPanel = new TDEToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQT_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" ); + m_showLeftPanel = new TDEToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQ_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" ); m_showLeftPanel->setCheckedState( i18n( "Hide &Navigation Panel") ); m_showLeftPanel->setShortcut( "CTRL+L" ); m_showLeftPanel->setChecked( KpdfSettings::showLeftPanel() ); @@ -191,7 +191,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, TQVBoxLayout *tocWrapperLayout = new TQVBoxLayout(tocWrapper); m_tocFrame = new TOC( tocWrapper, m_document ); tocWrapperLayout->add(m_tocFrame); - connect(m_tocFrame, TQT_SIGNAL(hasTOC(bool)), this, TQT_SLOT(enableTOC(bool))); + connect(m_tocFrame, TQ_SIGNAL(hasTOC(bool)), this, TQ_SLOT(enableTOC(bool))); index = m_toolBox->addItem( tocWrapper, TQIconSet(SmallIcon("format-text-direction-ltr")), i18n("Contents") ); m_toolBox->setItemToolTip(index, i18n("Contents")); enableTOC( false ); @@ -201,8 +201,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_searchWidget = new SearchWidget( thumbsBox, m_document ); m_thumbnailList = new ThumbnailList( thumbsBox, m_document ); // ThumbnailController * m_tc = new ThumbnailController( thumbsBox, m_thumbnailList ); - connect( m_thumbnailList, TQT_SIGNAL( urlDropped( const KURL& ) ), TQT_SLOT( openURLFromDocument( const KURL & )) ); - connect( m_thumbnailList, TQT_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQT_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) ); + connect( m_thumbnailList, TQ_SIGNAL( urlDropped( const KURL& ) ), TQ_SLOT( openURLFromDocument( const KURL & )) ); + connect( m_thumbnailList, TQ_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQ_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) ); // shrink the bottom controller toolbar (too hackish..) thumbsBox->setStretchFactor( m_searchWidget, 100 ); thumbsBox->setStretchFactor( m_thumbnailList, 100 ); @@ -234,8 +234,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, m_pageView = new PageView( m_splitter, m_document ); m_pageView->setFocus(); //usability setting m_splitter->setFocusProxy(m_pageView); - connect( m_pageView, TQT_SIGNAL( urlDropped( const KURL& ) ), TQT_SLOT( openURLFromDocument( const KURL & ))); - connect( m_pageView, TQT_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQT_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) ); + connect( m_pageView, TQ_SIGNAL( urlDropped( const KURL& ) ), TQ_SLOT( openURLFromDocument( const KURL & ))); + connect( m_pageView, TQ_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQ_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) ); // add document observers m_document->addObserver( this ); @@ -248,53 +248,53 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, TDEActionCollection * ac = actionCollection(); // Page Traversal actions - m_gotoPage = KStdAction::gotoPage( this, TQT_SLOT( slotGoToPage() ), ac, "goto_page" ); + m_gotoPage = KStdAction::gotoPage( this, TQ_SLOT( slotGoToPage() ), ac, "goto_page" ); m_gotoPage->setShortcut( "CTRL+G" ); // dirty way to activate gotopage when pressing miniBar's button - connect( m_miniBar, TQT_SIGNAL( gotoPage() ), m_gotoPage, TQT_SLOT( activate() ) ); + connect( m_miniBar, TQ_SIGNAL( gotoPage() ), m_gotoPage, TQ_SLOT( activate() ) ); - m_prevPage = KStdAction::prior(this, TQT_SLOT(slotPreviousPage()), ac, "previous_page"); + m_prevPage = KStdAction::prior(this, TQ_SLOT(slotPreviousPage()), ac, "previous_page"); m_prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) ); m_prevPage->setShortcut( 0 ); // dirty way to activate prev page when pressing miniBar's button - connect( m_miniBar, TQT_SIGNAL( prevPage() ), m_prevPage, TQT_SLOT( activate() ) ); + connect( m_miniBar, TQ_SIGNAL( prevPage() ), m_prevPage, TQ_SLOT( activate() ) ); - m_nextPage = KStdAction::next(this, TQT_SLOT(slotNextPage()), ac, "next_page" ); + m_nextPage = KStdAction::next(this, TQ_SLOT(slotNextPage()), ac, "next_page" ); m_nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); m_nextPage->setShortcut( 0 ); // dirty way to activate next page when pressing miniBar's button - connect( m_miniBar, TQT_SIGNAL( nextPage() ), m_nextPage, TQT_SLOT( activate() ) ); + connect( m_miniBar, TQ_SIGNAL( nextPage() ), m_nextPage, TQ_SLOT( activate() ) ); - m_firstPage = KStdAction::firstPage( this, TQT_SLOT( slotGotoFirst() ), ac, "first_page" ); + m_firstPage = KStdAction::firstPage( this, TQ_SLOT( slotGotoFirst() ), ac, "first_page" ); m_firstPage->setWhatsThis( i18n( "Moves to the first page of the document" ) ); - m_lastPage = KStdAction::lastPage( this, TQT_SLOT( slotGotoLast() ), ac, "last_page" ); + m_lastPage = KStdAction::lastPage( this, TQ_SLOT( slotGotoLast() ), ac, "last_page" ); m_lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) ); - m_historyBack = KStdAction::back( this, TQT_SLOT( slotHistoryBack() ), ac, "history_back" ); + m_historyBack = KStdAction::back( this, TQ_SLOT( slotHistoryBack() ), ac, "history_back" ); m_historyBack->setWhatsThis( i18n( "Go to the place you were before" ) ); - m_historyNext = KStdAction::forward( this, TQT_SLOT( slotHistoryNext() ), ac, "history_forward" ); + m_historyNext = KStdAction::forward( this, TQ_SLOT( slotHistoryNext() ), ac, "history_forward" ); m_historyNext->setWhatsThis( i18n( "Go to the place you were after" ) ); // Find and other actions - m_find = KStdAction::find( this, TQT_SLOT( slotFind() ), ac, "find" ); + m_find = KStdAction::find( this, TQ_SLOT( slotFind() ), ac, "find" ); m_find->setEnabled( false ); - m_findNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac, "find_next" ); + m_findNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac, "find_next" ); m_findNext->setEnabled( false ); - m_saveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveFileAs() ), ac, "save" ); + m_saveAs = KStdAction::saveAs( this, TQ_SLOT( slotSaveFileAs() ), ac, "save" ); m_saveAs->setEnabled( false ); - TDEAction * prefs = KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), ac, "preferences" ); + TDEAction * prefs = KStdAction::preferences( this, TQ_SLOT( slotPreferences() ), ac, "preferences" ); prefs->setText( i18n( "Configure KPDF..." ) ); - m_printPreview = KStdAction::printPreview( this, TQT_SLOT( slotPrintPreview() ), ac ); + m_printPreview = KStdAction::printPreview( this, TQ_SLOT( slotPrintPreview() ), ac ); m_printPreview->setEnabled( false ); - m_showProperties = new TDEAction(i18n("&Properties"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties"); + m_showProperties = new TDEAction(i18n("&Properties"), "application-vnd.tde.info", 0, this, TQ_SLOT(slotShowProperties()), ac, "properties"); m_showProperties->setEnabled( false ); - m_showPresentation = new TDEAction( i18n("P&resentation"), "application-x-kpresenter", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation"); + m_showPresentation = new TDEAction( i18n("P&resentation"), "application-x-kpresenter", "Ctrl+Shift+P", this, TQ_SLOT(slotShowPresentation()), ac, "presentation"); m_showPresentation->setEnabled( false ); // attach the actions of the children widgets too @@ -313,11 +313,11 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, // by connecting to TQt4::TQSplitter's sliderMoved()) m_pageView->installEventFilter( this ); m_watcher = new KDirWatch( this ); - connect( m_watcher, TQT_SIGNAL( dirty( const TQString& ) ), this, TQT_SLOT( slotFileDirty( const TQString& ) ) ); + connect( m_watcher, TQ_SIGNAL( dirty( const TQString& ) ), this, TQ_SLOT( slotFileDirty( const TQString& ) ) ); m_dirtyHandler = new TQTimer( this ); - connect( m_dirtyHandler, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotDoFileDirty() ) ); + connect( m_dirtyHandler, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotDoFileDirty() ) ); m_saveSplitterSizeTimer = new TQTimer( this ); - connect( m_saveSplitterSizeTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( saveSplitterSize() ) ); + connect( m_saveSplitterSizeTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( saveSplitterSize() ) ); slotNewConfig(); @@ -432,7 +432,7 @@ bool Part::openFile() *p << app; *p << m_file << m_temporaryLocalFile; m_pageView->showText(i18n("Converting from ps to pdf..."), 0); - connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(psTransformEnded())); + connect(p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(psTransformEnded())); p -> start(); return true; } @@ -527,7 +527,7 @@ void Part::setMimeTypes(TDEIO::Job *job) if (job) { job->addMetaData("accept", "application/pdf, */*;q=0.5"); - connect(job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), this, TQT_SLOT(readMimeType(TDEIO::Job*,const TQString&))); + connect(job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), this, TQ_SLOT(readMimeType(TDEIO::Job*,const TQString&))); } } @@ -830,7 +830,7 @@ void Part::slotPreferences() // we didn't find an instance of this dialog, so lets create it PreferencesDialog * dialog = new PreferencesDialog( m_pageView, KpdfSettings::self() ); // keep us informed when the user changes settings - connect( dialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotNewConfig() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotNewConfig() ) ); dialog->show(); } diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 8f2c08c3..a0fdefdc 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -87,9 +87,9 @@ void Shell::init() m_part = 0; return; } - connect( this, TQT_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQT_SLOT( restoreDocument(TDEConfig*))); - connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*))); - connect( m_part, TQT_SIGNAL( enablePrintAction(bool) ), m_printAction, TQT_SLOT( setEnabled(bool))); + connect( this, TQ_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQ_SLOT( restoreDocument(TDEConfig*))); + connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*))); + connect( m_part, TQ_SIGNAL( enablePrintAction(bool) ), m_printAction, TQ_SLOT( setEnabled(bool))); readSettings(); if (!TDEGlobal::config()->hasGroup("MainWindow")) @@ -99,7 +99,7 @@ void Shell::init() } setAutoSaveSettings(); - if (m_openUrl.isValid()) TQTimer::singleShot(0, this, TQT_SLOT(delayedOpen())); + if (m_openUrl.isValid()) TQTimer::singleShot(0, this, TQ_SLOT(delayedOpen())); } void Shell::delayedOpen() @@ -146,19 +146,19 @@ void Shell::writeSettings() void Shell::setupActions() { - TDEAction * openAction = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - m_recent = KStdAction::openRecent( this, TQT_SLOT( openURL( const KURL& ) ), actionCollection() ); - connect( m_recent, TQT_SIGNAL( activated() ), openAction, TQT_SLOT( activate() ) ); + TDEAction * openAction = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + m_recent = KStdAction::openRecent( this, TQ_SLOT( openURL( const KURL& ) ), actionCollection() ); + connect( m_recent, TQ_SIGNAL( activated() ), openAction, TQ_SLOT( activate() ) ); m_recent->setWhatsThis( i18n( "<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file" ) ); - m_printAction = KStdAction::print( m_part, TQT_SLOT( slotPrint() ), actionCollection() ); + m_printAction = KStdAction::print( m_part, TQ_SLOT( slotPrint() ), actionCollection() ); m_printAction->setEnabled( false ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - m_showMenuBarAction = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenubar() ), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - m_fullScreenAction = KStdAction::fullScreen( this, TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); + m_showMenuBarAction = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenubar() ), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + m_fullScreenAction = KStdAction::fullScreen( this, TQ_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); } void Shell::saveProperties(TDEConfig* config) @@ -197,7 +197,7 @@ Shell::fileOpen() Shell::optionsConfigureToolbars() { KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index 87ebc8c4..f05b8931 100644 --- a/kpdf/ui/minibar.cpp +++ b/kpdf/ui/minibar.cpp @@ -121,10 +121,10 @@ MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document ) setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); // connect signals from child widgets to internal handlers / signals bouncers - connect( m_pagesEdit, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotChangePage() ) ); - connect( m_pagesButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( gotoPage() ) ); - connect( m_prevButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( prevPage() ) ); - connect( m_nextButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( nextPage() ) ); + connect( m_pagesEdit, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotChangePage() ) ); + connect( m_pagesButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( gotoPage() ) ); + connect( m_prevButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( prevPage() ) ); + connect( m_nextButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( nextPage() ) ); // widget starts hidden (will be shown after opening a document) parent->hide(); diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index b0a20f99..57f201a0 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -216,8 +216,8 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document ) viewport()->setMouseTracking( true ); // conntect the padding of the viewport to pixmaps requests - connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) ); - connect( &d->dragScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragScroll()) ); + connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotRequestVisiblePixmaps(int, int)) ); + connect( &d->dragScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragScroll()) ); // set a corner button to resize the view to the page size // TQPushButton * resizeButton = new TQPushButton( viewport() ); @@ -228,7 +228,7 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document ) setInputMethodEnabled( true ); // schedule the welcome message - TQTimer::singleShot( 0, this, TQT_SLOT( slotShowWelcome() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotShowWelcome() ) ); } PageView::~PageView() @@ -246,68 +246,68 @@ PageView::~PageView() void PageView::setupActions( TDEActionCollection * ac ) { // Zoom actions ( higher scales takes lots of memory! ) - d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, this, TQT_SLOT( slotZoom() ), ac, "zoom_to" ); + d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, this, TQ_SLOT( slotZoom() ), ac, "zoom_to" ); d->aZoom->setEditable( true ); #if KDE_IS_VERSION(3,4,89) d->aZoom->setMaxComboViewCount( 13 ); #endif updateZoomText(); - KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ), ac, "zoom_in" ); + KStdAction::zoomIn( this, TQ_SLOT( slotZoomIn() ), ac, "zoom_in" ); - KStdAction::zoomOut( this, TQT_SLOT( slotZoomOut() ), ac, "zoom_out" ); + KStdAction::zoomOut( this, TQ_SLOT( slotZoomOut() ), ac, "zoom_out" ); d->aZoomFitWidth = new TDEToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" ); - connect( d->aZoomFitWidth, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToWidthToggled( bool ) ) ); + connect( d->aZoomFitWidth, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotFitToWidthToggled( bool ) ) ); d->aZoomFitPage = new TDEToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" ); - connect( d->aZoomFitPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToPageToggled( bool ) ) ); + connect( d->aZoomFitPage, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotFitToPageToggled( bool ) ) ); d->aZoomFitText = new TDEToggleAction( i18n("Fit to &Text"), "zoom-fit-best", 0, ac, "zoom_fit_text" ); - connect( d->aZoomFitText, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToTextToggled( bool ) ) ); + connect( d->aZoomFitText, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotFitToTextToggled( bool ) ) ); // rotate actions TDEAction *action; action = new TDEAction( i18n("Rotate Right"), "object-rotate-right", TDEShortcut( "Ctrl+Shift++" ), - this, TQT_SLOT( slotRotateRight() ), ac, "rotate_right" ); + this, TQ_SLOT( slotRotateRight() ), ac, "rotate_right" ); action = new TDEAction( i18n("Rotate Left"), "object-rotate-left", TDEShortcut( "Ctrl+Shift+-" ), - this, TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" ); + this, TQ_SLOT( slotRotateLeft() ), ac, "rotate_left" ); // View-Layout actions d->aViewTwoPages = new TDEToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" ); - connect( d->aViewTwoPages, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotTwoPagesToggled( bool ) ) ); + connect( d->aViewTwoPages, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotTwoPagesToggled( bool ) ) ); d->aViewTwoPages->setChecked( KpdfSettings::viewColumns() > 1 ); d->aViewContinuous = new TDEToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" ); - connect( d->aViewContinuous, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotContinuousToggled( bool ) ) ); + connect( d->aViewContinuous, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotContinuousToggled( bool ) ) ); d->aViewContinuous->setChecked( KpdfSettings::viewContinuous() ); d->aViewCoverPage = new TDEToggleAction( i18n("Co&ver Page"), "contents2", 0, ac, "view_coverpage" ); - connect( d->aViewCoverPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotCoverPageToggled( bool ) ) ); + connect( d->aViewCoverPage, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotCoverPageToggled( bool ) ) ); d->aViewCoverPage->setChecked( KpdfSettings::viewCoverPage() ); d->aViewCoverPage->setEnabled( KpdfSettings::viewColumns() > 1 ); // Mouse-Mode actions - d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "input-mouse", 0, this, TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); + d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "input-mouse", 0, this, TQ_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); d->aMouseNormal->setExclusiveGroup( "MouseType" ); d->aMouseNormal->setChecked( true ); - TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, this, TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" ); + TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, this, TQ_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" ); mz->setExclusiveGroup( "MouseType" ); - d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, this, TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" ); + d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, this, TQ_SLOT( slotSetMouseSelect() ), ac, "mouse_select" ); d->aMouseSelect->setExclusiveGroup( "MouseType" ); -/* d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, this, TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" ); +/* d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, this, TQ_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" ); d->aMouseEdit->setExclusiveGroup("MouseType"); d->aMouseEdit->setEnabled( false ); // implement feature before removing this line*/ // Other actions - TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, this, TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" ); + TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, this, TQ_SLOT( slotScrollUp() ), ac, "view_scroll_up" ); su->setShortcut( "Shift+Up" ); - TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, this, TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" ); + TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, this, TQ_SLOT( slotScrollDown() ), ac, "view_scroll_down" ); sd->setShortcut( "Shift+Down" ); } @@ -354,7 +354,7 @@ void PageView::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool do // Need slotRelayoutPages() here instead of d->dirtyLayout = true // because opening a pdf from another pdf will not trigger a viewportchange // so pages are never relayouted - TQTimer::singleShot(0, this, TQT_SLOT(slotRelayoutPages())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRelayoutPages())); else { // update the mouse cursor when closing because we may have close through a link and @@ -437,8 +437,8 @@ void PageView::notifyViewportChanged( bool smoothMove ) if ( !d->viewportMoveTimer ) { d->viewportMoveTimer = new TQTimer( this ); - connect( d->viewportMoveTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotMoveViewport() ) ); + connect( d->viewportMoveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotMoveViewport() ) ); } d->viewportMoveTimer->start( 25 ); verticalScrollBar()->setEnabled( false ); @@ -643,7 +643,7 @@ void PageView::viewportResizeEvent( TQResizeEvent * ) if ( !d->delayResizeTimer ) { d->delayResizeTimer = new TQTimer( this ); - connect( d->delayResizeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRelayoutPages() ) ); + connect( d->delayResizeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRelayoutPages() ) ); } d->delayResizeTimer->start( 333, true ); } @@ -725,7 +725,7 @@ void PageView::keyPressEvent( TQKeyEvent * e ) { // create the timer on demand d->findTimeoutTimer = new TQTimer( this ); - connect( d->findTimeoutTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( findAheadStop() ) ); + connect( d->findTimeoutTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( findAheadStop() ) ); } d->findTimeoutTimer->start( 3000, true ); // it is needed to grab the keyboard becase people may have Space assigned to a @@ -2004,7 +2004,7 @@ void PageView::slotAutoScoll() if ( !d->autoScrollTimer ) { d->autoScrollTimer = new TQTimer( this ); - connect( d->autoScrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScoll() ) ); + connect( d->autoScrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScoll() ) ); } // if scrollIncrement is zero, stop the timer diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp index adf52f9e..90d90472 100644 --- a/kpdf/ui/pageviewutils.cpp +++ b/kpdf/ui/pageviewutils.cpp @@ -131,7 +131,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration if ( !m_timer ) { m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) ); } m_timer->start( durationMs, true ); } else if ( m_timer ) diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index f88726a1..65645400 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -69,11 +69,11 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc ) // misc stuff setMouseTracking( true ); m_transitionTimer = new TQTimer( this ); - connect( m_transitionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransitionStep() ) ); + connect( m_transitionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransitionStep() ) ); m_overlayHideTimer = new TQTimer( this ); - connect( m_overlayHideTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotHideOverlay() ) ); + connect( m_overlayHideTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotHideOverlay() ) ); m_nextPageTimer = new TQTimer( this ); - connect( m_nextPageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotNextPage() ) ); + connect( m_nextPageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotNextPage() ) ); // handle cursor appearance as specified in configuration if ( KpdfSettings::slidesCursor() == KpdfSettings::EnumSlidesCursor::HiddenDelay ) @@ -100,11 +100,11 @@ PresentationWidget::~PresentationWidget() void PresentationWidget::setupActions( TDEActionCollection * ac ) { - m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), this, TQT_SLOT( slotPrevPage() ), false, true ); - m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), this, TQT_SLOT( slotNextPage() ), false, true ); - m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), this, TQT_SLOT( slotFirstPage() ), false, true ); - m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), this, TQT_SLOT( slotLastPage() ), false, true ); - m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), this, TQT_SLOT( close() ), false, true ); + m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), this, TQ_SLOT( slotPrevPage() ), false, true ); + m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), this, TQ_SLOT( slotNextPage() ), false, true ); + m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), this, TQ_SLOT( slotFirstPage() ), false, true ); + m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), this, TQ_SLOT( slotLastPage() ), false, true ); + m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), this, TQ_SLOT( close() ), false, true ); } void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool /*documentChanged*/ ) @@ -307,9 +307,9 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe ) m_topBar = new TDEToolBar( this, "presentationBar" ); m_topBar->setIconSize( 32 ); m_topBar->setMovingEnabled( false ); - m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPrevPage() ) ); - m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNextPage() ) ); - m_topBar->insertButton( "system-log-out", 1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) ); + m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPrevPage() ) ); + m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNextPage() ) ); + m_topBar->insertButton( "system-log-out", 1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() ) ); m_topBar->setGeometry( 0, 0, m_width, 32 + 10 ); m_topBar->alignItemRight( 1 ); m_topBar->hide(); diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp index 4200cba7..f7c5b719 100644 --- a/kpdf/ui/searchwidget.cpp +++ b/kpdf/ui/searchwidget.cpp @@ -40,18 +40,18 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document ) // a timer to ensure that we don't flood the document with requests to search m_inputDelayTimer = new TQTimer(this); - connect( m_inputDelayTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( startSearch() ) ); + connect( m_inputDelayTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startSearch() ) ); // 1. text line - insertLined( TQString(), LEDIT_ID, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotTextChanged(const TQString &) ), true, + insertLined( TQString(), LEDIT_ID, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotTextChanged(const TQString &) ), true, i18n( "Enter at least 3 letters to filter pages" ), 0/*size*/, 1 ); // 2. clear button (uses a lineEdit slot, so it must be created after) insertButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - CLEAR_ID, TQT_SIGNAL( clicked() ), - getLined( LEDIT_ID ), TQT_SLOT( clear() ), true, + CLEAR_ID, TQ_SIGNAL( clicked() ), + getLined( LEDIT_ID ), TQ_SLOT( clear() ), true, i18n( "Clear filter" ), 0/*index*/ ); // 3.1. create the popup menu for changing filtering features @@ -62,7 +62,7 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document ) m_menu->insertItem( i18n("Match All Words"), 4 ); m_menu->insertItem( i18n("Match Any Word"), 5 ); m_menu->setItemChecked( 3, true ); - connect( m_menu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuChaged(int) ) ); + connect( m_menu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuChaged(int) ) ); // 3.2. create the toolbar button that spawns the popup menu insertButton( "kpdf", FIND_ID, m_menu, true, i18n( "Filter Options" ), 2/*index*/ ); diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index b68eed81..7d66cfb2 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/kpdf/ui/thumbnaillist.cpp @@ -85,7 +85,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document ) viewport()->setPaletteBackgroundColor( palette().active().base() ); setFrameStyle( StyledPanel | Raised ); - connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) ); + connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotRequestVisiblePixmaps(int, int)) ); } ThumbnailList::~ThumbnailList() @@ -444,7 +444,7 @@ void ThumbnailList::delayedRequestVisiblePixmaps( int delayMs ) if ( !m_delayTimer ) { m_delayTimer = new TQTimer( this ); - connect( m_delayTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDelayTimeout() ) ); + connect( m_delayTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDelayTimeout() ) ); } m_delayTimer->start( delayMs, true ); } @@ -563,8 +563,8 @@ ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * lis // insert a togglebutton [show only bookmarked pages] //insertSeparator(); - insertButton( "bookmark", FILTERB_ID, TQT_SIGNAL( toggled( bool ) ), - list, TQT_SLOT( slotFilterBookmarks( bool ) ), + insertButton( "bookmark", FILTERB_ID, TQ_SIGNAL( toggled( bool ) ), + list, TQ_SLOT( slotFilterBookmarks( bool ) ), true, i18n( "Show bookmarked pages only" ) ); setToggle( FILTERB_ID ); setButton( FILTERB_ID, KpdfSettings::filterBookmarks() ); diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp index 00ac8eaf..e71f8746 100644 --- a/kpdf/ui/toc.cpp +++ b/kpdf/ui/toc.cpp @@ -67,8 +67,8 @@ TOC::TOC(TQWidget *parent, KPDFDocument *document) : TDEListView(parent), m_docu // the next line causes bug:147233 // setResizeMode(AllColumns); setAllColumnsShowFocus(true); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotExecuted(TQListViewItem *))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(slotExecuted(TQListViewItem *))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotExecuted(TQListViewItem *))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(slotExecuted(TQListViewItem *))); } TOC::~TOC() diff --git a/kpovmodeler/StyleConvention b/kpovmodeler/StyleConvention index 208349c5..5418fb0c 100644 --- a/kpovmodeler/StyleConvention +++ b/kpovmodeler/StyleConvention @@ -213,7 +213,7 @@ things are set multiple times. But it works :-) (font-lock-add-keywords 'c++-mode '(("\\<TQ_OBJECT\\>" . 'qt-keywords-face))) (font-lock-add-keywords 'c++-mode - '(("\\<SIGNAL\\|SLOT\\>" . 'qt-keywords-face))) + '(("\\<TQ_SIGNAL\\|TQ_SLOT\\>" . 'qt-keywords-face))) (font-lock-add-keywords 'c++-mode '(("\\<Q[A-Z][A-Za-z]*" . 'qt-keywords-face))) ) diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp index 3b1201c4..e7f93b6f 100644 --- a/kpovmodeler/pmactions.cpp +++ b/kpovmodeler/pmactions.cpp @@ -82,11 +82,11 @@ int PMComboAction::plug( TQWidget* w, int index ) toolBar->insertWidget( id, m_minWidth > 0 ? m_minWidth : 300, comboBox, index ); - connect( comboBox, TQT_SIGNAL( activated( int ) ), m_receiver, m_member ); + connect( comboBox, TQ_SIGNAL( activated( int ) ), m_receiver, m_member ); addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed( ) ), this, TQT_SLOT( slotDestroyed( ) ) ); + connect( toolBar, TQ_SIGNAL( destroyed( ) ), this, TQ_SLOT( slotDestroyed( ) ) ); //toolBar->setItemAutoSized( id, true ); @@ -164,7 +164,7 @@ int PMLabelAction::plug( TQWidget *widget, int index ) addContainer( tb, id ); - connect( tb, TQT_SIGNAL( destroyed( ) ), this, TQT_SLOT( slotDestroyed( ) ) ); + connect( tb, TQ_SIGNAL( destroyed( ) ), this, TQ_SLOT( slotDestroyed( ) ) ); return containerCount( ) - 1; } @@ -216,11 +216,11 @@ int PMSpinBoxAction::plug( TQWidget* w, int index ) TQSpinBox* spinBox = new TQSpinBox( -1000, 1000, 1, w ); toolBar->insertWidget( id, 70, spinBox, index ); - connect( spinBox, TQT_SIGNAL( valueChanged( int ) ), m_receiver, m_member ); + connect( spinBox, TQ_SIGNAL( valueChanged( int ) ), m_receiver, m_member ); addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed( ) ), this, TQT_SLOT( slotDestroyed( ) ) ); + connect( toolBar, TQ_SIGNAL( destroyed( ) ), this, TQ_SLOT( slotDestroyed( ) ) ); //toolBar->setItemAutoSized( id, false ); m_spinBox = spinBox; diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp index e3a46e36..295467a9 100644 --- a/kpovmodeler/pmbicubicpatchedit.cpp +++ b/kpovmodeler/pmbicubicpatchedit.cpp @@ -78,15 +78,15 @@ void PMBicubicPatchEdit::createTopWidgets( ) m_pUVVectors->setSize( 4 ); topLayout( )->addWidget( m_pUVVectors ); - connect( m_pType, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotTypeSelected( int ) ) ); - connect( m_pUSteps, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pVSteps, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFlatness, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ), - TQT_SLOT( slotSelectionChanged( ) ) ); - connect( m_pUVEnabled, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUVEnabledClicked( ) ) ); - connect( m_pUVVectors, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pType, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( slotTypeSelected( int ) ) ); + connect( m_pUSteps, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pVSteps, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFlatness, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ), + TQ_SLOT( slotSelectionChanged( ) ) ); + connect( m_pUVEnabled, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUVEnabledClicked( ) ) ); + connect( m_pUVVectors, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMBicubicPatchEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp index b523925d..ec73f538 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.cpp +++ b/kpovmodeler/pmblendmapmodifiersedit.cpp @@ -83,13 +83,13 @@ void PMBlendMapModifiersEdit::createTopWidgets( ) hl->addWidget( m_pWaveExponentEdit ); hl->addStretch( 1 ); - connect( m_pEnableFrequencyEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFrequencyClicked( ) ) ); - connect( m_pFrequencyEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnablePhaseEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPhaseClicked( ) ) ); - connect( m_pPhaseEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableWaveFormEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotWaveFormClicked( ) ) ); - connect( m_pWaveExponentEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pWaveTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeComboChanged( int ) ) ); + connect( m_pEnableFrequencyEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFrequencyClicked( ) ) ); + connect( m_pFrequencyEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnablePhaseEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPhaseClicked( ) ) ); + connect( m_pPhaseEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableWaveFormEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotWaveFormClicked( ) ) ); + connect( m_pWaveExponentEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pWaveTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotTypeComboChanged( int ) ) ); } void PMBlendMapModifiersEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp index 2a88096f..7ebb45b6 100644 --- a/kpovmodeler/pmblobcylinderedit.cpp +++ b/kpovmodeler/pmblobcylinderedit.cpp @@ -58,10 +58,10 @@ void PMBlobCylinderEdit::createTopWidgets( ) gl->addWidget( m_pStrength, 1, 1 ); layout->addStretch( 1 ); - connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pStrength, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pEnd1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnd2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pStrength, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMBlobCylinderEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp index 93ec707f..86231ed3 100644 --- a/kpovmodeler/pmblobedit.cpp +++ b/kpovmodeler/pmblobedit.cpp @@ -49,9 +49,9 @@ void PMBlobEdit::createTopWidgets( ) m_pHierarchy = new TQCheckBox( i18n( "Hierarchy" ), this ); topLayout( )->addWidget( m_pHierarchy ); - connect( m_pThreshold, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pThreshold, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pHierarchy, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMBlobEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp index 0d79d8ff..2cddef03 100644 --- a/kpovmodeler/pmblobsphereedit.cpp +++ b/kpovmodeler/pmblobsphereedit.cpp @@ -52,9 +52,9 @@ void PMBlobSphereEdit::createTopWidgets( ) gl->addWidget( m_pStrength, 1, 1 ); layout->addStretch( 1 ); - connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pStrength, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pCentre, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pStrength, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMBlobSphereEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp index 91c09f53..203f8e7a 100644 --- a/kpovmodeler/pmboxedit.cpp +++ b/kpovmodeler/pmboxedit.cpp @@ -43,8 +43,8 @@ void PMBoxEdit::createTopWidgets( ) gl->addWidget( new TQLabel( i18n( "Corner 2:" ), this ), 1, 0 ); gl->addWidget( m_pCorner2, 1, 1 ); - connect( m_pCorner1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCorner2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pCorner1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCorner2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMBoxEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp index 6b0b81d5..fcf93c42 100644 --- a/kpovmodeler/pmbumpmapedit.cpp +++ b/kpovmodeler/pmbumpmapedit.cpp @@ -110,14 +110,14 @@ void PMBumpMapEdit::createTopWidgets( ) hl->addWidget( m_pBumpSizeEdit ); hl->addStretch( 1 ); - connect( m_pImageFileTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotImageFileTypeChanged( int ) ) ); - connect( m_pMapTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMapTypeChanged( int ) ) ); - connect( m_pInterpolateTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotInterpolateTypeChanged( int ) ) ); - connect( m_pImageFileNameBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImageFileBrowseClicked( ) ) ); - connect( m_pImageFileNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotImageFileNameChanged( const TQString& ) ) ); - connect( m_pOnceEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pUseIndexEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pBumpSizeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pImageFileTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotImageFileTypeChanged( int ) ) ); + connect( m_pMapTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMapTypeChanged( int ) ) ); + connect( m_pInterpolateTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotInterpolateTypeChanged( int ) ) ); + connect( m_pImageFileNameBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImageFileBrowseClicked( ) ) ); + connect( m_pImageFileNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotImageFileNameChanged( const TQString& ) ) ); + connect( m_pOnceEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pUseIndexEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pBumpSizeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMBumpMapEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp index 047d074e..9adceba0 100644 --- a/kpovmodeler/pmcameraedit.cpp +++ b/kpovmodeler/pmcameraedit.cpp @@ -141,29 +141,29 @@ void PMCameraEdit::createTopWidgets( ) m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this ); topLayout( )->addWidget( m_pExport ); - connect( m_pLocation, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDirection, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotDirectionChanged( ) ) ); - connect( m_pRight, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRight, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotRightChanged( ) ) ); - connect( m_pUp, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSky, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLookAt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableAngle, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotAngleToggled( bool ) ) ); - connect( m_pAngle, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotAngleChanged( ) ) ); - connect( m_pCameraType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotCameraTypeActivated( int ) ) ); - connect( m_pCylinderType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotCylinderTypeActivated( int ) ) ); - - connect( m_pFocalBlur, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotFocalBlurToggled( bool ) ) ); - connect( m_pAperture, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pBlurSamples, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFocalPoint, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pVariance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pConfidence, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pExport, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pLocation, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDirection, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotDirectionChanged( ) ) ); + connect( m_pRight, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRight, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotRightChanged( ) ) ); + connect( m_pUp, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSky, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLookAt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableAngle, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotAngleToggled( bool ) ) ); + connect( m_pAngle, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotAngleChanged( ) ) ); + connect( m_pCameraType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotCameraTypeActivated( int ) ) ); + connect( m_pCylinderType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotCylinderTypeActivated( int ) ) ); + + connect( m_pFocalBlur, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotFocalBlurToggled( bool ) ) ); + connect( m_pAperture, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pBlurSamples, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFocalPoint, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pVariance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pConfidence, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pExport, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMCameraEdit::displayObject( PMObject* o ) @@ -385,9 +385,9 @@ void PMCameraEdit::slotAngleChanged( ) if( ( m_pCameraType->currentItem( ) == 0 ) && m_pEnableAngle->isChecked( ) ) { // Only change direction's value in perspective and with an enabled angle - disconnect( m_pDirection, TQT_SIGNAL( dataChanged( ) ), 0, 0 ); + disconnect( m_pDirection, TQ_SIGNAL( dataChanged( ) ), 0, 0 ); m_pDirection->setVector( 0.5 * m_pRight->vector( ) / tan( 2 * deg2Rad( m_pAngle->value( ) ) ) ); - connect( m_pDirection, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotDirectionChanged( ) ) ); + connect( m_pDirection, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotDirectionChanged( ) ) ); } */ emit dataChanged( ); diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp index 0a12dc23..9db543c7 100644 --- a/kpovmodeler/pmcoloredit.cpp +++ b/kpovmodeler/pmcoloredit.cpp @@ -63,16 +63,16 @@ PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* l->addWidget( m_edits[4] ); } - connect( m_edits[0], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) ); - connect( m_edits[1], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) ); - connect( m_edits[2], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) ); + connect( m_edits[0], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) ); + connect( m_edits[1], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) ); + connect( m_edits[2], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) ); if( filterAndTransmit ) { - connect( m_edits[3], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) ); - connect( m_edits[4], TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotEditChanged( ) ) ); + connect( m_edits[3], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) ); + connect( m_edits[4], TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotEditChanged( ) ) ); } - connect( m_pButton, TQT_SIGNAL( changed( const TQColor& ) ), - TQT_SLOT( slotColorChanged( const TQColor& ) ) ); + connect( m_pButton, TQ_SIGNAL( changed( const TQColor& ) ), + TQ_SLOT( slotColorChanged( const TQColor& ) ) ); } void PMColorEdit::setColor( const PMColor& c ) diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp index e57f9cea..d8b36525 100644 --- a/kpovmodeler/pmcommentedit.cpp +++ b/kpovmodeler/pmcommentedit.cpp @@ -39,7 +39,7 @@ void PMCommentEdit::createTopWidgets( ) m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) ); topLayout( )->addWidget( m_pEdit, 2 ); - connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pEdit, TQ_SIGNAL( textChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMCommentEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp index c02b2d40..532bcc51 100644 --- a/kpovmodeler/pmconeedit.cpp +++ b/kpovmodeler/pmconeedit.cpp @@ -61,11 +61,11 @@ void PMConeEdit::createTopWidgets( ) topLayout( )->addWidget( m_pOpen ); - connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pEnd1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnd2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMConeEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp index cf7757b2..f14e52c3 100644 --- a/kpovmodeler/pmcsgedit.cpp +++ b/kpovmodeler/pmcsgedit.cpp @@ -46,7 +46,7 @@ void PMCSGEdit::createTopWidgets( ) layout->addWidget( m_pTypeCombo ); layout->addStretch( 1 ); - connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) ); + connect( m_pTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotTypeSelected( int ) ) ); } void PMCSGEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp index 63be4505..cab7ee87 100644 --- a/kpovmodeler/pmcylinderedit.cpp +++ b/kpovmodeler/pmcylinderedit.cpp @@ -58,10 +58,10 @@ void PMCylinderEdit::createTopWidgets( ) layout = new TQHBoxLayout( topLayout( ) ); layout->addWidget( m_pOpen ); - connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pEnd1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnd2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMCylinderEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index e36f9650..fedaef2f 100644 --- a/kpovmodeler/pmdeclareedit.cpp +++ b/kpovmodeler/pmdeclareedit.cpp @@ -52,8 +52,8 @@ void PMDeclareEdit::createTopWidgets( ) layout->addWidget( label ); layout->addWidget( m_pNameEdit ); - connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotNameChanged( const TQString& ) ) ); + connect( m_pNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotNameChanged( const TQString& ) ) ); } void PMDeclareEdit::createBottomWidgets( ) @@ -63,15 +63,15 @@ void PMDeclareEdit::createBottomWidgets( ) m_pLinkedObjects = new TQListBox( this ); m_pLinkedObjects->setMinimumHeight( 100 ); - connect( m_pLinkedObjects, TQT_SIGNAL( highlighted( TQListBoxItem* ) ), - TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) ); + connect( m_pLinkedObjects, TQ_SIGNAL( highlighted( TQListBoxItem* ) ), + TQ_SLOT( slotItemSelected( TQListBoxItem* ) ) ); topLayout( )->addWidget( m_pLinkedObjects, 1 ); TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pSelectButton = new TQPushButton( i18n( "Select..." ), this ); m_pSelectButton->setEnabled( false ); - connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelect( ) ) ); + connect( m_pSelectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSelect( ) ) ); layout->addStretch( ); layout->addWidget( m_pSelectButton ); diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp index c2c1fdeb..01737f62 100644 --- a/kpovmodeler/pmdetailobjectedit.cpp +++ b/kpovmodeler/pmdetailobjectedit.cpp @@ -48,8 +48,8 @@ void PMDetailObjectEdit::createTopWidgets( ) layout->addWidget( m_pLocalDetailLevel ); layout->addStretch( ); - connect( m_pGlobalDetail, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotGlobalDetailClicked( ) ) ); - connect( m_pLocalDetailLevel, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pGlobalDetail, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotGlobalDetailClicked( ) ) ); + connect( m_pLocalDetailLevel, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMDetailObjectEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp index b958652c..75a95e82 100644 --- a/kpovmodeler/pmdialogeditbase.cpp +++ b/kpovmodeler/pmdialogeditbase.cpp @@ -178,28 +178,28 @@ void PMDialogEditBase::displayObject( PMObject* o ) vl->addWidget( m_pRenderFrame ); m_pRenderWidget = new PMPovrayRenderWidget( m_pRenderFrame ); - connect( m_pRenderWidget, TQT_SIGNAL( finished( int ) ), - TQT_SLOT( slotPreviewFinished( int ) ) ); + connect( m_pRenderWidget, TQ_SIGNAL( finished( int ) ), + TQ_SLOT( slotPreviewFinished( int ) ) ); m_pPreviewLocalBox = new TQCheckBox( i18n( "local" ), m_pTexturePreviewWidget ); m_pPreviewLocalBox->setChecked( s_previewLocal ); - connect( m_pPreviewLocalBox, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotPreviewLocal( bool ) ) ); + connect( m_pPreviewLocalBox, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotPreviewLocal( bool ) ) ); vl->addWidget( m_pPreviewLocalBox ); TQHBoxLayout* hl = new TQHBoxLayout( vl ); m_pPreviewButton = new TQPushButton( i18n( "&Preview" ), m_pTexturePreviewWidget ); hl->addWidget( m_pPreviewButton ); - connect( m_pPreviewButton, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotTexturePreview( ) ) ); + connect( m_pPreviewButton, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotTexturePreview( ) ) ); m_pOutputButton = new TQPushButton( i18n( "Povray Output" ), m_pTexturePreviewWidget ); hl->addWidget( m_pOutputButton ); - connect( m_pOutputButton, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotPovrayOutput( ) ) ); + connect( m_pOutputButton, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotPovrayOutput( ) ) ); hl->addStretch( 1 ); m_pOutputWidget = new PMPovrayOutputWidget( ); - connect( m_pRenderWidget, TQT_SIGNAL( povrayMessage( const TQString& ) ), - m_pOutputWidget, TQT_SLOT( slotText( const TQString& ) ) ); + connect( m_pRenderWidget, TQ_SIGNAL( povrayMessage( const TQString& ) ), + m_pOutputWidget, TQ_SLOT( slotText( const TQString& ) ) ); } m_pTexturePreviewWidget->show( ); diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index 12ade91e..88a5c603 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -136,31 +136,31 @@ PMDialogView::PMDialogView( PMPart* part, TQWidget* parent, const char* name ) TQHBoxLayout* buttonLayout = new TQHBoxLayout( m_pLayout ); m_pHelpButton = new KPushButton( KStdGuiItem::help(), this ); buttonLayout->addWidget( m_pHelpButton ); - connect( m_pHelpButton, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotHelp( ) ) ); + connect( m_pHelpButton, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotHelp( ) ) ); m_pHelpButton->setEnabled( false ); m_pApplyButton = new KPushButton( KStdGuiItem::apply(), this ); buttonLayout->addWidget( m_pApplyButton ); - connect( m_pApplyButton, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotApply( ) ) ); + connect( m_pApplyButton, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotApply( ) ) ); m_pApplyButton->setEnabled( false ); buttonLayout->addStretch( ); m_pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); buttonLayout->addWidget( m_pCancelButton ); - connect( m_pCancelButton, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotCancel( ) ) ); + connect( m_pCancelButton, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotCancel( ) ) ); m_pCancelButton->setEnabled( false ); m_pLayout->activate( ); - connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) ); - connect( part, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); - connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) ); - connect( part, TQT_SIGNAL( aboutToRender( ) ), TQT_SLOT( slotAboutToRender( ) ) ); - connect( part, TQT_SIGNAL( aboutToSave( ) ), TQT_SLOT( slotAboutToRender( ) ) ); - connect( this, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - part, TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) ); + connect( part, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( part, TQ_SIGNAL( clear( ) ), TQ_SLOT( slotClear( ) ) ); + connect( part, TQ_SIGNAL( aboutToRender( ) ), TQ_SLOT( slotAboutToRender( ) ) ); + connect( part, TQ_SIGNAL( aboutToSave( ) ), TQ_SLOT( slotAboutToRender( ) ) ); + connect( this, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + part, TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); displayObject( m_pPart->activeObject( ) ); } @@ -371,15 +371,15 @@ void PMDialogView::displayObject( PMObject* obj, bool updateDescription ) if( m_pDisplayedWidget ) { - connect( m_pDisplayedWidget, TQT_SIGNAL( dataChanged( ) ), - this, TQT_SLOT( slotDataChanged( ) ) ); - connect( m_pDisplayedWidget, TQT_SIGNAL( sizeChanged( ) ), - this, TQT_SLOT( slotSizeChanged( ) ) ); - connect( m_pDisplayedWidget, TQT_SIGNAL( aboutToRender( ) ), - this, TQT_SLOT( slotAboutToRender( ) ) ); + connect( m_pDisplayedWidget, TQ_SIGNAL( dataChanged( ) ), + this, TQ_SLOT( slotDataChanged( ) ) ); + connect( m_pDisplayedWidget, TQ_SIGNAL( sizeChanged( ) ), + this, TQ_SLOT( slotSizeChanged( ) ) ); + connect( m_pDisplayedWidget, TQ_SIGNAL( aboutToRender( ) ), + this, TQ_SLOT( slotAboutToRender( ) ) ); connect( m_pDisplayedWidget, - TQT_SIGNAL( controlPointSelectionChanged( ) ), - TQT_SLOT( slotControlPointSelectionChanged( ) ) ); + TQ_SIGNAL( controlPointSelectionChanged( ) ), + TQ_SLOT( slotControlPointSelectionChanged( ) ) ); } } diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp index b41d8106..7f441477 100644 --- a/kpovmodeler/pmdiscedit.cpp +++ b/kpovmodeler/pmdiscedit.cpp @@ -66,11 +66,11 @@ void PMDiscEdit::createTopWidgets( ) layout->addWidget( nb ); layout->addStretch( 1 ); - connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pHRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( nb, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNormalize( ) ) ); + connect( m_pCenter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNormal, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pHRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( nb, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNormalize( ) ) ); } void PMDiscEdit::slotNormalize( ) diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index b6b77653..2f93ffbe 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -171,10 +171,10 @@ void PMDockMainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if( !d->m_bShellGUIActivated ) @@ -187,10 +187,10 @@ void PMDockMainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); @@ -359,24 +359,24 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) closeButton->setPixmap( const_cast< const char** >(close_xpm) ); int buttonWidth = 9, buttonHeight = 9; closeButton->setFixedSize(buttonWidth,buttonHeight); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked())); // MODIFICATION (zehender) // The shell will delete the widget // undock is unnecessary - // connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); + // connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock())); stayButton = new PMDockButton_Private( this, "DockStayButton" ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(buttonWidth,buttonHeight); - connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked())); + connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked())); stayButton->hide( ); dockbackButton = new PMDockButton_Private( this, "DockbackButton" ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(buttonWidth,buttonHeight); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack())); // MODIFICATION (zehender) // Add a button to undock the widget and dock it as top level @@ -384,7 +384,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) toDesktopButton = new PMDockButton_Private( this, "ToDesktopButton" ); toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); toDesktopButton->setFixedSize(buttonWidth,buttonHeight); - connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); + connect( toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop())); layout->addWidget( drag ); layout->addWidget( dockbackButton ); @@ -509,7 +509,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const setIcon( pixmap); widget = 0L; - TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); + TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) ); applyToWidget( parent, TQPoint(0,0) ); } @@ -837,8 +837,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP if( target->formerBrotherDockWidget != 0L) { newDock->formerBrotherDockWidget = target->formerBrotherDockWidget; if( formerBrotherDockWidget != 0L) - TQObject::connect( newDock->formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - newDock, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( newDock->formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + newDock, TQ_SLOT(loseFormerBrotherDockWidget()) ); target->loseFormerBrotherDockWidget(); } newDock->formerDockPos = target->formerDockPos; @@ -846,7 +846,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP if ( dockPos == PMDockWidget::DockCenter ) { PMDockTabGroup* tab = new PMDockTabGroup( newDock, "_dock_tab"); - TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*))); + TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*))); newDock->setWidget( tab ); target->applyToWidget( tab ); @@ -969,8 +969,8 @@ void PMDockWidget::undock() d->index = parentTab->indexOf( this); // memorize the page position in the tab widget parentTab->removePage( this ); formerBrotherDockWidget = (PMDockWidget*)parentTab->page(0); - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); applyToWidget( 0L ); if ( parentTab->count() == 1 ){ @@ -1034,8 +1034,8 @@ void PMDockWidget::undock() group->hide(); if( formerBrotherDockWidget != 0L) - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); if ( !group->parentWidget() ){ secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() ); @@ -1165,8 +1165,8 @@ void PMDockWidget::makeDockVisible() void PMDockWidget::loseFormerBrotherDockWidget() { if( formerBrotherDockWidget != 0L) - TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; repaint(); } @@ -1276,8 +1276,8 @@ PMDockManager::PMDockManager( TQWidget* mainWindow , const char* name ) menu = new TQPopupMenu(); #endif - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) ); - connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) ); + connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) ); childDock = new TQObjectList(); childDock->setAutoDelete( false ); diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp index 6a60510f..9b80138e 100644 --- a/kpovmodeler/pmfinishedit.cpp +++ b/kpovmodeler/pmfinishedit.cpp @@ -154,41 +154,41 @@ void PMFinishEdit::createTopWidgets( ) layout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 ); - connect( m_pAmbientColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDiffuseEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pBrillianceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCrandEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pConserveEnergyEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPhongEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPhongSizeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMetallicEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSpecularEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRoughnessEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pIridAmountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pIridThicknessEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pIridTurbulenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pIridEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotIridClicked( ) ) ); - connect( m_pReflectionColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pReflectionMinColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pReflectionFresnelEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pReflectionFalloffEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pReflectionExponentEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pReflectionMetallicEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pAmbientColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDiffuseEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pBrillianceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCrandEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pConserveEnergyEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPhongEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPhongSizeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMetallicEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSpecularEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRoughnessEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pIridAmountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pIridThicknessEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pIridTurbulenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pIridEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotIridClicked( ) ) ); + connect( m_pReflectionColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pReflectionMinColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pReflectionFresnelEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pReflectionFalloffEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pReflectionExponentEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pReflectionMetallicEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableAmbientEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAmbientClicked( ) ) ); - connect( m_pEnablePhongEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPhongClicked( ) ) ); - connect( m_pEnablePhongSizeEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPhongSizeClicked( ) ) ); - connect( m_pEnableDiffuseEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDiffuseClicked( ) ) ); - connect( m_pEnableBrillianceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBrillianceClicked( ) ) ); - connect( m_pEnableCrandEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCrandClicked( ) ) ); - connect( m_pEnableSpecularEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSpecularClicked( ) ) ); - connect( m_pEnableRoughnessEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRoughnessClicked( ) ) ); - connect( m_pEnableMetallicEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotMetallicClicked( ) ) ); - connect( m_pEnableReflectionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotReflectionClicked( ) ) ); - connect( m_pEnableReflectionMinEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotReflectionMinClicked( ) ) ); - connect( m_pEnableRefFalloffEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRefFalloffClicked( ) ) ); - connect( m_pEnableRefExponentEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRefExponentClicked( ) ) ); - connect( m_pEnableRefMetallicEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRefMetallicClicked( ) ) ); + connect( m_pEnableAmbientEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAmbientClicked( ) ) ); + connect( m_pEnablePhongEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPhongClicked( ) ) ); + connect( m_pEnablePhongSizeEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPhongSizeClicked( ) ) ); + connect( m_pEnableDiffuseEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDiffuseClicked( ) ) ); + connect( m_pEnableBrillianceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotBrillianceClicked( ) ) ); + connect( m_pEnableCrandEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCrandClicked( ) ) ); + connect( m_pEnableSpecularEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSpecularClicked( ) ) ); + connect( m_pEnableRoughnessEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRoughnessClicked( ) ) ); + connect( m_pEnableMetallicEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotMetallicClicked( ) ) ); + connect( m_pEnableReflectionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotReflectionClicked( ) ) ); + connect( m_pEnableReflectionMinEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotReflectionMinClicked( ) ) ); + connect( m_pEnableRefFalloffEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRefFalloffClicked( ) ) ); + connect( m_pEnableRefExponentEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRefExponentClicked( ) ) ); + connect( m_pEnableRefMetallicEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRefMetallicClicked( ) ) ); } void PMFinishEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp index f6c15c1f..51db5cb4 100644 --- a/kpovmodeler/pmfogedit.cpp +++ b/kpovmodeler/pmfogedit.cpp @@ -118,18 +118,18 @@ void PMFogEdit::createTopWidgets( ) hl->addWidget( m_pUpLabel ); hl->addWidget( m_pUp ); - connect( m_pFogTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotFogTypeChanged( int ) ) ); - connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pColor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pTurbulenceCheck, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTurbulenceClicked( ) ) ); - connect( m_pTurbulenceVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOctaves, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOmega, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLambda, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDepth, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFogOffset, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFogAlt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pUp, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pFogTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotFogTypeChanged( int ) ) ); + connect( m_pDistance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pColor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pTurbulenceCheck, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTurbulenceClicked( ) ) ); + connect( m_pTurbulenceVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOctaves, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOmega, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLambda, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDepth, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFogOffset, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFogAlt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pUp, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMFogEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp index a65c9def..b8922fc9 100644 --- a/kpovmodeler/pmglobalphotonsedit.cpp +++ b/kpovmodeler/pmglobalphotonsedit.cpp @@ -158,28 +158,28 @@ void PMGlobalPhotonsEdit::createTopWidgets( ) m_pRadiusMediaMulti->setValidation( true, 0, false, 0 ); gl->addWidget( m_pRadiusMediaMulti, 2, 4 ); - connect( m_pNumberType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotNumberTypeActivated( int ) ) ); - connect( m_pSpacing, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCount, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pGatherMin, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pGatherMax, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMediaMaxSteps, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMediaFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pJitter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxTraceLevelGlobal, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotMaxTraceLevelGlobalClicked( ) ) ); - connect( m_pMaxTraceLevel, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAdcBailoutGlobal, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotAdcBailoutGlobalClicked( ) ) ); - connect( m_pAdcBailout, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAutostop, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pExpandIncrease, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); - connect( m_pExpandMin, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); - connect( m_pRadiusGather, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); - connect( m_pRadiusGatherMulti, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); - connect( m_pRadiusMedia, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); - connect( m_pRadiusMediaMulti, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); + connect( m_pNumberType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotNumberTypeActivated( int ) ) ); + connect( m_pSpacing, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCount, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pGatherMin, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pGatherMax, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMediaMaxSteps, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMediaFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pJitter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxTraceLevelGlobal, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotMaxTraceLevelGlobalClicked( ) ) ); + connect( m_pMaxTraceLevel, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAdcBailoutGlobal, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotAdcBailoutGlobalClicked( ) ) ); + connect( m_pAdcBailout, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAutostop, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pExpandIncrease, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); + connect( m_pExpandMin, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); + connect( m_pRadiusGather, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); + connect( m_pRadiusGatherMulti, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); + connect( m_pRadiusMedia, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); + connect( m_pRadiusMediaMulti, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); } void PMGlobalPhotonsEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp index d2c7779c..bb42dc03 100644 --- a/kpovmodeler/pmglobalsettingsedit.cpp +++ b/kpovmodeler/pmglobalsettingsedit.cpp @@ -142,25 +142,25 @@ void PMGlobalSettingsEdit::createTopWidgets( ) topLayout( )->addWidget( m_pRadiosityWidget ); - connect( m_pAdcBailoutEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAmbientLightEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAssumedGammaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pHfGray16Edit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pIridWaveLengthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxIntersectionsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxTraceLevelEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNumberWavesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNoiseGeneratorEdit, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadiosityEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRadiosityClicked( ) ) ); - connect( m_pBrightnessEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDistanceMaximumEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pErrorBoundEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pGrayThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLowErrorFactorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMinimumReuseEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNearestCountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRecursionLimitEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pAdcBailoutEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAmbientLightEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAssumedGammaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pHfGray16Edit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pIridWaveLengthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxIntersectionsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxTraceLevelEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNumberWavesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNoiseGeneratorEdit, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadiosityEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRadiosityClicked( ) ) ); + connect( m_pBrightnessEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDistanceMaximumEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pErrorBoundEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pGrayThresholdEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLowErrorFactorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMinimumReuseEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNearestCountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRecursionLimitEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMGlobalSettingsEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index e9da1a96..23e170da 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -150,33 +150,33 @@ PMGLView::PMGLView( PMPart* part, PMViewType t, setMinimumSize( 50, 50 ); - connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) ); - connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) ); - - connect( this, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - part, TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); - connect( part, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); - - connect( part, TQT_SIGNAL( activeRenderModeChanged( ) ), - TQT_SLOT( slotActiveRenderModeChanged( ) ) ); - - connect( &m_startTimer, TQT_SIGNAL( timeout( ) ), - TQT_SLOT( slotMouseChangeTimer( ) ) ); - connect( &m_autoScrollTimer, TQT_SIGNAL( timeout( ) ), - TQT_SLOT( slotAutoScroll( ) ) ); - - connect( rm, TQT_SIGNAL( renderingStarted( PMGLView* ) ), - TQT_SLOT( slotRenderingStarted( PMGLView* ) ) ); - connect( rm, TQT_SIGNAL( aboutToUpdate( PMGLView* ) ), - TQT_SLOT( slotAboutToUpdate( PMGLView* ) ) ); - connect( rm, TQT_SIGNAL( renderingFinished( PMGLView* ) ), - TQT_SLOT( slotRenderingFinished( PMGLView* ) ) ); - connect( rm, TQT_SIGNAL( renderingSettingsChanged( ) ), - TQT_SLOT( slotRefresh( ) ) ); - - connect( this, TQT_SIGNAL( controlPointMessage( const TQString& ) ), - m_pPart, TQT_SIGNAL( controlPointMessage( const TQString& ) ) ); + connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) ); + connect( part, TQ_SIGNAL( clear( ) ), TQ_SLOT( slotClear( ) ) ); + + connect( this, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + part, TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( part, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + + connect( part, TQ_SIGNAL( activeRenderModeChanged( ) ), + TQ_SLOT( slotActiveRenderModeChanged( ) ) ); + + connect( &m_startTimer, TQ_SIGNAL( timeout( ) ), + TQ_SLOT( slotMouseChangeTimer( ) ) ); + connect( &m_autoScrollTimer, TQ_SIGNAL( timeout( ) ), + TQ_SLOT( slotAutoScroll( ) ) ); + + connect( rm, TQ_SIGNAL( renderingStarted( PMGLView* ) ), + TQ_SLOT( slotRenderingStarted( PMGLView* ) ) ); + connect( rm, TQ_SIGNAL( aboutToUpdate( PMGLView* ) ), + TQ_SLOT( slotAboutToUpdate( PMGLView* ) ) ); + connect( rm, TQ_SIGNAL( renderingFinished( PMGLView* ) ), + TQ_SLOT( slotRenderingFinished( PMGLView* ) ) ); + connect( rm, TQ_SIGNAL( renderingSettingsChanged( ) ), + TQ_SLOT( slotRefresh( ) ) ); + + connect( this, TQ_SIGNAL( controlPointMessage( const TQString& ) ), + m_pPart, TQ_SIGNAL( controlPointMessage( const TQString& ) ) ); updateControlPoints( ); } @@ -1537,12 +1537,12 @@ void PMGLView::restoreConfig( TDEConfig* /*cfg*/ ) void PMGLView::contextMenu( ) { TQPopupMenu* m = new TQPopupMenu( ); - m->insertItem( i18n( "Left View" ), this, TQT_SLOT( slotSetTypePosX( ) ) ); - m->insertItem( i18n( "Right View" ), this, TQT_SLOT( slotSetTypeNegX( ) ) ); - m->insertItem( i18n( "Top View" ), this, TQT_SLOT( slotSetTypeNegY( ) ) ); - m->insertItem( i18n( "Bottom View" ), this, TQT_SLOT( slotSetTypePosY( ) ) ); - m->insertItem( i18n( "Front View" ), this, TQT_SLOT( slotSetTypePosZ( ) ) ); - m->insertItem( i18n( "Back View" ), this, TQT_SLOT( slotSetTypeNegZ( ) ) ); + m->insertItem( i18n( "Left View" ), this, TQ_SLOT( slotSetTypePosX( ) ) ); + m->insertItem( i18n( "Right View" ), this, TQ_SLOT( slotSetTypeNegX( ) ) ); + m->insertItem( i18n( "Top View" ), this, TQ_SLOT( slotSetTypeNegY( ) ) ); + m->insertItem( i18n( "Bottom View" ), this, TQ_SLOT( slotSetTypePosY( ) ) ); + m->insertItem( i18n( "Front View" ), this, TQ_SLOT( slotSetTypePosZ( ) ) ); + m->insertItem( i18n( "Back View" ), this, TQ_SLOT( slotSetTypeNegZ( ) ) ); TQPopupMenu* cm = new TQPopupMenu( m ); TQPtrListIterator<PMCamera> it = m_pPart->cameras( ); @@ -1560,13 +1560,13 @@ void PMGLView::contextMenu( ) cm->insertItem( name, cnr ); } } - connect( cm, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotCameraView( int ) ) ); + connect( cm, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotCameraView( int ) ) ); m->insertItem( SmallIconSet( "pmcamera" ), i18n( "Camera" ), cm ); m->insertSeparator( ); - m->insertItem( i18n( "Snap to Grid" ), this, TQT_SLOT( slotSnapToGrid( ) ) ); + m->insertItem( i18n( "Snap to Grid" ), this, TQ_SLOT( slotSnapToGrid( ) ) ); m_objectActions.clear( ); if( m_pActiveObject ) { @@ -1583,7 +1583,7 @@ void PMGLView::contextMenu( ) } } } - connect( m, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotObjectAction( int ) ) ); + connect( m, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotObjectAction( int ) ) ); m->insertSeparator( ); @@ -1598,7 +1598,7 @@ void PMGLView::contextMenu( ) for( ; pit.current( ); ++pit, ++cnr ) menu->insertItem( pit.current( )->description( ), cnr ); } - connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotControlPoint( int ) ) ); + connect( menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotControlPoint( int ) ) ); m->insertItem( i18n( "Control Points" ), menu ); @@ -1816,8 +1816,8 @@ PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* parent, break; } - connect( m_pGLViewType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotGLViewTypeChanged( int ) ) ); + connect( m_pGLViewType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotGLViewTypeChanged( int ) ) ); hl->addWidget( m_pGLViewType ); } diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp index 0db70b77..b0ab7e55 100644 --- a/kpovmodeler/pmgraphicalobjectedit.cpp +++ b/kpovmodeler/pmgraphicalobjectedit.cpp @@ -59,15 +59,15 @@ void PMGraphicalObjectEdit::createBottomWidgets( ) hl->addWidget( m_pRelativeVisibility ); hl->addStretch( 1 ); - connect( m_pNoShadowButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNoImageButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNoReflectionButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDoubleIlluminateButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRelativeVisibility, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotRelativeChanged( ) ) ); - connect( m_pVisibilityLevel, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( slotLevelChanged( int ) ) ); - connect( m_pExport, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pNoShadowButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNoImageButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNoReflectionButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDoubleIlluminateButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRelativeVisibility, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotRelativeChanged( ) ) ); + connect( m_pVisibilityLevel, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( slotLevelChanged( int ) ) ); + connect( m_pExport, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); Base::createBottomWidgets( ); diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp index e51f4881..fcdf0309 100644 --- a/kpovmodeler/pmheightfieldedit.cpp +++ b/kpovmodeler/pmheightfieldedit.cpp @@ -75,15 +75,15 @@ void PMHeightFieldEdit::createTopWidgets( ) m_pSmooth = new TQCheckBox( i18n( "Smooth" ), this ); topLayout( )->addWidget( m_pSmooth ); - connect( m_pHeightFieldType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotTypeChanged( int ) ) ); - connect( m_pFileName, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotFileNameChanged( const TQString& ) ) ); - connect( m_pChooseFileName, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotFileNameClicked( ) ) ); - connect( m_pWaterLevel, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSmooth, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pHeightFieldType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotTypeChanged( int ) ) ); + connect( m_pFileName, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotFileNameChanged( const TQString& ) ) ); + connect( m_pChooseFileName, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotFileNameClicked( ) ) ); + connect( m_pWaterLevel, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pHierarchy, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSmooth, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMHeightFieldEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp index 53010095..4d9debf0 100644 --- a/kpovmodeler/pmimagemapedit.cpp +++ b/kpovmodeler/pmimagemapedit.cpp @@ -111,16 +111,16 @@ void PMImageMapEdit::createTopWidgets( ) hl->addWidget( lbl ); hl->addWidget( m_pMapTypeEdit ); - connect( m_pImageFileTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotImageFileTypeChanged( int ) ) ); - connect( m_pMapTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMapTypeChanged( int ) ) ); - connect( m_pInterpolateTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotInterpolateTypeChanged( int ) ) ); - connect( m_pImageFileNameBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImageFileBrowseClicked( ) ) ); - connect( m_pImageFileNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotImageFileNameChanged( const TQString& ) ) ); - connect( m_pEnableFilterAllEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFilterAllClicked( ) ) ); - connect( m_pEnableTransmitAllEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTransmitAllClicked( ) ) ); - connect( m_pFilterAllEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pTransmitAllEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOnceEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pImageFileTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotImageFileTypeChanged( int ) ) ); + connect( m_pMapTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMapTypeChanged( int ) ) ); + connect( m_pInterpolateTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotInterpolateTypeChanged( int ) ) ); + connect( m_pImageFileNameBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImageFileBrowseClicked( ) ) ); + connect( m_pImageFileNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotImageFileNameChanged( const TQString& ) ) ); + connect( m_pEnableFilterAllEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFilterAllClicked( ) ) ); + connect( m_pEnableTransmitAllEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTransmitAllClicked( ) ) ); + connect( m_pFilterAllEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pTransmitAllEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOnceEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMImageMapEdit::createBottomWidgets( ) @@ -265,7 +265,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f button = new TQPushButton( m_pFiltersWidget ); button->setPixmap( addButtonPixmap ); m_filterAddButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddFilterEntry( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddFilterEntry( ) ) ); gl->addWidget( button, 0, 1 ); button->show( ); button->setEnabled( !readOnly ); @@ -275,7 +275,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f { edit = new PMPaletteValueEdit( m_pFiltersWidget ); m_filterEntries.append( edit ); - connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); gl->addWidget( edit, i+1, 0 ); edit->setIndex( filters[ i ].index( ) ); edit->setValue( filters[ i ].value( ) ); @@ -285,7 +285,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f button = new TQPushButton( m_pFiltersWidget ); button->setPixmap( addButtonPixmap ); m_filterAddButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddFilterEntry( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddFilterEntry( ) ) ); gl->addWidget( button, i+1, 1 ); button->show( ); button->setEnabled( !readOnly ); @@ -294,7 +294,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f button = new TQPushButton( m_pFiltersWidget ); button->setPixmap( removeButtonPixmap ); m_filterRemoveButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveFilterEntry( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveFilterEntry( ) ) ); gl->addWidget( button, i+1, 2 ); button->show( ); button->setEnabled( !readOnly ); @@ -321,7 +321,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f button = new TQPushButton( m_pTransmitsWidget ); button->setPixmap( addButtonPixmap ); m_transmitAddButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddTransmitEntry( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddTransmitEntry( ) ) ); gl->addWidget( button, 0, 1 ); button->show( ); button->setEnabled( !readOnly ); @@ -331,7 +331,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f { edit = new PMPaletteValueEdit( m_pTransmitsWidget ); m_transmitEntries.append( edit ); - connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); gl->addWidget( edit, i+1, 0 ); edit->setIndex( transmits[ i ].index( ) ); edit->setValue( transmits[ i ].value( ) ); @@ -341,7 +341,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f button = new TQPushButton( m_pTransmitsWidget ); button->setPixmap( addButtonPixmap ); m_transmitAddButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddTransmitEntry( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddTransmitEntry( ) ) ); gl->addWidget( button, i+1, 1 ); button->show( ); button->setEnabled( !readOnly ); @@ -350,7 +350,7 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f button = new TQPushButton( m_pTransmitsWidget ); button->setPixmap( removeButtonPixmap ); m_transmitRemoveButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveTransmitEntry( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveTransmitEntry( ) ) ); gl->addWidget( button, i+1, 2 ); button->show( ); button->setEnabled( !readOnly ); diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp index c4c792d1..a2c99a0a 100644 --- a/kpovmodeler/pminterioredit.cpp +++ b/kpovmodeler/pminterioredit.cpp @@ -67,18 +67,18 @@ void PMInteriorEdit::createTopWidgets( ) layout->addWidget( m_pFadePowerEdit, 5, 1 ); hl->addStretch( 1 ); - connect( m_pIorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCausticsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDispersionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDispSamplesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL ( dataChanged( ) ) ); - connect( m_pFadeDistanceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFadePowerEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableIorEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotIorClicked( ) ) ); - connect( m_pEnableCausticsEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCausticsClicked( ) ) ); - connect( m_pEnableDispersionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDispersionClicked( ) ) ); - connect( m_pEnableDispSamplesEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDispSamplesClicked( ) ) ); - connect( m_pEnableFadeDistanceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFadeDistanceClicked( ) ) ); - connect( m_pEnableFadePowerEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFadePowerClicked( ) ) ); + connect( m_pIorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCausticsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDispersionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDispSamplesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL ( dataChanged( ) ) ); + connect( m_pFadeDistanceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFadePowerEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableIorEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotIorClicked( ) ) ); + connect( m_pEnableCausticsEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCausticsClicked( ) ) ); + connect( m_pEnableDispersionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDispersionClicked( ) ) ); + connect( m_pEnableDispSamplesEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDispSamplesClicked( ) ) ); + connect( m_pEnableFadeDistanceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFadeDistanceClicked( ) ) ); + connect( m_pEnableFadePowerEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFadePowerClicked( ) ) ); } void PMInteriorEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp index 60c501ea..14acdacf 100644 --- a/kpovmodeler/pmisosurfaceedit.cpp +++ b/kpovmodeler/pmisosurfaceedit.cpp @@ -106,25 +106,25 @@ void PMIsoSurfaceEdit::createTopWidgets( ) topLayout( )->addWidget( m_pAllIntersections ); topLayout( )->addWidget( m_pOpen ); - connect( m_pFunction, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( m_pContainedBy, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( currentChanged( int ) ) ); - connect( m_pCorner1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCorner2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pThreshold, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAccuracy, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxGradient, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEvaluate, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( evaluateToggled( bool ) ) ); - connect( m_pMaxTrace, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pFunction, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( m_pContainedBy, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( currentChanged( int ) ) ); + connect( m_pCorner1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCorner2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCenter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pThreshold, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAccuracy, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxGradient, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEvaluate, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( evaluateToggled( bool ) ) ); + connect( m_pMaxTrace, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); for( i = 0; i < 3; i++ ) - connect( m_pEvaluateValue[i], TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOpen, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggled( bool ) ) ); - connect( m_pAllIntersections, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( allToggled( bool ) ) ); + connect( m_pEvaluateValue[i], TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOpen, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggled( bool ) ) ); + connect( m_pAllIntersections, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( allToggled( bool ) ) ); } void PMIsoSurfaceEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp index 373bbf0c..d6079d33 100644 --- a/kpovmodeler/pmjuliafractaledit.cpp +++ b/kpovmodeler/pmjuliafractaledit.cpp @@ -105,16 +105,16 @@ void PMJuliaFractalEdit::createTopWidgets( ) hl->addWidget( m_pSliceDistance ); hl->addStretch( 1 ); - connect( m_pJuliaParameter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAlgebraType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotAlgebraTypeSelected( int ) ) ); - connect( m_pFunctionType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotFunctionTypeSelected( int ) ) ); - connect( m_pExponents, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxIterations, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPrecision, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSliceNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSliceDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pJuliaParameter, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAlgebraType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotAlgebraTypeSelected( int ) ) ); + connect( m_pFunctionType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotFunctionTypeSelected( int ) ) ); + connect( m_pExponents, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxIterations, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPrecision, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSliceNormal, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSliceDistance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMJuliaFractalEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp index 1e1879f1..ed58d98d 100644 --- a/kpovmodeler/pmlatheedit.cpp +++ b/kpovmodeler/pmlatheedit.cpp @@ -53,8 +53,8 @@ void PMLatheEdit::createTopWidgets( ) hl->addWidget( m_pSplineType ); hl->addStretch( 1 ); - connect( m_pSplineType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_pSplineType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotTypeChanged( int ) ) ); } void PMLatheEdit::createBottomWidgets( ) @@ -62,9 +62,9 @@ void PMLatheEdit::createBottomWidgets( ) topLayout( )->addWidget( new TQLabel( i18n( "Spline points:" ), this ) ); m_pPoints = new PMVectorListEdit( "u", "v", this ); - connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ), - TQT_SLOT( slotSelectionChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ), + TQ_SLOT( slotSelectionChanged( ) ) ); TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) ); hl->addWidget( m_pPoints, 2 ); @@ -74,9 +74,9 @@ void PMLatheEdit::createBottomWidgets( ) m_pAddBelow->setPixmap( SmallIcon( "pmaddpoint" ) ); m_pRemove = new TQPushButton( this ); m_pRemove->setPixmap( SmallIcon( "pmremovepoint" ) ); - connect( m_pAddAbove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) ); - connect( m_pAddBelow, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) ); - connect( m_pRemove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) ); + connect( m_pAddAbove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) ); + connect( m_pAddBelow, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) ); + connect( m_pRemove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) ); TQVBoxLayout* bl = new TQVBoxLayout( hl ); bl->addWidget( m_pAddAbove ); @@ -86,7 +86,7 @@ void PMLatheEdit::createBottomWidgets( ) m_pSturm = new TQCheckBox( i18n( "Sturm" ), this ); topLayout( )->addWidget( m_pSturm ); - connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); Base::createBottomWidgets( ); } diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp index 5e719ac9..d9ce8068 100644 --- a/kpovmodeler/pmlayoutsettings.cpp +++ b/kpovmodeler/pmlayoutsettings.cpp @@ -58,14 +58,14 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) grid = new TQGridLayout( gvl, 3, 2 ); m_pViewLayouts = new TQListBox( gb ); - connect( m_pViewLayouts, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotLayoutSelected( int ) ) ); + connect( m_pViewLayouts, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotLayoutSelected( int ) ) ); grid->addMultiCellWidget( m_pViewLayouts, 0, 2, 0, 0 ); m_pAddLayout = new TQPushButton( i18n( "Add" ), gb ); - connect( m_pAddLayout, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddLayout( ) ) ); + connect( m_pAddLayout, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddLayout( ) ) ); grid->addWidget( m_pAddLayout, 0, 1 ); m_pRemoveLayout = new TQPushButton( i18n( "Remove" ), gb ); - connect( m_pRemoveLayout, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveLayout( ) ) ); + connect( m_pRemoveLayout, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveLayout( ) ) ); grid->addWidget( m_pRemoveLayout, 1, 1 ); grid->setRowStretch( 2, 1 ); @@ -76,8 +76,8 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) ghe = new TQHBoxLayout( gvle ); ghe->addWidget( new TQLabel( i18n( "Name:" ), gbe ) ); m_pViewLayoutName = new TQLineEdit( gbe ); - connect( m_pViewLayoutName, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLayoutNameChanged( const TQString& ) ) ); + connect( m_pViewLayoutName, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLayoutNameChanged( const TQString& ) ) ); ghe->addWidget( m_pViewLayoutName ); grid = new TQGridLayout( gvle, 4, 2 ); m_pViewEntries = new TQListView( gbe ); @@ -87,21 +87,21 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) m_pViewEntries->addColumn( i18n( "Position" ) ); m_pViewEntries->setSorting( -1 ); m_pViewEntries->setMaximumHeight( 150 ); - connect( m_pViewEntries, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotViewEntrySelected( TQListViewItem* ) ) ); + connect( m_pViewEntries, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotViewEntrySelected( TQListViewItem* ) ) ); grid->addMultiCellWidget( m_pViewEntries, 0, 3, 0, 0 ); m_pAddEntry = new TQPushButton( i18n( "Add" ), gbe ); - connect( m_pAddEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddViewEntryClicked( ) ) ); + connect( m_pAddEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddViewEntryClicked( ) ) ); grid->addWidget( m_pAddEntry, 0, 1 ); m_pRemoveEntry = new TQPushButton( i18n( "Remove" ), gbe ); - connect( m_pRemoveEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveViewEntryClicked( ) ) ); + connect( m_pRemoveEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveViewEntryClicked( ) ) ); grid->addWidget( m_pRemoveEntry, 1, 1 ); /* //TODO m_pMoveUpEntry = new TQPushButton( i18n( "Move Up" ), gbe ); - connect( m_pMoveUpEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotMoveUpViewEntryClicked( ) ) ); + connect( m_pMoveUpEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotMoveUpViewEntryClicked( ) ) ); grid->addWidget( m_pMoveUpEntry, 2, 1 ); m_pMoveDownEntry = new TQPushButton( i18n( "Move Down" ), gbe ); - connect( m_pMoveDownEntry, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotMoveDownViewEntryClicked( ) ) ); + connect( m_pMoveDownEntry, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotMoveDownViewEntryClicked( ) ) ); grid->addWidget( m_pMoveDownEntry, 3, 1 ); */ @@ -122,26 +122,26 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) for( ; *it; ++it ) m_pViewTypeEdit->insertItem( ( *it )->description( ) ); - connect( m_pViewTypeEdit, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotViewTypeChanged( int ) ) ); + connect( m_pViewTypeEdit, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotViewTypeChanged( int ) ) ); grid->addWidget( m_pViewTypeEdit, 0, 1 ); m_pDockPositionEdit = new TQComboBox( gbe ); m_pDockPositionEdit->insertItem( i18n( "New Column" ) ); m_pDockPositionEdit->insertItem( i18n( "Below" ) ); m_pDockPositionEdit->insertItem( i18n( "Tabbed" ) ); m_pDockPositionEdit->insertItem( i18n( "Floating" ) ); - connect( m_pDockPositionEdit, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotDockPositionChanged( int ) ) ); + connect( m_pDockPositionEdit, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotDockPositionChanged( int ) ) ); grid->addWidget( m_pDockPositionEdit, 2, 1 ); m_pColumnWidthEdit = new PMIntEdit( gbe ); - connect( m_pColumnWidthEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotColumnWidthChanged( const TQString& ) ) ); + connect( m_pColumnWidthEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotColumnWidthChanged( const TQString& ) ) ); grid->addWidget( m_pColumnWidthEdit, 3, 1 ); m_pViewHeightEdit = new PMIntEdit( gbe ); - connect( m_pViewHeightEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotViewHeightChanged( const TQString& ) ) ); + connect( m_pViewHeightEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotViewHeightChanged( const TQString& ) ) ); grid->addWidget( m_pViewHeightEdit, 4, 1 ); m_pFloatingWidthLabel = new TQLabel( i18n( "Width:" ), gbe ); @@ -154,17 +154,17 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) grid->addWidget( m_pFloatingPosYLabel, 6, 2 ); m_pFloatingWidth = new PMIntEdit( gbe ); - connect( m_pFloatingWidth, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotFloatingWidthChanged( const TQString& ) ) ); + connect( m_pFloatingWidth, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotFloatingWidthChanged( const TQString& ) ) ); m_pFloatingHeight = new PMIntEdit( gbe ); - connect( m_pFloatingHeight, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotFloatingHeightChanged( const TQString& ) ) ); + connect( m_pFloatingHeight, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotFloatingHeightChanged( const TQString& ) ) ); m_pFloatingPosX = new PMIntEdit( gbe ); - connect( m_pFloatingPosX, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotFloatingPosXChanged( const TQString& ) ) ); + connect( m_pFloatingPosX, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotFloatingPosXChanged( const TQString& ) ) ); m_pFloatingPosY = new PMIntEdit( gbe ); - connect( m_pFloatingPosY, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotFloatingPosYChanged( const TQString& ) ) ); + connect( m_pFloatingPosY, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotFloatingPosYChanged( const TQString& ) ) ); grid->addWidget( m_pFloatingWidth, 5, 1 ); grid->addWidget( m_pFloatingHeight, 5, 3 ); grid->addWidget( m_pFloatingPosX, 6, 1 ); @@ -741,8 +741,8 @@ void PMLayoutSettings::displayCustomOptions( ) ( *m_currentViewEntry ).customOptions( ) ); if( m_pCustomOptionsWidget ) { - connect( m_pCustomOptionsWidget, TQT_SIGNAL( viewTypeDescriptionChanged( ) ), - TQT_SLOT( slotViewTypeDescriptionChanged( ) ) ); + connect( m_pCustomOptionsWidget, TQ_SIGNAL( viewTypeDescriptionChanged( ) ), + TQ_SLOT( slotViewTypeDescriptionChanged( ) ) ); TQHBoxLayout* hl = new TQHBoxLayout( m_pCustomOptionsHolder, 0, KDialog::spacingHint( ) ); hl->addWidget( m_pCustomOptionsWidget ); diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp index 4df00a8d..15627940 100644 --- a/kpovmodeler/pmlibrarybrowser.cpp +++ b/kpovmodeler/pmlibrarybrowser.cpp @@ -98,17 +98,17 @@ PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* parent, const vl->addWidget( splitv, 99 ); // Connect all the objects - connect( m_pUpButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUpButtonClicked( ) ) ); - connect( m_pNewSubLibraryButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNewSubLibraryClicked( ) ) ); - connect( m_pNewObjectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNewObjectClicked( ) ) ); - connect( m_pDeleteObjectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDeleteClicked( ) ) ); - connect( m_pLibraryComboBox, TQT_SIGNAL( highlighted( const TQString& ) ), - TQT_SLOT( slotPathSelected( const TQString& ) ) ); - connect( m_pLibraryIconView, TQT_SIGNAL( selectionChanged( TQIconViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQIconViewItem* ) ) ); - connect( m_pLibraryIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - TQT_SLOT( slotSelectionExecuted( TQIconViewItem* ) ) ); - connect( m_pLibraryEntryPreview, TQT_SIGNAL( objectChanged( ) ), TQT_SLOT( slotIconViewRefresh( ) ) ); + connect( m_pUpButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUpButtonClicked( ) ) ); + connect( m_pNewSubLibraryButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNewSubLibraryClicked( ) ) ); + connect( m_pNewObjectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNewObjectClicked( ) ) ); + connect( m_pDeleteObjectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDeleteClicked( ) ) ); + connect( m_pLibraryComboBox, TQ_SIGNAL( highlighted( const TQString& ) ), + TQ_SLOT( slotPathSelected( const TQString& ) ) ); + connect( m_pLibraryIconView, TQ_SIGNAL( selectionChanged( TQIconViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQIconViewItem* ) ) ); + connect( m_pLibraryIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + TQ_SLOT( slotSelectionExecuted( TQIconViewItem* ) ) ); + connect( m_pLibraryEntryPreview, TQ_SIGNAL( objectChanged( ) ), TQ_SLOT( slotIconViewRefresh( ) ) ); // Set the selected library slotPathSelected( m_pLibraryComboBox->currentText( ) ); @@ -161,14 +161,14 @@ void PMLibraryBrowserViewWidget::slotSelectionChanged( TQIconViewItem* item ) if( sel->isSubLibrary( ) ) { if( m_pLibraryEntryPreview->saveIfNeeded( ) ) - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) ); else m_pLibraryEntryPreview->showPreview( sel->path( ), m_topLibraryReadOnly, true ); } else { if( m_pLibraryEntryPreview->saveIfNeeded( ) ) - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) ); else m_pLibraryEntryPreview->showPreview( sel->path( ), m_topLibraryReadOnly, false ); } @@ -184,14 +184,14 @@ void PMLibraryBrowserViewWidget::slotSelectionExecuted( TQIconViewItem* item ) // It's a sub library m_pFutureLibrary = new PMLibraryHandle( sel->path( ) ); m_pLibraryEntryPreview->clearPreview( ); - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewSetLibrary( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewSetLibrary( ) ) ); m_pUpButton->setEnabled( true ); } else { // It's an object if( m_pLibraryEntryPreview->saveIfNeeded( ) ) - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) ); else m_pLibraryEntryPreview->showPreview( sel->path( ), m_topLibraryReadOnly, false ); } @@ -206,7 +206,7 @@ void PMLibraryBrowserViewWidget::slotUpButtonClicked( ) m_pFutureLibrary = new PMLibraryHandle( pathManipulator.path( ) ); if( !m_pFutureLibrary->isSubLibrary( ) ) m_pUpButton->setEnabled( false ); - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewSetLibrary( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewSetLibrary( ) ) ); // Release the current Library delete m_pCurrentLibrary; @@ -228,7 +228,7 @@ void PMLibraryBrowserViewWidget::slotDeleteClicked( ) case PMLibraryHandle::Ok: { TDEIO::Job *job = TDEIO::del( sel->path() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); } break; case PMLibraryHandle::ReadOnlyLib: @@ -250,7 +250,7 @@ void PMLibraryBrowserViewWidget::slotNewObjectClicked( ) switch( m_pCurrentLibrary->createNewObject( ) ) { case PMLibraryHandle::Ok: - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) ); break; case PMLibraryHandle::ReadOnlyLib: KMessageBox::error( this, i18n( "This library is read only." ), i18n( "Error" ) ); @@ -293,7 +293,7 @@ void PMLibraryBrowserViewWidget::slotJobResult( TDEIO::Job * job ) { if( job->error( ) ) job->showErrorDialog( this ); - TQTimer::singleShot( 100, this, TQT_SLOT( slotIconViewRefresh( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotIconViewRefresh( ) ) ); } TQString PMLibraryBrowserViewFactory::description( ) const diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp index 75256512..162fc789 100644 --- a/kpovmodeler/pmlibraryentrypreview.cpp +++ b/kpovmodeler/pmlibraryentrypreview.cpp @@ -103,18 +103,18 @@ PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) : m_pCancelChanges->setEnabled( false ); hl->addWidget( m_pCancelChanges ); - connect( m_pName, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_pDescription, TQT_SIGNAL( textChanged( ) ), - TQT_SLOT( slotTextChanged( ) ) ); - connect( m_pKeywords, TQT_SIGNAL( textChanged( ) ), - TQT_SLOT( slotTextChanged( ) ) ); - connect( m_pSetPreviewImageButton, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotPreviewClicked( ) ) ); - connect( m_pPart, TQT_SIGNAL( modified( ) ), - TQT_SLOT( slotTextChanged( ) ) ); - connect( m_pApplyChanges, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotApplyClicked( ) ) ); - connect( m_pCancelChanges, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCancelClicked( ) ) ); + connect( m_pName, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_pDescription, TQ_SIGNAL( textChanged( ) ), + TQ_SLOT( slotTextChanged( ) ) ); + connect( m_pKeywords, TQ_SIGNAL( textChanged( ) ), + TQ_SLOT( slotTextChanged( ) ) ); + connect( m_pSetPreviewImageButton, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotPreviewClicked( ) ) ); + connect( m_pPart, TQ_SIGNAL( modified( ) ), + TQ_SLOT( slotTextChanged( ) ) ); + connect( m_pApplyChanges, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotApplyClicked( ) ) ); + connect( m_pCancelChanges, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCancelClicked( ) ) ); vl->addStretch( 1 ); } diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp index 8a0febc8..2080b7b9 100644 --- a/kpovmodeler/pmlibraryhandleedit.cpp +++ b/kpovmodeler/pmlibraryhandleedit.cpp @@ -75,10 +75,10 @@ PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* parent m_pReadOnlyEdit->setChecked( !lib->isReadOnly( ) ); // Setup the signals - connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotEditsChanged( const TQString& ) ) ); - connect( m_pAuthorEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotEditsChanged( const TQString& ) ) ); - connect( m_pDescriptionEdit, TQT_SIGNAL( textChanged( ) ), TQT_SLOT( slotDescriptionChanged( ) ) ); - connect( m_pReadOnlyEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotReadOnlyChanged( ) ) ); + connect( m_pNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotEditsChanged( const TQString& ) ) ); + connect( m_pAuthorEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotEditsChanged( const TQString& ) ) ); + connect( m_pDescriptionEdit, TQ_SIGNAL( textChanged( ) ), TQ_SLOT( slotDescriptionChanged( ) ) ); + connect( m_pReadOnlyEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotReadOnlyChanged( ) ) ); // On startup you can only cancel enableButtonOK( false ); diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp index e3fee426..1684d73c 100644 --- a/kpovmodeler/pmlibraryobjectsearch.cpp +++ b/kpovmodeler/pmlibraryobjectsearch.cpp @@ -70,7 +70,7 @@ PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) : vl->addWidget( frame ); // Connect signals and slots - connect( m_pSearchButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSearchButtonPressed( ) ) ); + connect( m_pSearchButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSearchButtonPressed( ) ) ); } void PMLibraryObjectSearch::slotSearchButtonPressed( ) diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp index 7448c48b..ccf5846f 100644 --- a/kpovmodeler/pmlightedit.cpp +++ b/kpovmodeler/pmlightedit.cpp @@ -160,33 +160,33 @@ void PMLightEdit::createTopWidgets( ) topLayout( )->addWidget( m_pMediaInteraction ); topLayout( )->addWidget( m_pMediaAttenuation ); - connect( m_pLocation, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pColor, TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotTypeActivated( int ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFalloff, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pTightness, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPointAt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pParallel, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAreaLight, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAreaClicked( ) ) ); - connect( m_pAreaType, TQT_SIGNAL( activated ( int ) ), TQT_SLOT( slotOrientCheck( ) ) ); - connect( m_pAxis1, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) ); - connect( m_pAxis2, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) ); - connect( m_pSize1, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) ); - connect( m_pSize2, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotOrientCheck( ) ) ); - connect( m_pAdaptive, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOrient, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pJitter, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFading, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFadingClicked( ) ) ); - connect( m_pFadeDistance, TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFadePower, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMediaInteraction, TQT_SIGNAL( clicked( ) ), - TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMediaAttenuation, TQT_SIGNAL( clicked( ) ), - TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pLocation, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pColor, TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotTypeActivated( int ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFalloff, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pTightness, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPointAt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pParallel, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAreaLight, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAreaClicked( ) ) ); + connect( m_pAreaType, TQ_SIGNAL( activated ( int ) ), TQ_SLOT( slotOrientCheck( ) ) ); + connect( m_pAxis1, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) ); + connect( m_pAxis2, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) ); + connect( m_pSize1, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) ); + connect( m_pSize2, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotOrientCheck( ) ) ); + connect( m_pAdaptive, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOrient, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pJitter, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFading, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFadingClicked( ) ) ); + connect( m_pFadeDistance, TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFadePower, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMediaInteraction, TQ_SIGNAL( clicked( ) ), + TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMediaAttenuation, TQ_SIGNAL( clicked( ) ), + TQ_SIGNAL( dataChanged( ) ) ); } void PMLightEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp index 5f66c54b..e9cc6a3c 100644 --- a/kpovmodeler/pmlightgroupedit.cpp +++ b/kpovmodeler/pmlightgroupedit.cpp @@ -41,7 +41,7 @@ void PMLightGroupEdit::createTopWidgets( ) layout->addWidget( m_pGlobalLights ); layout->addStretch( 1 ); - connect( m_pGlobalLights, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pGlobalLights, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMLightGroupEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp index d64f5aaa..9e14ce33 100644 --- a/kpovmodeler/pmlineedits.cpp +++ b/kpovmodeler/pmlineedits.cpp @@ -29,8 +29,8 @@ PMFloatEdit::PMFloatEdit( TQWidget* parent, const char* name /*= 0*/ ) m_lowerOp = OpGreaterEqual; m_upperOp = OpLessEqual; - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotEditTextChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotEditTextChanged( const TQString& ) ) ); } void PMFloatEdit::setValidation( bool checkLower, double lowerValue, @@ -137,8 +137,8 @@ PMIntEdit::PMIntEdit( TQWidget* parent, const char* name /*= 0*/ ) m_lowerValue = 0; m_upperValue = 0; - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotEditTextChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotEditTextChanged( const TQString& ) ) ); } void PMIntEdit::setValidation( bool checkLower, int lowerValue, diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp index c2418f3b..6ea0f532 100644 --- a/kpovmodeler/pmlinkedit.cpp +++ b/kpovmodeler/pmlinkedit.cpp @@ -71,8 +71,8 @@ void PMLinkEdit::init( ) m_pClearButton = new KPushButton( KStdGuiItem::clear(), this ); layout->addWidget( m_pClearButton ); - connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelectClicked( ) ) ); - connect( m_pClearButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClearClicked( ) ) ); + connect( m_pSelectButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSelectClicked( ) ) ); + connect( m_pClearButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotClearClicked( ) ) ); } void PMLinkEdit::setDisplayedObject( PMObject* obj ) diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp index 10c0fd24..32ec5fc9 100644 --- a/kpovmodeler/pmlistpatternedit.cpp +++ b/kpovmodeler/pmlistpatternedit.cpp @@ -76,10 +76,10 @@ void PMListPatternEdit::createTopWidgets( ) layout->addStretch( 1 ); /* connect all signals to slots/signals */ - connect( m_pBrickSize, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboChanged( int ) ) ); - connect( m_pMortar, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDepth, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pBrickSize, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboChanged( int ) ) ); + connect( m_pMortar, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDepth, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMListPatternEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp index 672ae9d1..e46dafd1 100644 --- a/kpovmodeler/pmmaterialmapedit.cpp +++ b/kpovmodeler/pmmaterialmapedit.cpp @@ -100,12 +100,12 @@ void PMMaterialMapEdit::createTopWidgets( ) hl->addWidget( m_pMapTypeEdit ); hl->addStretch( 1 ); - connect( m_pImageFileTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotImageFileTypeChanged( int ) ) ); - connect( m_pMapTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMapTypeChanged( int ) ) ); - connect( m_pInterpolateTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotInterpolateTypeChanged( int ) ) ); - connect( m_pImageFileNameBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImageFileBrowseClicked( ) ) ); - connect( m_pImageFileNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotImageFileNameChanged( const TQString& ) ) ); - connect( m_pOnceEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pImageFileTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotImageFileTypeChanged( int ) ) ); + connect( m_pMapTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMapTypeChanged( int ) ) ); + connect( m_pInterpolateTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotInterpolateTypeChanged( int ) ) ); + connect( m_pImageFileNameBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImageFileBrowseClicked( ) ) ); + connect( m_pImageFileNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotImageFileNameChanged( const TQString& ) ) ); + connect( m_pOnceEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMMaterialMapEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp index 75d99688..fed701c7 100644 --- a/kpovmodeler/pmmediaedit.cpp +++ b/kpovmodeler/pmmediaedit.cpp @@ -148,24 +148,24 @@ void PMMediaEdit::createTopWidgets( ) hl->addStretch( 1 ); topLayout( )->addWidget( m_pScatteringWidget ); - connect( m_pMethodEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMethodChanged( int ) ) ); - connect( m_pIntervalsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSamplesMinEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSamplesMaxEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pConfidenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pVarianceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRatioEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAALevelEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAAThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAbsorptionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEmissionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableAbsorptionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAbsorptionClicked( ) ) ); - connect( m_pEnableEmissionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotEmissionClicked( ) ) ); - connect( m_pEnableScatteringEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotScatteringClicked( ) ) ); - connect( m_pScatteringTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotScatteringTypeChanged( int ) ) ); - connect( m_pScatteringColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pScatteringEccentricityEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pScatteringExtinctionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pMethodEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMethodChanged( int ) ) ); + connect( m_pIntervalsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSamplesMinEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSamplesMaxEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pConfidenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pVarianceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRatioEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAALevelEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAAThresholdEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAbsorptionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEmissionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableAbsorptionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAbsorptionClicked( ) ) ); + connect( m_pEnableEmissionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotEmissionClicked( ) ) ); + connect( m_pEnableScatteringEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotScatteringClicked( ) ) ); + connect( m_pScatteringTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotScatteringTypeChanged( int ) ) ); + connect( m_pScatteringColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pScatteringEccentricityEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pScatteringExtinctionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMMediaEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp index 4bab8877..bb9acc62 100644 --- a/kpovmodeler/pmmeshedit.cpp +++ b/kpovmodeler/pmmeshedit.cpp @@ -47,9 +47,9 @@ void PMMeshEdit::createTopWidgets( ) layout->addWidget( m_pInsideVector ); layout->addStretch( 1 ); - connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableInsideVector, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInsideVectorClicked( ) ) ); - connect( m_pInsideVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pHierarchy, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableInsideVector, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotInsideVectorClicked( ) ) ); + connect( m_pInsideVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMMeshEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp index 07107dd0..3702939b 100644 --- a/kpovmodeler/pmnamedobjectedit.cpp +++ b/kpovmodeler/pmnamedobjectedit.cpp @@ -41,8 +41,8 @@ void PMNamedObjectEdit::createTopWidgets( ) layout->addWidget( label ); layout->addWidget( m_pNameEdit ); - connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotNameChanged( const TQString& ) ) ); + connect( m_pNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotNameChanged( const TQString& ) ) ); } void PMNamedObjectEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp index 92a9d46d..550c1288 100644 --- a/kpovmodeler/pmnormaledit.cpp +++ b/kpovmodeler/pmnormaledit.cpp @@ -56,10 +56,10 @@ void PMNormalEdit::createTopWidgets( ) m_pUVMapping = new TQCheckBox( i18n( "UV mapping" ), this ); topLayout( )->addWidget( m_pUVMapping ); - connect( m_pBumpSizeCheck, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBumpSizeClicked( )) ); - connect( m_pBumpSizeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( )) ); - connect( m_pAccuracy, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pUVMapping, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pBumpSizeCheck, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotBumpSizeClicked( )) ); + connect( m_pBumpSizeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( )) ); + connect( m_pAccuracy, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pUVMapping, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMNormalEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp index 822f18f1..4f245ccc 100644 --- a/kpovmodeler/pmobjectlibrarysettings.cpp +++ b/kpovmodeler/pmobjectlibrarysettings.cpp @@ -43,20 +43,20 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* TQHBoxLayout* hlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) ); m_pObjectLibraries = new TQListBox( gb ); - connect( m_pObjectLibraries, TQT_SIGNAL( selectionChanged( ) ), TQT_SLOT( slotObjectLibraryChanged( ) ) ); + connect( m_pObjectLibraries, TQ_SIGNAL( selectionChanged( ) ), TQ_SLOT( slotObjectLibraryChanged( ) ) ); hlayout->addWidget( m_pObjectLibraries ); TQVBoxLayout* gvl = new TQVBoxLayout( hlayout ); m_pCreateObjectLibrary = new TQPushButton( i18n( "Create..." ), gb ); - connect( m_pCreateObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCreateObjectLibrary( ) ) ); + connect( m_pCreateObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotCreateObjectLibrary( ) ) ); gvl->addWidget( m_pCreateObjectLibrary ); m_pRemoveObjectLibrary = new TQPushButton( i18n( "Remove" ), gb ); - connect( m_pRemoveObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveObjectLibrary( ) ) ); + connect( m_pRemoveObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveObjectLibrary( ) ) ); gvl->addWidget( m_pRemoveObjectLibrary ); m_pImportObjectLibrary = new TQPushButton( i18n( "Import" ), gb ); - connect( m_pImportObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotImportObjectLibrary( ) ) ); + connect( m_pImportObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotImportObjectLibrary( ) ) ); gvl->addWidget( m_pImportObjectLibrary ); m_pModifyObjectLibrary = new TQPushButton( i18n( "Properties" ), gb ); - connect( m_pModifyObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotModifyObjectLibrary( ) ) ); + connect( m_pModifyObjectLibrary, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotModifyObjectLibrary( ) ) ); gvl->addWidget( m_pModifyObjectLibrary ); gvl->addStretch( 1 ); diff --git a/kpovmodeler/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp index 98aead0c..2aac5cfe 100644 --- a/kpovmodeler/pmobjectlinkedit.cpp +++ b/kpovmodeler/pmobjectlinkedit.cpp @@ -40,7 +40,7 @@ void PMObjectLinkEdit::createTopWidgets( ) l.append( "Light" ); m_pLinkEdit->setLinkPossibilities( l ); topLayout( )->addWidget( m_pLinkEdit ); - connect( m_pLinkEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pLinkEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMObjectLinkEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp index dd5e4892..64c7d7de 100644 --- a/kpovmodeler/pmobjectselect.cpp +++ b/kpovmodeler/pmobjectselect.cpp @@ -92,10 +92,10 @@ PMObjectSelect::PMObjectSelect( TQWidget* parent, const char* name, bool modal ) setMainWidget( m_pListBox ); setInitialSize( s_size ); - connect( m_pListBox, TQT_SIGNAL( highlighted( TQListBoxItem* ) ), - TQT_SLOT( slotHighlighted( TQListBoxItem* ) ) ); - connect( m_pListBox, TQT_SIGNAL( selected( TQListBoxItem* ) ), - TQT_SLOT( slotSelected( TQListBoxItem* ) ) ); + connect( m_pListBox, TQ_SIGNAL( highlighted( TQListBoxItem* ) ), + TQ_SLOT( slotHighlighted( TQListBoxItem* ) ) ); + connect( m_pListBox, TQ_SIGNAL( selected( TQListBoxItem* ) ), + TQ_SLOT( slotSelected( TQListBoxItem* ) ) ); enableButtonOK( false ); } diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp index d8cd0e24..1a9f8de2 100644 --- a/kpovmodeler/pmpalettevalueedit.cpp +++ b/kpovmodeler/pmpalettevalueedit.cpp @@ -55,8 +55,8 @@ PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name ) layout->addSpacing( KDialog::spacingHint( ) ); layout->addWidget( m_pValueEdit ); - connect( m_pIndexEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pValueEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pIndexEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pValueEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMPaletteValueEdit::setIndex( int idx ) diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp index 452f2bac..494fc683 100644 --- a/kpovmodeler/pmpart.cpp +++ b/kpovmodeler/pmpart.cpp @@ -145,15 +145,15 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName, restoreConfig( instance( )->config( ) ); - connect( tqApp->clipboard( ), TQT_SIGNAL( dataChanged( ) ), - TQT_SLOT( slotClipboardDataChanged( ) ) ); + connect( tqApp->clipboard( ), TQ_SIGNAL( dataChanged( ) ), + TQ_SLOT( slotClipboardDataChanged( ) ) ); slotClipboardDataChanged( ); - connect( &m_commandManager, TQT_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ), - TQT_SLOT( slotUpdateUndoRedo( const TQString&, const TQString& ) ) ); - connect( &m_commandManager, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); - connect( &m_commandManager, TQT_SIGNAL( idChanged( PMObject*, const TQString& ) ), - TQT_SLOT( slotIDChanged( PMObject*, const TQString& ) ) ); + connect( &m_commandManager, TQ_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ), + TQ_SLOT( slotUpdateUndoRedo( const TQString&, const TQString& ) ) ); + connect( &m_commandManager, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( &m_commandManager, TQ_SIGNAL( idChanged( PMObject*, const TQString& ) ), + TQ_SLOT( slotIDChanged( PMObject*, const TQString& ) ) ); PMPluginManager::theManager( )->registerPart( this ); @@ -202,8 +202,8 @@ PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/, initCopyPasteActions( ); - connect( &m_commandManager, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( &m_commandManager, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); PMPluginManager::theManager( )->registerPart( this ); @@ -222,13 +222,13 @@ PMPart::~PMPart( ) void PMPart::initCopyPasteActions( ) { // setup edit menu - m_pCutAction = KStdAction::cut( this, TQT_SLOT( slotEditCut( ) ), actionCollection( ) ); - m_pCopyAction = KStdAction::copy( this, TQT_SLOT( slotEditCopy( ) ), actionCollection( ) ); - m_pPasteAction = KStdAction::paste( this, TQT_SLOT( slotEditPaste( ) ), actionCollection( ) ); + m_pCutAction = KStdAction::cut( this, TQ_SLOT( slotEditCut( ) ), actionCollection( ) ); + m_pCopyAction = KStdAction::copy( this, TQ_SLOT( slotEditCopy( ) ), actionCollection( ) ); + m_pPasteAction = KStdAction::paste( this, TQ_SLOT( slotEditPaste( ) ), actionCollection( ) ); m_pDeleteAction = new TDEAction( i18n( "Delete" ), "edittrash", TQt::Key_Delete, - this, TQT_SLOT( slotEditDelete( ) ), + this, TQ_SLOT( slotEditDelete( ) ), actionCollection( ), "edit_delete" ); m_pCutAction->setEnabled( false ); @@ -242,32 +242,32 @@ void PMPart::initActions( ) { // file menu m_pImportAction = new TDEAction( i18n( "Import..." ), 0, this, - TQT_SLOT( slotFileImport( ) ), actionCollection( ), + TQ_SLOT( slotFileImport( ) ), actionCollection( ), "file_import" ); m_pExportAction = new TDEAction( i18n( "&Export..." ), 0, this, - TQT_SLOT( slotFileExport( ) ), actionCollection( ), + TQ_SLOT( slotFileExport( ) ), actionCollection( ), "file_export" ); initCopyPasteActions( ); m_onlyCopyPaste = false; - m_pRenderComboAction = new PMComboAction( i18n( "Render Modes" ), 0, this, TQT_SLOT( slotRenderMode( int ) ), + m_pRenderComboAction = new PMComboAction( i18n( "Render Modes" ), 0, this, TQ_SLOT( slotRenderMode( int ) ), actionCollection( ), "view_render_combo" ); m_pRenderComboAction->setMinimumWidth( 250 ); - connect( m_pRenderComboAction, TQT_SIGNAL( plugged( ) ), - TQT_SLOT( slotRenderModeActionPlugged( ) ) ); - m_pRenderAction = new TDEAction( i18n( "Render" ), "pmrender", 0, this, TQT_SLOT( slotRender( ) ), + connect( m_pRenderComboAction, TQ_SIGNAL( plugged( ) ), + TQ_SLOT( slotRenderModeActionPlugged( ) ) ); + m_pRenderAction = new TDEAction( i18n( "Render" ), "pmrender", 0, this, TQ_SLOT( slotRender( ) ), actionCollection( ), "view_render" ); - m_pRenderSettingsAction = new TDEAction( i18n( "Render Modes..." ), "pmrendersettings", 0, this, TQT_SLOT( slotRenderSettings( ) ), + m_pRenderSettingsAction = new TDEAction( i18n( "Render Modes..." ), "pmrendersettings", 0, this, TQ_SLOT( slotRenderSettings( ) ), actionCollection( ), "view_render_settings" ); - m_pViewRenderWindowAction = new TDEAction( i18n( "Render Window" ), 0, this, TQT_SLOT( slotViewRenderWindow( ) ), + m_pViewRenderWindowAction = new TDEAction( i18n( "Render Window" ), 0, this, TQ_SLOT( slotViewRenderWindow( ) ), actionCollection( ), "view_render_window" ); m_pVisibilityLabelAction = new PMLabelAction( i18n( "Visibility level:" ) + TQString( " " ), actionCollection( ), "view_visibility_label" ); m_pVisibilityLevelAction = new PMSpinBoxAction( i18n( "Visibility Level" ), - 0, this, TQT_SLOT( slotVisibilityLevelChanged( int ) ), + 0, this, TQ_SLOT( slotVisibilityLevelChanged( int ) ), actionCollection( ), "view_visibility_level" ); - connect( m_pVisibilityLevelAction, TQT_SIGNAL( plugged( ) ), - TQT_SLOT( slotVisibilityActionPlugged( ) ) ); + connect( m_pVisibilityLevelAction, TQ_SIGNAL( plugged( ) ), + TQ_SLOT( slotVisibilityActionPlugged( ) ) ); m_pGlobalDetailLabelAction = new PMLabelAction( i18n( "Global detail:" ) + TQString( " " ), actionCollection( ), "global_detail_label" ); m_pGlobalDetailAction = new TDESelectAction( i18n("Global Detail Level"), TDEShortcut(), actionCollection(), "global_detail_level" ); @@ -278,275 +278,275 @@ void PMPart::initActions( ) strList.append( i18n( "High" ) ); strList.append( i18n( "Very High" ) ); m_pGlobalDetailAction->setItems( strList ); - connect( m_pGlobalDetailAction, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotGlobalDetailLevelChanged( int ) ) ); + connect( m_pGlobalDetailAction, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotGlobalDetailLevelChanged( int ) ) ); // new objects if( isReadWrite( ) ) { - m_pNewGlobalSettingsAction = new TDEAction( i18n( "Global Settings" ), "pmglobalsettings", 0, this, TQT_SLOT( slotNewGlobalSettings( ) ), + m_pNewGlobalSettingsAction = new TDEAction( i18n( "Global Settings" ), "pmglobalsettings", 0, this, TQ_SLOT( slotNewGlobalSettings( ) ), actionCollection( ), "new_globalsettings" ); m_readWriteActions.append( m_pNewGlobalSettingsAction ); - m_pNewSkySphereAction = new TDEAction( i18n( "Sky Sphere" ), "pmskysphere", 0, this, TQT_SLOT( slotNewSkySphere( ) ), + m_pNewSkySphereAction = new TDEAction( i18n( "Sky Sphere" ), "pmskysphere", 0, this, TQ_SLOT( slotNewSkySphere( ) ), actionCollection( ), "new_skysphere" ); m_readWriteActions.append( m_pNewSkySphereAction ); - m_pNewRainbowAction = new TDEAction( i18n( "Rainbow" ), "pmrainbow", 0, this, TQT_SLOT( slotNewRainbow( ) ), + m_pNewRainbowAction = new TDEAction( i18n( "Rainbow" ), "pmrainbow", 0, this, TQ_SLOT( slotNewRainbow( ) ), actionCollection( ), "new_rainbow" ); m_readWriteActions.append( m_pNewRainbowAction ); - m_pNewFogAction = new TDEAction( i18n( "Fog" ), "pmfog", 0, this, TQT_SLOT( slotNewFog( ) ), + m_pNewFogAction = new TDEAction( i18n( "Fog" ), "pmfog", 0, this, TQ_SLOT( slotNewFog( ) ), actionCollection( ), "new_fog" ); m_readWriteActions.append( m_pNewFogAction ); - m_pNewInteriorAction = new TDEAction( i18n( "Interior" ), "pminterior", 0, this, TQT_SLOT( slotNewInterior( ) ), + m_pNewInteriorAction = new TDEAction( i18n( "Interior" ), "pminterior", 0, this, TQ_SLOT( slotNewInterior( ) ), actionCollection( ), "new_interior" ); m_readWriteActions.append( m_pNewInteriorAction ); - m_pNewMediaAction = new TDEAction( i18n( "Media" ), "pmmedia", 0, this, TQT_SLOT( slotNewMedia( ) ), + m_pNewMediaAction = new TDEAction( i18n( "Media" ), "pmmedia", 0, this, TQ_SLOT( slotNewMedia( ) ), actionCollection( ), "new_media" ); m_readWriteActions.append( m_pNewMediaAction ); - m_pNewDensityAction = new TDEAction( i18n( "Density" ), "pmdensity", 0, this, TQT_SLOT( slotNewDensity( ) ), + m_pNewDensityAction = new TDEAction( i18n( "Density" ), "pmdensity", 0, this, TQ_SLOT( slotNewDensity( ) ), actionCollection( ), "new_density" ); m_readWriteActions.append( m_pNewDensityAction ); - m_pNewMaterialAction = new TDEAction( i18n( "Material" ), "pmmaterial", 0, this, TQT_SLOT( slotNewMaterial( ) ), + m_pNewMaterialAction = new TDEAction( i18n( "Material" ), "pmmaterial", 0, this, TQ_SLOT( slotNewMaterial( ) ), actionCollection( ), "new_material" ); m_readWriteActions.append( m_pNewMaterialAction ); - m_pNewBoxAction = new TDEAction( i18n( "Box" ), "pmbox", 0, this, TQT_SLOT( slotNewBox( ) ), + m_pNewBoxAction = new TDEAction( i18n( "Box" ), "pmbox", 0, this, TQ_SLOT( slotNewBox( ) ), actionCollection( ), "new_box" ); m_readWriteActions.append( m_pNewBoxAction ); - m_pNewSphereAction = new TDEAction( i18n( "Sphere" ), "pmsphere", 0, this, TQT_SLOT( slotNewSphere( ) ), + m_pNewSphereAction = new TDEAction( i18n( "Sphere" ), "pmsphere", 0, this, TQ_SLOT( slotNewSphere( ) ), actionCollection( ), "new_sphere" ); m_readWriteActions.append( m_pNewSphereAction ); - m_pNewCylinderAction = new TDEAction( i18n( "Cylinder" ), "pmcylinder", 0, this, TQT_SLOT( slotNewCylinder( ) ), + m_pNewCylinderAction = new TDEAction( i18n( "Cylinder" ), "pmcylinder", 0, this, TQ_SLOT( slotNewCylinder( ) ), actionCollection( ), "new_cylinder" ); m_readWriteActions.append( m_pNewCylinderAction ); - m_pNewConeAction = new TDEAction( i18n( "Cone" ), "pmcone", 0, this, TQT_SLOT( slotNewCone( ) ), + m_pNewConeAction = new TDEAction( i18n( "Cone" ), "pmcone", 0, this, TQ_SLOT( slotNewCone( ) ), actionCollection( ), "new_cone" ); m_readWriteActions.append( m_pNewConeAction ); - m_pNewTorusAction = new TDEAction( i18n( "Torus" ), "pmtorus", 0, this, TQT_SLOT( slotNewTorus( ) ), + m_pNewTorusAction = new TDEAction( i18n( "Torus" ), "pmtorus", 0, this, TQ_SLOT( slotNewTorus( ) ), actionCollection( ), "new_torus" ); m_readWriteActions.append( m_pNewTorusAction ); - m_pNewLatheAction = new TDEAction( i18n( "Lathe" ), "pmlathe", 0, this, TQT_SLOT( slotNewLathe( ) ), + m_pNewLatheAction = new TDEAction( i18n( "Lathe" ), "pmlathe", 0, this, TQ_SLOT( slotNewLathe( ) ), actionCollection( ), "new_lathe" ); m_readWriteActions.append( m_pNewLatheAction ); - m_pNewPrismAction = new TDEAction( i18n( "Prism" ), "pmprism", 0, this, TQT_SLOT( slotNewPrism( ) ), + m_pNewPrismAction = new TDEAction( i18n( "Prism" ), "pmprism", 0, this, TQ_SLOT( slotNewPrism( ) ), actionCollection( ), "new_prism" ); m_readWriteActions.append( m_pNewPrismAction ); - m_pNewSurfaceOfRevolutionAction = new TDEAction( i18n( "Surface of Revolution" ), "pmsor", 0, this, TQT_SLOT( slotNewSurfaceOfRevolution( ) ), + m_pNewSurfaceOfRevolutionAction = new TDEAction( i18n( "Surface of Revolution" ), "pmsor", 0, this, TQ_SLOT( slotNewSurfaceOfRevolution( ) ), actionCollection( ), "new_surfaceofrevolution" ); m_readWriteActions.append( m_pNewSurfaceOfRevolutionAction ); - m_pNewSuperquadricEllipsoidAction = new TDEAction( i18n( "Superquadric Ellipsoid" ), "pmsqe", 0, this, TQT_SLOT( slotNewSuperquadricEllipsoid( ) ), + m_pNewSuperquadricEllipsoidAction = new TDEAction( i18n( "Superquadric Ellipsoid" ), "pmsqe", 0, this, TQ_SLOT( slotNewSuperquadricEllipsoid( ) ), actionCollection( ), "new_superquadricellipsoid" ); m_readWriteActions.append( m_pNewSuperquadricEllipsoidAction ); - m_pNewJuliaFractalAction = new TDEAction( i18n( "Julia Fractal" ), "pmjuliafractal", 0, this, TQT_SLOT( slotNewJuliaFractal( ) ), + m_pNewJuliaFractalAction = new TDEAction( i18n( "Julia Fractal" ), "pmjuliafractal", 0, this, TQ_SLOT( slotNewJuliaFractal( ) ), actionCollection( ), "new_juliafractal" ); m_readWriteActions.append( m_pNewJuliaFractalAction ); - m_pNewHeightFieldAction = new TDEAction( i18n( "Height Field" ), "pmheightfield", 0, this, TQT_SLOT( slotNewHeightField( ) ), + m_pNewHeightFieldAction = new TDEAction( i18n( "Height Field" ), "pmheightfield", 0, this, TQ_SLOT( slotNewHeightField( ) ), actionCollection( ), "new_heightfield" ); m_readWriteActions.append( m_pNewHeightFieldAction ); - m_pNewTextAction = new TDEAction( i18n( "Text" ), "pmtext", 0, this, TQT_SLOT( slotNewText( ) ), + m_pNewTextAction = new TDEAction( i18n( "Text" ), "pmtext", 0, this, TQ_SLOT( slotNewText( ) ), actionCollection( ), "new_text" ); m_readWriteActions.append( m_pNewTextAction ); - m_pNewBlobAction = new TDEAction( i18n( "Blob" ), "pmblob", 0, this, TQT_SLOT( slotNewBlob( ) ), + m_pNewBlobAction = new TDEAction( i18n( "Blob" ), "pmblob", 0, this, TQ_SLOT( slotNewBlob( ) ), actionCollection( ), "new_blob" ); m_readWriteActions.append( m_pNewBlobAction ); - m_pNewBlobSphereAction = new TDEAction( i18n( "Blob Sphere" ), "pmblobsphere", 0, this, TQT_SLOT( slotNewBlobSphere( ) ), + m_pNewBlobSphereAction = new TDEAction( i18n( "Blob Sphere" ), "pmblobsphere", 0, this, TQ_SLOT( slotNewBlobSphere( ) ), actionCollection( ), "new_blobsphere" ); m_readWriteActions.append( m_pNewBlobSphereAction ); - m_pNewBlobCylinderAction = new TDEAction( i18n( "Blob Cylinder" ), "pmblobcylinder", 0, this, TQT_SLOT( slotNewBlobCylinder( ) ), + m_pNewBlobCylinderAction = new TDEAction( i18n( "Blob Cylinder" ), "pmblobcylinder", 0, this, TQ_SLOT( slotNewBlobCylinder( ) ), actionCollection( ), "new_blobcylinder" ); m_readWriteActions.append( m_pNewBlobCylinderAction ); - m_pNewPlaneAction = new TDEAction( i18n( "Plane" ), "pmplane", 0, this, TQT_SLOT( slotNewPlane( ) ), + m_pNewPlaneAction = new TDEAction( i18n( "Plane" ), "pmplane", 0, this, TQ_SLOT( slotNewPlane( ) ), actionCollection( ), "new_plane" ); m_readWriteActions.append( m_pNewPlaneAction ); - m_pNewPolynomAction = new TDEAction( i18n( "Polynom" ), "pmpolynom", 0, this, TQT_SLOT( slotNewPolynom( ) ), + m_pNewPolynomAction = new TDEAction( i18n( "Polynom" ), "pmpolynom", 0, this, TQ_SLOT( slotNewPolynom( ) ), actionCollection( ), "new_polynom" ); m_readWriteActions.append( m_pNewPolynomAction ); - m_pNewDeclareAction = new TDEAction( i18n( "Declaration" ), "pmdeclare", 0, this, TQT_SLOT( slotNewDeclare( ) ), + m_pNewDeclareAction = new TDEAction( i18n( "Declaration" ), "pmdeclare", 0, this, TQ_SLOT( slotNewDeclare( ) ), actionCollection( ), "new_declare" ); m_readWriteActions.append( m_pNewDeclareAction ); - m_pNewObjectLinkAction = new TDEAction( i18n( "Object Link" ), "pmobjectlink", 0, this, TQT_SLOT( slotNewObjectLink( ) ), + m_pNewObjectLinkAction = new TDEAction( i18n( "Object Link" ), "pmobjectlink", 0, this, TQ_SLOT( slotNewObjectLink( ) ), actionCollection( ), "new_objectlink" ); m_readWriteActions.append( m_pNewObjectLinkAction ); - m_pNewUnionAction = new TDEAction( i18n( "Union" ), "pmunion", 0, this, TQT_SLOT( slotNewUnion( ) ), + m_pNewUnionAction = new TDEAction( i18n( "Union" ), "pmunion", 0, this, TQ_SLOT( slotNewUnion( ) ), actionCollection( ), "new_union" ); m_readWriteActions.append( m_pNewUnionAction ); - m_pNewIntersectionAction = new TDEAction( i18n( "Intersection" ), "pmintersection", 0, this, TQT_SLOT( slotNewIntersection( ) ), + m_pNewIntersectionAction = new TDEAction( i18n( "Intersection" ), "pmintersection", 0, this, TQ_SLOT( slotNewIntersection( ) ), actionCollection( ), "new_intersection" ); m_readWriteActions.append( m_pNewIntersectionAction ); - m_pNewDifferenceAction = new TDEAction( i18n( "Difference" ), "pmdifference", 0, this, TQT_SLOT( slotNewDifference( ) ), + m_pNewDifferenceAction = new TDEAction( i18n( "Difference" ), "pmdifference", 0, this, TQ_SLOT( slotNewDifference( ) ), actionCollection( ), "new_difference" ); m_readWriteActions.append( m_pNewDifferenceAction ); - m_pNewMergeAction = new TDEAction( i18n( "Merge" ), "pmmerge", 0, this, TQT_SLOT( slotNewMerge( ) ), + m_pNewMergeAction = new TDEAction( i18n( "Merge" ), "pmmerge", 0, this, TQ_SLOT( slotNewMerge( ) ), actionCollection( ), "new_merge" ); m_readWriteActions.append( m_pNewMergeAction ); - m_pNewBoundedByAction = new TDEAction( i18n( "Bounded By" ), "pmboundedby", 0, this, TQT_SLOT( slotNewBoundedBy( ) ), + m_pNewBoundedByAction = new TDEAction( i18n( "Bounded By" ), "pmboundedby", 0, this, TQ_SLOT( slotNewBoundedBy( ) ), actionCollection( ), "new_boundedby" ); m_readWriteActions.append( m_pNewBoundedByAction ); - m_pNewClippedByAction = new TDEAction( i18n( "Clipped By" ), "pmclippedby", 0, this, TQT_SLOT( slotNewClippedBy( ) ), + m_pNewClippedByAction = new TDEAction( i18n( "Clipped By" ), "pmclippedby", 0, this, TQ_SLOT( slotNewClippedBy( ) ), actionCollection( ), "new_clippedby" ); m_readWriteActions.append( m_pNewClippedByAction ); - m_pNewLightAction = new TDEAction( i18n( "Light" ), "pmlight", 0, this, TQT_SLOT( slotNewLight( ) ), + m_pNewLightAction = new TDEAction( i18n( "Light" ), "pmlight", 0, this, TQ_SLOT( slotNewLight( ) ), actionCollection( ), "new_light" ); m_readWriteActions.append( m_pNewLightAction ); - m_pNewLooksLikeAction = new TDEAction( i18n( "Looks Like" ), "pmlookslike", 0, this, TQT_SLOT( slotNewLooksLike( ) ), + m_pNewLooksLikeAction = new TDEAction( i18n( "Looks Like" ), "pmlookslike", 0, this, TQ_SLOT( slotNewLooksLike( ) ), actionCollection( ), "new_lookslike" ); m_readWriteActions.append( m_pNewLooksLikeAction ); - m_pNewProjectedThroughAction = new TDEAction( i18n( "Projected Through" ), "pmprojectedthrough", 0, this, TQT_SLOT( slotNewProjectedThrough( ) ), + m_pNewProjectedThroughAction = new TDEAction( i18n( "Projected Through" ), "pmprojectedthrough", 0, this, TQ_SLOT( slotNewProjectedThrough( ) ), actionCollection( ), "new_projectedthrough" ); m_readWriteActions.append( m_pNewProjectedThroughAction ); - m_pNewBicubicPatchAction = new TDEAction( i18n( "Bicubic Patch" ), "pmbicubicpatch", 0, this, TQT_SLOT( slotNewBicubicPatch( ) ), + m_pNewBicubicPatchAction = new TDEAction( i18n( "Bicubic Patch" ), "pmbicubicpatch", 0, this, TQ_SLOT( slotNewBicubicPatch( ) ), actionCollection( ), "new_bicubicpatch" ); m_readWriteActions.append( m_pNewBicubicPatchAction ); - m_pNewDiscAction = new TDEAction( i18n( "Disc" ), "pmdisc", 0, this, TQT_SLOT( slotNewDisc( ) ), + m_pNewDiscAction = new TDEAction( i18n( "Disc" ), "pmdisc", 0, this, TQ_SLOT( slotNewDisc( ) ), actionCollection( ), "new_disc" ); m_readWriteActions.append( m_pNewDiscAction ); - m_pNewTriangleAction = new TDEAction( i18n( "Triangle" ), "pmtriangle", 0, this, TQT_SLOT( slotNewTriangle( ) ), + m_pNewTriangleAction = new TDEAction( i18n( "Triangle" ), "pmtriangle", 0, this, TQ_SLOT( slotNewTriangle( ) ), actionCollection( ), "new_triangle" ); m_readWriteActions.append( m_pNewTriangleAction ); - m_pNewCameraAction = new TDEAction( i18n( "Camera" ), "pmcamera", 0, this, TQT_SLOT( slotNewCamera( ) ), + m_pNewCameraAction = new TDEAction( i18n( "Camera" ), "pmcamera", 0, this, TQ_SLOT( slotNewCamera( ) ), actionCollection( ), "new_camera" ); m_readWriteActions.append( m_pNewCameraAction ); - m_pNewTextureAction = new TDEAction( i18n( "Texture" ), "pmtexture", 0, this, TQT_SLOT( slotNewTexture( ) ), + m_pNewTextureAction = new TDEAction( i18n( "Texture" ), "pmtexture", 0, this, TQ_SLOT( slotNewTexture( ) ), actionCollection( ), "new_texture" ); m_readWriteActions.append( m_pNewTextureAction ); - m_pNewPigmentAction = new TDEAction( i18n( "Pigment" ), "pmpigment", 0, this, TQT_SLOT( slotNewPigment( ) ), + m_pNewPigmentAction = new TDEAction( i18n( "Pigment" ), "pmpigment", 0, this, TQ_SLOT( slotNewPigment( ) ), actionCollection( ), "new_pigment" ); m_readWriteActions.append( m_pNewPigmentAction ); - m_pNewNormalAction = new TDEAction( i18n( "Normal" ), "pmnormal", 0, this, TQT_SLOT( slotNewNormal( ) ), + m_pNewNormalAction = new TDEAction( i18n( "Normal" ), "pmnormal", 0, this, TQ_SLOT( slotNewNormal( ) ), actionCollection( ), "new_normal" ); m_readWriteActions.append( m_pNewNormalAction ); - m_pNewSolidColorAction = new TDEAction( i18n( "Solid Color" ), "pmsolidcolor", 0, this, TQT_SLOT( slotNewSolidColor( ) ), + m_pNewSolidColorAction = new TDEAction( i18n( "Solid Color" ), "pmsolidcolor", 0, this, TQ_SLOT( slotNewSolidColor( ) ), actionCollection( ), "new_solidcolor" ); m_readWriteActions.append( m_pNewSolidColorAction ); - m_pNewTextureListAction = new TDEAction( i18n( "Texture List" ), "pmtexturelist", 0, this, TQT_SLOT( slotNewTextureList( ) ), + m_pNewTextureListAction = new TDEAction( i18n( "Texture List" ), "pmtexturelist", 0, this, TQ_SLOT( slotNewTextureList( ) ), actionCollection( ), "new_texturelist" ); m_readWriteActions.append( m_pNewTextureListAction ); - m_pNewColorListAction = new TDEAction( i18n( "Color List" ), "pmcolorlist", 0, this, TQT_SLOT( slotNewColorList( ) ), + m_pNewColorListAction = new TDEAction( i18n( "Color List" ), "pmcolorlist", 0, this, TQ_SLOT( slotNewColorList( ) ), actionCollection( ), "new_colorlist" ); m_readWriteActions.append( m_pNewColorListAction ); - m_pNewPigmentListAction = new TDEAction( i18n( "Pigment List" ), "pmpigmentlist", 0, this, TQT_SLOT( slotNewPigmentList( ) ), + m_pNewPigmentListAction = new TDEAction( i18n( "Pigment List" ), "pmpigmentlist", 0, this, TQ_SLOT( slotNewPigmentList( ) ), actionCollection( ), "new_pigmentlist" ); m_readWriteActions.append( m_pNewPigmentListAction ); - m_pNewNormalListAction = new TDEAction( i18n( "Normal List" ), "pmnormallist", 0, this, TQT_SLOT( slotNewNormalList( ) ), + m_pNewNormalListAction = new TDEAction( i18n( "Normal List" ), "pmnormallist", 0, this, TQ_SLOT( slotNewNormalList( ) ), actionCollection( ), "new_normallist" ); m_readWriteActions.append( m_pNewNormalListAction ); - m_pNewDensityListAction = new TDEAction( i18n( "Density List" ), "pmdensitylist", 0, this, TQT_SLOT( slotNewDensityList( ) ), + m_pNewDensityListAction = new TDEAction( i18n( "Density List" ), "pmdensitylist", 0, this, TQ_SLOT( slotNewDensityList( ) ), actionCollection( ), "new_densitylist" ); m_readWriteActions.append( m_pNewDensityListAction ); - m_pNewFinishAction = new TDEAction( i18n( "Finish" ), "pmfinish", 0, this, TQT_SLOT( slotNewFinish( ) ), + m_pNewFinishAction = new TDEAction( i18n( "Finish" ), "pmfinish", 0, this, TQ_SLOT( slotNewFinish( ) ), actionCollection( ), "new_finish" ); m_readWriteActions.append( m_pNewFinishAction ); - m_pNewPatternAction = new TDEAction( i18n( "Pattern" ), "pmpattern", 0, this, TQT_SLOT( slotNewPattern( ) ), + m_pNewPatternAction = new TDEAction( i18n( "Pattern" ), "pmpattern", 0, this, TQ_SLOT( slotNewPattern( ) ), actionCollection( ), "new_pattern" ); m_readWriteActions.append( m_pNewPatternAction ); - m_pNewBlendMapModifiersAction = new TDEAction( i18n( "Blend Map Modifiers" ), "pmblendmapmodifiers", 0, this, TQT_SLOT( slotNewBlendMapModifiers( ) ), + m_pNewBlendMapModifiersAction = new TDEAction( i18n( "Blend Map Modifiers" ), "pmblendmapmodifiers", 0, this, TQ_SLOT( slotNewBlendMapModifiers( ) ), actionCollection( ), "new_blendmapmodifiers" ); m_readWriteActions.append( m_pNewBlendMapModifiersAction ); - m_pNewTextureMapAction = new TDEAction( i18n( "Texture Map" ), "pmtexturemap", 0, this, TQT_SLOT( slotNewTextureMap( ) ), + m_pNewTextureMapAction = new TDEAction( i18n( "Texture Map" ), "pmtexturemap", 0, this, TQ_SLOT( slotNewTextureMap( ) ), actionCollection( ), "new_texturemap" ); m_readWriteActions.append( m_pNewTextureMapAction ); - m_pNewMaterialMapAction = new TDEAction( i18n( "Material Map" ), "pmmaterialmap", 0, this, TQT_SLOT( slotNewMaterialMap( ) ), + m_pNewMaterialMapAction = new TDEAction( i18n( "Material Map" ), "pmmaterialmap", 0, this, TQ_SLOT( slotNewMaterialMap( ) ), actionCollection( ), "new_materialmap" ); m_readWriteActions.append( m_pNewMaterialMapAction ); - m_pNewPigmentMapAction = new TDEAction( i18n( "Pigment Map" ), "pmpigmentmap", 0, this, TQT_SLOT( slotNewPigmentMap( ) ), + m_pNewPigmentMapAction = new TDEAction( i18n( "Pigment Map" ), "pmpigmentmap", 0, this, TQ_SLOT( slotNewPigmentMap( ) ), actionCollection( ), "new_pigmentmap" ); m_readWriteActions.append( m_pNewPigmentMapAction ); - m_pNewColorMapAction = new TDEAction( i18n( "Color Map" ), "pmcolormap", 0, this, TQT_SLOT( slotNewColorMap( ) ), + m_pNewColorMapAction = new TDEAction( i18n( "Color Map" ), "pmcolormap", 0, this, TQ_SLOT( slotNewColorMap( ) ), actionCollection( ), "new_colormap" ); m_readWriteActions.append( m_pNewColorMapAction ); - m_pNewNormalMapAction = new TDEAction( i18n( "Normal Map" ), "pmnormalmap", 0, this, TQT_SLOT( slotNewNormalMap( ) ), + m_pNewNormalMapAction = new TDEAction( i18n( "Normal Map" ), "pmnormalmap", 0, this, TQ_SLOT( slotNewNormalMap( ) ), actionCollection( ), "new_normalmap" ); m_readWriteActions.append( m_pNewNormalMapAction ); - m_pNewBumpMapAction = new TDEAction( i18n( "Bump Map" ), "pmbumpmap", 0, this, TQT_SLOT( slotNewBumpMap( ) ), + m_pNewBumpMapAction = new TDEAction( i18n( "Bump Map" ), "pmbumpmap", 0, this, TQ_SLOT( slotNewBumpMap( ) ), actionCollection( ), "new_bumpmap" ); m_readWriteActions.append( m_pNewBumpMapAction ); - m_pNewSlopeMapAction = new TDEAction( i18n( "Slope Map" ), "pmslopemap", 0, this, TQT_SLOT( slotNewSlopeMap( ) ), + m_pNewSlopeMapAction = new TDEAction( i18n( "Slope Map" ), "pmslopemap", 0, this, TQ_SLOT( slotNewSlopeMap( ) ), actionCollection( ), "new_slopemap" ); m_readWriteActions.append( m_pNewSlopeMapAction ); - m_pNewDensityMapAction = new TDEAction( i18n( "Density Map" ), "pmdensitymap", 0, this, TQT_SLOT( slotNewDensityMap( ) ), + m_pNewDensityMapAction = new TDEAction( i18n( "Density Map" ), "pmdensitymap", 0, this, TQ_SLOT( slotNewDensityMap( ) ), actionCollection( ), "new_densitymap" ); m_readWriteActions.append( m_pNewDensityMapAction ); - m_pNewSlopeAction = new TDEAction( i18n( "Slope" ), "pmslope", 0, this, TQT_SLOT( slotNewSlope( ) ), + m_pNewSlopeAction = new TDEAction( i18n( "Slope" ), "pmslope", 0, this, TQ_SLOT( slotNewSlope( ) ), actionCollection( ), "new_slope" ); m_readWriteActions.append( m_pNewSlopeAction ); - m_pNewWarpAction = new TDEAction( i18n( "Warp" ), "pmwarp", 0, this, TQT_SLOT( slotNewWarp( ) ), + m_pNewWarpAction = new TDEAction( i18n( "Warp" ), "pmwarp", 0, this, TQ_SLOT( slotNewWarp( ) ), actionCollection( ), "new_warp" ); m_readWriteActions.append( m_pNewWarpAction ); - m_pNewImageMapAction = new TDEAction( i18n( "Image Map" ), "pmimagemap", 0, this, TQT_SLOT( slotNewImageMap( ) ), + m_pNewImageMapAction = new TDEAction( i18n( "Image Map" ), "pmimagemap", 0, this, TQ_SLOT( slotNewImageMap( ) ), actionCollection( ), "new_imagemap" ); m_readWriteActions.append( m_pNewImageMapAction ); - m_pNewQuickColorAction = new TDEAction( i18n( "QuickColor" ), "pmquickcolor", 0, this, TQT_SLOT( slotNewQuickColor( ) ), + m_pNewQuickColorAction = new TDEAction( i18n( "QuickColor" ), "pmquickcolor", 0, this, TQ_SLOT( slotNewQuickColor( ) ), actionCollection( ), "new_quickcolor" ); m_readWriteActions.append( m_pNewQuickColorAction ); - m_pNewTranslateAction = new TDEAction( i18n( "Translate" ), "pmtranslate", 0, this, TQT_SLOT( slotNewTranslate( ) ), + m_pNewTranslateAction = new TDEAction( i18n( "Translate" ), "pmtranslate", 0, this, TQ_SLOT( slotNewTranslate( ) ), actionCollection( ), "new_translate" ); m_readWriteActions.append( m_pNewTranslateAction ); - m_pNewScaleAction = new TDEAction( i18n( "Scale" ), "pmscale", 0, this, TQT_SLOT( slotNewScale( ) ), + m_pNewScaleAction = new TDEAction( i18n( "Scale" ), "pmscale", 0, this, TQ_SLOT( slotNewScale( ) ), actionCollection( ), "new_scale" ); m_readWriteActions.append( m_pNewScaleAction ); - m_pNewRotateAction = new TDEAction( i18n( "Rotate" ), "pmrotate", 0, this, TQT_SLOT( slotNewRotate( ) ), + m_pNewRotateAction = new TDEAction( i18n( "Rotate" ), "pmrotate", 0, this, TQ_SLOT( slotNewRotate( ) ), actionCollection( ), "new_rotate" ); m_readWriteActions.append( m_pNewRotateAction ); - m_pNewMatrixAction = new TDEAction( i18n( "Matrix" ), "pmmatrix", 0, this, TQT_SLOT( slotNewMatrix( ) ), + m_pNewMatrixAction = new TDEAction( i18n( "Matrix" ), "pmmatrix", 0, this, TQ_SLOT( slotNewMatrix( ) ), actionCollection( ), "new_povraymatrix" ); m_readWriteActions.append( m_pNewMatrixAction ); - m_pNewCommentAction = new TDEAction( i18n( "Comment" ), "pmcomment", 0, this, TQT_SLOT( slotNewComment( ) ), + m_pNewCommentAction = new TDEAction( i18n( "Comment" ), "pmcomment", 0, this, TQ_SLOT( slotNewComment( ) ), actionCollection( ), "new_comment" ); m_readWriteActions.append( m_pNewCommentAction ); - m_pNewRawAction = new TDEAction( i18n( "Raw Povray" ), "pmraw", 0, this, TQT_SLOT( slotNewRaw( ) ), + m_pNewRawAction = new TDEAction( i18n( "Raw Povray" ), "pmraw", 0, this, TQ_SLOT( slotNewRaw( ) ), actionCollection( ), "new_raw" ); m_readWriteActions.append( m_pNewRawAction ); // POV-Ray 3.5 objects - m_pNewIsoSurfaceAction = new TDEAction( i18n( "Iso Surface" ), "pmisosurface", 0, this, TQT_SLOT( slotNewIsoSurface( ) ), + m_pNewIsoSurfaceAction = new TDEAction( i18n( "Iso Surface" ), "pmisosurface", 0, this, TQ_SLOT( slotNewIsoSurface( ) ), actionCollection( ), "new_isosurface" ); m_readWriteActions.append( m_pNewIsoSurfaceAction ); - m_pNewRadiosityAction = new TDEAction( i18n( "Radiosity" ), "pmradiosity", 0, this, TQT_SLOT( slotNewRadiosity( ) ), + m_pNewRadiosityAction = new TDEAction( i18n( "Radiosity" ), "pmradiosity", 0, this, TQ_SLOT( slotNewRadiosity( ) ), actionCollection( ), "new_radiosity" ); m_readWriteActions.append( m_pNewRadiosityAction ); - m_pNewGlobalPhotonsAction = new TDEAction( i18n( "Global Photons" ), "pmglobalphotons", 0, this, TQT_SLOT( slotNewGlobalPhotons( ) ), + m_pNewGlobalPhotonsAction = new TDEAction( i18n( "Global Photons" ), "pmglobalphotons", 0, this, TQ_SLOT( slotNewGlobalPhotons( ) ), actionCollection( ), "new_globalphotons" ); m_readWriteActions.append( m_pNewGlobalPhotonsAction ); - m_pNewPhotonsAction = new TDEAction( i18n( "Photons" ), "pmphotons", 0, this, TQT_SLOT( slotNewPhotons( ) ), + m_pNewPhotonsAction = new TDEAction( i18n( "Photons" ), "pmphotons", 0, this, TQ_SLOT( slotNewPhotons( ) ), actionCollection( ), "new_photons" ); m_readWriteActions.append( m_pNewPhotonsAction ); - m_pNewLightGroupAction = new TDEAction( i18n( "Light Group" ), "pmlightgroup", 0, this, TQT_SLOT( slotNewLightGroup( ) ), + m_pNewLightGroupAction = new TDEAction( i18n( "Light Group" ), "pmlightgroup", 0, this, TQ_SLOT( slotNewLightGroup( ) ), actionCollection( ), "new_lightgroup" ); m_readWriteActions.append( m_pNewLightGroupAction ); - m_pNewInteriorTextureAction = new TDEAction( i18n( "Interior Texture" ), "pminteriortexture", 0, this, TQT_SLOT( slotNewInteriorTexture( ) ), + m_pNewInteriorTextureAction = new TDEAction( i18n( "Interior Texture" ), "pminteriortexture", 0, this, TQ_SLOT( slotNewInteriorTexture( ) ), actionCollection( ), "new_interiortexture" ); m_readWriteActions.append( m_pNewInteriorTextureAction ); - m_pNewSphereSweepAction = new TDEAction( i18n( "Sphere Sweep" ), "pmspheresweep", 0, this, TQT_SLOT( slotNewSphereSweep( ) ), + m_pNewSphereSweepAction = new TDEAction( i18n( "Sphere Sweep" ), "pmspheresweep", 0, this, TQ_SLOT( slotNewSphereSweep( ) ), actionCollection( ), "new_spheresweep" ); m_readWriteActions.append( m_pNewSphereSweepAction ); - m_pNewMeshAction = new TDEAction( i18n( "Mesh" ), "pmmesh", 0, this, TQT_SLOT( slotNewMesh( ) ), + m_pNewMeshAction = new TDEAction( i18n( "Mesh" ), "pmmesh", 0, this, TQ_SLOT( slotNewMesh( ) ), actionCollection( ), "new_mesh" ); m_readWriteActions.append( m_pNewMeshAction ); #ifdef KPM_WITH_OBJECT_LIBRARY - m_pSearchLibraryObjectAction = new TDEAction( i18n( "Search Object" ), "pmsearchlibrary", 0, this, TQT_SLOT( slotSearchLibraryObject( ) ), + m_pSearchLibraryObjectAction = new TDEAction( i18n( "Search Object" ), "pmsearchlibrary", 0, this, TQ_SLOT( slotSearchLibraryObject( ) ), actionCollection( ), "search_library_object" ); m_readWriteActions.append( m_pSearchLibraryObjectAction ); #endif - m_pUndoAction = KStdAction::undo( this, TQT_SLOT( slotEditUndo( ) ), actionCollection( ) ); - m_pRedoAction = KStdAction::redo( this, TQT_SLOT( slotEditRedo( ) ), actionCollection( ) ); + m_pUndoAction = KStdAction::undo( this, TQ_SLOT( slotEditUndo( ) ), actionCollection( ) ); + m_pRedoAction = KStdAction::redo( this, TQ_SLOT( slotEditRedo( ) ), actionCollection( ) ); m_pUndoAction->setEnabled( false ); m_pRedoAction->setEnabled( false ); } @@ -2783,8 +2783,8 @@ void PMPart::updateRenderModes( ) void PMPart::slotRenderModeActionPlugged( ) { updateRenderModes( ); -// connect( m_pRenderComboAction->combo( ), TQT_SIGNAL( activated( int ) ), -// TQT_SLOT( slotRenderMode( int ) ) ); +// connect( m_pRenderComboAction->combo( ), TQ_SIGNAL( activated( int ) ), +// TQ_SLOT( slotRenderMode( int ) ) ); } void PMPart::slotVisibilityLevelChanged( int l ) diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp index 8281bd5b..a07fb683 100644 --- a/kpovmodeler/pmpatternedit.cpp +++ b/kpovmodeler/pmpatternedit.cpp @@ -284,52 +284,52 @@ void PMPatternEdit::createTopWidgets( ) topLayout( )->addWidget( m_pTurbulenceWidget ); /* connect all signals to slots/signals */ - connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboChanged( int ) ) ); + connect( m_pTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboChanged( int ) ) ); - connect( m_pAgateTurbulenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pAgateTurbulenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pCrackleForm, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCrackleMetric, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCrackleOffset, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCrackleSolid, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pCrackleForm, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCrackleMetric, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCrackleOffset, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCrackleSolid, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pDensityInterpolate, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDensityFile, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDensityFileBrowse, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDensityFileBrowseClicked( ) ) ); + connect( m_pDensityInterpolate, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDensityFile, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDensityFileBrowse, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDensityFileBrowseClicked( ) ) ); - connect( m_pGradientEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pGradientEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pJuliaComplex, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFractalMagnet, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFractalMagnetClicked( ) ) ); - connect( m_pFractalMagnetType, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxIterationsEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFractalExponent, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFractalExtType, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFractalExtFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFractalIntType, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFractalIntFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pJuliaComplex, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFractalMagnet, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFractalMagnetClicked( ) ) ); + connect( m_pFractalMagnetType, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxIterationsEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFractalExponent, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFractalExtType, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFractalExtFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFractalIntType, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFractalIntFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pQuiltControl0Edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pQuiltControl1Edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pQuiltControl0Edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pQuiltControl1Edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeDirection, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeLoSlope, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeHiSlope, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeAltFlag, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSlopeAltFlagClicked( ) ) ); - connect( m_pSlopeAltitude, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeLoAlt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeHiAlt, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeDirection, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeLoSlope, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeHiSlope, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeAltFlag, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSlopeAltFlagClicked( ) ) ); + connect( m_pSlopeAltitude, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeLoAlt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeHiAlt, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pSpiralNumberEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pSpiralNumberEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pNoiseGenerator, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pNoiseGenerator, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableTurbulenceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTurbulenceClicked( ) ) ); - connect( m_pValueVectorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOctavesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOmegaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLambdaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDepthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableTurbulenceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTurbulenceClicked( ) ) ); + connect( m_pValueVectorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOctavesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOmegaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLambdaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDepthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMPatternEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp index 612800f9..c2f55826 100644 --- a/kpovmodeler/pmphotonsedit.cpp +++ b/kpovmodeler/pmphotonsedit.cpp @@ -68,13 +68,13 @@ void PMPhotonsEdit::createTopWidgets( ) gl->addWidget( m_pPassThrough, 1, 1 ); gl->addWidget( m_pAreaLight, 1, 0 ); - connect( m_pTarget, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotTargetClicked( ) ) ); - connect( m_pSpacingMulti, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRefraction, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pReflection, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCollect, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPassThrough, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAreaLight, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pTarget, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotTargetClicked( ) ) ); + connect( m_pSpacingMulti, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRefraction, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pReflection, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCollect, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPassThrough, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAreaLight, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMPhotonsEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp index e7318830..3abdf7ca 100644 --- a/kpovmodeler/pmpigmentedit.cpp +++ b/kpovmodeler/pmpigmentedit.cpp @@ -37,7 +37,7 @@ void PMPigmentEdit::createTopWidgets() m_pUVMapping = new TQCheckBox( i18n( "UV mapping" ), this ); topLayout( )->addWidget( m_pUVMapping ); - connect( m_pUVMapping, TQT_SIGNAL( clicked() ), TQT_SIGNAL( dataChanged() ) ); + connect( m_pUVMapping, TQ_SIGNAL( clicked() ), TQ_SIGNAL( dataChanged() ) ); } void PMPigmentEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp index ada9c3f3..830e82ae 100644 --- a/kpovmodeler/pmplaneedit.cpp +++ b/kpovmodeler/pmplaneedit.cpp @@ -57,9 +57,9 @@ void PMPlaneEdit::createTopWidgets( ) layout->addWidget( nb ); layout->addStretch( 1 ); - connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( nb, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotNormalize( ) ) ); + connect( m_pNormal, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDistance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( nb, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotNormalize( ) ) ); } void PMPlaneEdit::slotNormalize( ) diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp index 0d06000c..9a2d162b 100644 --- a/kpovmodeler/pmpluginsettings.cpp +++ b/kpovmodeler/pmpluginsettings.cpp @@ -63,8 +63,8 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name ) gvl->addSpacing( 10 ); m_pPluginsList = new TQListView( gb ); - connect( m_pPluginsList, TQT_SIGNAL( selectionChanged( ) ), - TQT_SLOT( slotSelectionChanged( ) ) ); + connect( m_pPluginsList, TQ_SIGNAL( selectionChanged( ) ), + TQ_SLOT( slotSelectionChanged( ) ) ); m_pPluginsList->addColumn( i18n( "Name" ) ); m_pPluginsList->addColumn( i18n( "Description" ) ); m_pPluginsList->addColumn( i18n( "Status" ) ); @@ -73,7 +73,7 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name ) TQHBoxLayout* hl = new TQHBoxLayout( gvl ); m_pToggle = new TQPushButton( i18n( "Load" ), gb ); m_pToggle->setEnabled( false ); - connect( m_pToggle, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotToggle( ) ) ); + connect( m_pToggle, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotToggle( ) ) ); hl->addWidget( m_pToggle ); hl->addStretch( 1 ); diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp index e0e3a24c..90dd15c6 100644 --- a/kpovmodeler/pmpolynomedit.cpp +++ b/kpovmodeler/pmpolynomedit.cpp @@ -46,14 +46,14 @@ void PMPolynomEdit::createTopWidgets( ) m_pOrder = new TQSpinBox( 2, 7, 1, this ); hl->addWidget( m_pOrder ); hl->addStretch( 1 ); - connect( m_pOrder, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotOrderChanged( int ) ) ); + connect( m_pOrder, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotOrderChanged( int ) ) ); topLayout( )->addWidget( new TQLabel( i18n( "Formula:" ), this ) ); m_pPolyWidget = new TQWidget( this ); topLayout( )->addWidget( m_pPolyWidget ); m_pSturm = new TQCheckBox( i18n( "Sturm" ), this ); topLayout( )->addWidget( m_pSturm ); - connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMPolynomEdit::displayObject( PMObject* o ) @@ -135,7 +135,7 @@ void PMPolynomEdit::displayCoefficients( const PMVector& co, int cOrder, } edit = new PMFloatEdit( m_pPolyWidget ); - connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); m_edits.append( edit ); gl->addWidget( edit, row, col + 1 ); edit->show( ); diff --git a/kpovmodeler/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp index e7a41368..dadf5210 100644 --- a/kpovmodeler/pmpovraymatrixedit.cpp +++ b/kpovmodeler/pmpovraymatrixedit.cpp @@ -41,7 +41,7 @@ void PMPovrayMatrixEdit::createTopWidgets( ) for( i = 0; i < 12; i++ ) { m_pValue[i] = new PMFloatEdit( this ); - connect( m_pValue[i], TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pValue[i], TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } for( r = 0; r < 4; r++ ) diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp index 2154cce4..6186cc62 100644 --- a/kpovmodeler/pmpovrayoutputwidget.cpp +++ b/kpovmodeler/pmpovrayoutputwidget.cpp @@ -46,7 +46,7 @@ PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* parent, const char* name ) TQPushButton* closeButton = new KPushButton( KStdGuiItem::close(), this ); buttonLayout->addWidget( closeButton ); closeButton->setDefault( true ); - connect( closeButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( hide( ) ) ); + connect( closeButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( hide( ) ) ); setCaption( i18n( "Povray Output" ) ); resize( s_size ); diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index cc5564d4..0c33490c 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -87,12 +87,12 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene, m_pTempFile->close( ); m_pProcess = new TDEProcess( ); - connect( m_pProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - TQT_SLOT( slotPovrayImage( TDEProcess*, char*, int ) ) ); - connect( m_pProcess, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - TQT_SLOT( slotPovrayMessage( TDEProcess*, char*, int ) ) ); - connect( m_pProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), - TQT_SLOT( slotRenderingFinished( TDEProcess* ) ) ); + connect( m_pProcess, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + TQ_SLOT( slotPovrayImage( TDEProcess*, char*, int ) ) ); + connect( m_pProcess, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + TQ_SLOT( slotPovrayMessage( TDEProcess*, char*, int ) ) ); + connect( m_pProcess, TQ_SIGNAL( processExited( TDEProcess* ) ), + TQ_SLOT( slotRenderingFinished( TDEProcess* ) ) ); *m_pProcess << s_povrayCommand; diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp index f3955b78..e9cf41cf 100644 --- a/kpovmodeler/pmpovraysettings.cpp +++ b/kpovmodeler/pmpovraysettings.cpp @@ -56,8 +56,8 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) hlayout->addWidget( m_pPovrayCommand ); m_pBrowsePovrayCommand = new TQPushButton( gb ); m_pBrowsePovrayCommand->setPixmap( SmallIcon( "document-open" ) ); - connect( m_pBrowsePovrayCommand, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotBrowsePovrayCommand( ) ) ); + connect( m_pBrowsePovrayCommand, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotBrowsePovrayCommand( ) ) ); hlayout->addWidget( m_pBrowsePovrayCommand ); vlayout->addWidget( gb ); @@ -70,8 +70,8 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) hlayout->addWidget( m_pDocumentationPath ); m_pBrowseDocumentationPath = new TQPushButton( gb ); m_pBrowseDocumentationPath->setPixmap( SmallIcon( "document-open" ) ); - connect( m_pBrowseDocumentationPath, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotBrowsePovrayDocumentation( ) ) ); + connect( m_pBrowseDocumentationPath, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotBrowsePovrayDocumentation( ) ) ); hlayout->addWidget( m_pBrowseDocumentationPath ); vlayout->addWidget( gb ); hlayout = new TQHBoxLayout( gvl ); @@ -89,28 +89,28 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) gvl->addSpacing( 10 ); hlayout = new TQHBoxLayout( gvl ); m_pLibraryPaths = new TQListBox( gb ); - connect( m_pLibraryPaths, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotPathSelected( int ) ) ); + connect( m_pLibraryPaths, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotPathSelected( int ) ) ); hlayout->addWidget( m_pLibraryPaths ); TQVBoxLayout* bl = new TQVBoxLayout( hlayout ); m_pAddLibraryPath = new TQPushButton( i18n( "Add..." ), gb ); - connect( m_pAddLibraryPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPath( ) ) ); + connect( m_pAddLibraryPath, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPath( ) ) ); bl->addWidget( m_pAddLibraryPath ); m_pRemoveLibraryPath = new TQPushButton( i18n( "Remove" ), gb ); - connect( m_pRemoveLibraryPath, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotRemovePath( ) ) ); + connect( m_pRemoveLibraryPath, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotRemovePath( ) ) ); bl->addWidget( m_pRemoveLibraryPath ); m_pChangeLibraryPath = new TQPushButton( i18n( "Edit..." ), gb ); - connect( m_pChangeLibraryPath, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotEditPath( ) ) ); + connect( m_pChangeLibraryPath, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotEditPath( ) ) ); bl->addWidget( m_pChangeLibraryPath ); m_pLibraryPathUp = new TQPushButton( i18n( "Up" ), gb ); - connect( m_pLibraryPathUp, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotPathUp( ) ) ); + connect( m_pLibraryPathUp, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotPathUp( ) ) ); bl->addWidget( m_pLibraryPathUp ); m_pLibraryPathDown = new TQPushButton( i18n( "Down" ), gb ); - connect( m_pLibraryPathDown, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotPathDown( ) ) ); + connect( m_pLibraryPathDown, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotPathDown( ) ) ); bl->addWidget( m_pLibraryPathDown ); bl->addStretch( 1 ); vlayout->addWidget( gb ); diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index ac1162c2..99c81742 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -85,25 +85,25 @@ PMPovrayWidget::PMPovrayWidget( TQWidget* parent, const char* name ) TQPushButton* closeButton = new KPushButton( KStdGuiItem::close(), this ); buttonLayout->addWidget( closeButton ); - connect( m_pRenderWidget, TQT_SIGNAL( finished( int ) ), - TQT_SLOT( slotRenderingFinished( int ) ) ); - connect( m_pRenderWidget, TQT_SIGNAL( progress( int ) ), - TQT_SLOT( slotProgress( int ) ) ); - connect( m_pRenderWidget, TQT_SIGNAL( lineFinished( int ) ), - TQT_SLOT( slotLineFinished( int ) ) ); - - connect( m_pStopButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotStop( ) ) ); - connect( m_pSuspendButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSuspend( ) ) ); - connect( m_pResumeButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotResume( ) ) ); - connect( m_pSaveButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSave( ) ) ); - connect( closeButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClose( ) ) ); - connect( m_pPovrayOutputButton, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotPovrayOutput( ) ) ); + connect( m_pRenderWidget, TQ_SIGNAL( finished( int ) ), + TQ_SLOT( slotRenderingFinished( int ) ) ); + connect( m_pRenderWidget, TQ_SIGNAL( progress( int ) ), + TQ_SLOT( slotProgress( int ) ) ); + connect( m_pRenderWidget, TQ_SIGNAL( lineFinished( int ) ), + TQ_SLOT( slotLineFinished( int ) ) ); + + connect( m_pStopButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotStop( ) ) ); + connect( m_pSuspendButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSuspend( ) ) ); + connect( m_pResumeButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotResume( ) ) ); + connect( m_pSaveButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotSave( ) ) ); + connect( closeButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotClose( ) ) ); + connect( m_pPovrayOutputButton, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotPovrayOutput( ) ) ); m_bRunning = false; m_pProgressTimer = new TQTimer( this ); - connect( m_pProgressTimer, TQT_SIGNAL( timeout( ) ), - TQT_SLOT( slotUpdateSpeed( ) ) ); + connect( m_pProgressTimer, TQ_SIGNAL( timeout( ) ), + TQ_SLOT( slotUpdateSpeed( ) ) ); setCaption( i18n( "Render Window" ) ); @@ -111,8 +111,8 @@ PMPovrayWidget::PMPovrayWidget( TQWidget* parent, const char* name ) m_stopped = false; m_pPovrayOutputWidget = new PMPovrayOutputWidget( ); - connect( m_pRenderWidget, TQT_SIGNAL( povrayMessage( const TQString& ) ), - m_pPovrayOutputWidget, TQT_SLOT( slotText( const TQString& ) ) ); + connect( m_pRenderWidget, TQ_SIGNAL( povrayMessage( const TQString& ) ), + m_pPovrayOutputWidget, TQ_SLOT( slotText( const TQString& ) ) ); } PMPovrayWidget::~PMPovrayWidget( ) diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp index 04a2df94..a8cb9ce1 100644 --- a/kpovmodeler/pmprismedit.cpp +++ b/kpovmodeler/pmprismedit.cpp @@ -65,22 +65,22 @@ void PMPrismEdit::createTopWidgets( ) m_pSweepType->insertItem( i18n( "Conic Sweep" ) ); hl->addWidget( m_pSweepType ); - connect( m_pSplineType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotTypeChanged( int ) ) ); - connect( m_pSweepType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotSweepChanged( int ) ) ); + connect( m_pSplineType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotTypeChanged( int ) ) ); + connect( m_pSweepType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotSweepChanged( int ) ) ); hl = new TQHBoxLayout( topLayout( ) ); TQGridLayout* gl = new TQGridLayout( hl, 2, 2 ); gl->addWidget( new TQLabel( i18n( "Height 1:" ), this ), 0, 0 ); m_pHeight1 = new PMFloatEdit( this ); gl->addWidget( m_pHeight1, 0, 1 ); - connect( m_pHeight1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pHeight1, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); gl->addWidget( new TQLabel( i18n( "Height 2:" ), this ), 1, 0 ); m_pHeight2 = new PMFloatEdit( this ); gl->addWidget( m_pHeight2, 1, 1 ); - connect( m_pHeight2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pHeight2, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); hl->addStretch( 1 ); } @@ -92,8 +92,8 @@ void PMPrismEdit::createBottomWidgets( ) topLayout( )->addWidget( m_pOpen ); m_pSturm = new TQCheckBox( i18n( "Sturm" ), this ); topLayout( )->addWidget( m_pSturm ); - connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); Base::createBottomWidgets( ); } @@ -216,7 +216,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp ) button = new TQPushButton( m_pEditWidget ); button->setPixmap( addPrismPixmap ); m_subPrismAddButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddSubPrism( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddSubPrism( ) ) ); hl->addWidget( button ); button->show( ); TQToolTip::add( button, i18n( "Add sub prism" ) ); @@ -224,7 +224,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp ) button = new TQPushButton( m_pEditWidget ); button->setPixmap( removePixmap ); m_subPrismRemoveButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemoveSubPrism( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemoveSubPrism( ) ) ); hl->addWidget( button ); button->show( ); if( sp.size( ) < 2 ) @@ -235,9 +235,9 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp ) vle = new PMVectorListEdit( "x", "z", m_pEditWidget ); m_points.append( vle ); - connect( vle, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( vle, TQT_SIGNAL( selectionChanged( ) ), - TQT_SLOT( slotSelectionChanged( ) ) ); + connect( vle, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( vle, TQ_SIGNAL( selectionChanged( ) ), + TQ_SLOT( slotSelectionChanged( ) ) ); hl->addWidget( vle, 2 ); vle->show( ); @@ -245,19 +245,19 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp ) button = new TQPushButton( m_pEditWidget ); button->setPixmap( SmallIcon( "pmaddpointabove" ) ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) ); m_addAboveButtons.append( button ); button->show( ); vl->addWidget( button ); button = new TQPushButton( m_pEditWidget ); button->setPixmap( SmallIcon( "pmaddpoint" ) ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) ); m_addBelowButtons.append( button ); button->show( ); vl->addWidget( button ); button = new TQPushButton( m_pEditWidget ); button->setPixmap( SmallIcon( "pmremovepoint" ) ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) ); m_removeButtons.append( button ); button->show( ); vl->addWidget( button ); @@ -277,7 +277,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp ) button = new TQPushButton( m_pEditWidget ); button->setPixmap( addPrismPixmap ); m_subPrismAddButtons.append( button ); - connect( button, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddSubPrism( ) ) ); + connect( button, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddSubPrism( ) ) ); hl->addWidget( button ); button->show( ); TQToolTip::add( button, i18n( "Append sub prism" ) ); diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp index ba54311e..840f135c 100644 --- a/kpovmodeler/pmquickcoloredit.cpp +++ b/kpovmodeler/pmquickcoloredit.cpp @@ -41,7 +41,7 @@ void PMQuickColorEdit::createTopWidgets( ) layout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop ); layout->addWidget( m_pColorEdit ); - connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMQuickColorEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp index 670c2c04..7697949d 100644 --- a/kpovmodeler/pmradiosityedit.cpp +++ b/kpovmodeler/pmradiosityedit.cpp @@ -128,21 +128,21 @@ void PMRadiosityEdit::createTopWidgets( ) hl->addStretch( 1 ); - connect( m_pAdcBailout, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAlwaysSample, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pBrightness, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pCount, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pErrorBound, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pGrayThreshold, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLowErrorFactor, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMaxSample, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMedia, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMinimumReuse, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNearestCount, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pNormal, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPretraceStart, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPretraceEnd, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRecursionLimit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pAdcBailout, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAlwaysSample, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pBrightness, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pCount, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pErrorBound, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pGrayThreshold, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLowErrorFactor, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMaxSample, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMedia, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMinimumReuse, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNearestCount, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pNormal, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPretraceStart, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPretraceEnd, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRecursionLimit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMRadiosityEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp index a347e442..4448c140 100644 --- a/kpovmodeler/pmrainbowedit.cpp +++ b/kpovmodeler/pmrainbowedit.cpp @@ -92,22 +92,22 @@ void PMRainbowEdit::createTopWidgets( ) gl->addWidget( m_pFalloffAngleEdit, 1, 1 ); hl->addStretch( 1 ); - connect( m_pDirectionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pAngleEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pWidthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDistanceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pJitterEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pUpEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pArcAngleEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFalloffAngleEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pEnableDirectionEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDirectionClicked( ) ) ); - connect( m_pEnableAngleEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAngleClicked( ) ) ); - connect( m_pEnableWidthEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotWidthClicked( ) ) ); - connect( m_pEnableDistanceEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDistanceClicked( ) ) ); - connect( m_pEnableJitterEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotJitterClicked( ) ) ); - connect( m_pEnableUpEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUpClicked( ) ) ); - connect( m_pEnableArcAngleEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotArcAngleClicked( ) ) ); - connect( m_pEnableFalloffAngleEdit, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotFalloffAngleClicked( ) ) ); + connect( m_pDirectionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pAngleEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pWidthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDistanceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pJitterEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pUpEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pArcAngleEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFalloffAngleEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pEnableDirectionEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDirectionClicked( ) ) ); + connect( m_pEnableAngleEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAngleClicked( ) ) ); + connect( m_pEnableWidthEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotWidthClicked( ) ) ); + connect( m_pEnableDistanceEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDistanceClicked( ) ) ); + connect( m_pEnableJitterEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotJitterClicked( ) ) ); + connect( m_pEnableUpEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUpClicked( ) ) ); + connect( m_pEnableArcAngleEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotArcAngleClicked( ) ) ); + connect( m_pEnableFalloffAngleEdit, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotFalloffAngleClicked( ) ) ); } void PMRainbowEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp index f1d88516..f431d89a 100644 --- a/kpovmodeler/pmrawedit.cpp +++ b/kpovmodeler/pmrawedit.cpp @@ -42,7 +42,7 @@ void PMRawEdit::createTopWidgets( ) m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) ); topLayout( )->addWidget( m_pEdit, 2 ); - connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pEdit, TQ_SIGNAL( textChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMRawEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp index f81cb7ee..9c1b9c78 100644 --- a/kpovmodeler/pmrendermodesdialog.cpp +++ b/kpovmodeler/pmrendermodesdialog.cpp @@ -50,20 +50,20 @@ PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* par TQVBox* mainPage = makeVBoxMainWidget( ); m_pListBox = new TQListBox( mainPage ); - connect( m_pListBox, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotModeSelected( int ) ) ); + connect( m_pListBox, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( slotModeSelected( int ) ) ); TQHBox* buttons = new TQHBox( mainPage ); buttons->setSpacing( KDialog::spacingHint( ) ); m_pAddButton = new TQPushButton( i18n( "Add" ), buttons ); - connect( m_pAddButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAdd( ) ) ); + connect( m_pAddButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAdd( ) ) ); m_pRemoveButton = new TQPushButton( i18n( "Remove" ), buttons ); - connect( m_pRemoveButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemove( ) ) ); + connect( m_pRemoveButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemove( ) ) ); m_pEditButton = new TQPushButton( i18n( "Edit..." ), buttons ); - connect( m_pEditButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotEdit( ) ) ); + connect( m_pEditButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotEdit( ) ) ); m_pUpButton = new TQPushButton( i18n( "Up" ), buttons ); - connect( m_pUpButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotUp( ) ) ); + connect( m_pUpButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotUp( ) ) ); m_pDownButton = new TQPushButton( i18n( "Down" ), buttons ); - connect( m_pDownButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotDown( ) ) ); + connect( m_pDownButton, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotDown( ) ) ); m_pRemoveButton->setEnabled( false ); m_pUpButton->setEnabled( false ); @@ -73,7 +73,7 @@ PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* par resize( s_size ); displayList( ); - connect( m_pListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQT_SLOT(slotEdit( ) ) ); + connect( m_pListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQ_SLOT(slotEdit( ) ) ); } void PMRenderModesDialog::slotChanged( ) @@ -367,22 +367,22 @@ PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, co enableButtonOK( false ); // connect signals - connect( m_pDescriptionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_pHeightEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pWidthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pSubsectionBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotSubsectionToggled( bool ) ) ); - connect( m_pStartRowEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pEndRowEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pStartColumnEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pEndColumnEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pQualityCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotActivated( int ) ) ); - connect( m_pAntialiasingBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotAntialiasingToggled( bool ) ) ); - connect( m_pSamplingCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotActivated( int ) ) ); - connect( m_pThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pJitterBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotJitterToggled( bool ) ) ); - connect( m_pJitterAmountEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pAntialiasDepthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) ); - connect( m_pAlphaBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggled( bool ) ) ); + connect( m_pDescriptionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_pHeightEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pWidthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pSubsectionBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotSubsectionToggled( bool ) ) ); + connect( m_pStartRowEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pEndRowEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pStartColumnEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pEndColumnEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pQualityCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotActivated( int ) ) ); + connect( m_pAntialiasingBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotAntialiasingToggled( bool ) ) ); + connect( m_pSamplingCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotActivated( int ) ) ); + connect( m_pThresholdEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pJitterBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotJitterToggled( bool ) ) ); + connect( m_pJitterAmountEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pAntialiasDepthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SLOT( slotChanged( ) ) ); + connect( m_pAlphaBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggled( bool ) ) ); } void PMRenderModeDialog::saveConfig( TDEConfig* cfg ) diff --git a/kpovmodeler/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp index d0d366d4..342d1887 100644 --- a/kpovmodeler/pmrotateedit.cpp +++ b/kpovmodeler/pmrotateedit.cpp @@ -37,7 +37,7 @@ void PMRotateEdit::createTopWidgets( ) m_pVector = new PMVectorEdit( "x", "y", "z", this ); topLayout( )->addWidget( m_pVector ); - connect( m_pVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMRotateEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp index 4e94dcf2..8d0dc25b 100644 --- a/kpovmodeler/pmscaleedit.cpp +++ b/kpovmodeler/pmscaleedit.cpp @@ -37,7 +37,7 @@ void PMScaleEdit::createTopWidgets( ) m_pVector = new PMVectorEdit( "x", "y", "z", this ); topLayout( )->addWidget( m_pVector ); - connect( m_pVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMScaleEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp index 9badbd07..2b092c4a 100644 --- a/kpovmodeler/pmsettingsdialog.cpp +++ b/kpovmodeler/pmsettingsdialog.cpp @@ -229,8 +229,8 @@ void PMSettingsDialog::registerPage( TQWidget* topPage, else { m_pages.push_back( PMRegisteredSettingsPage( topPage, page, i ) ); - connect( page, TQT_SIGNAL( repaintViews( ) ), TQT_SLOT( slotRepaint( ) ) ); - connect( page, TQT_SIGNAL( showMe( ) ), TQT_SLOT( slotShowPage( ) ) ); + connect( page, TQ_SIGNAL( repaintViews( ) ), TQ_SLOT( slotRepaint( ) ) ); + connect( page, TQ_SIGNAL( showMe( ) ), TQ_SLOT( slotShowPage( ) ) ); } } diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index a48b75a1..2932eccc 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -81,9 +81,9 @@ PMShell::PMShell( const KURL& url ) openURL( url ); setCaption( url.prettyURL( ) ); - connect( m_pPart, TQT_SIGNAL( modified( ) ), TQT_SLOT( slotModified( ) ) ); - connect( m_pPart, TQT_SIGNAL( controlPointMessage( const TQString& ) ), - TQT_SLOT( slotControlPointMsg( const TQString& ) ) ); + connect( m_pPart, TQ_SIGNAL( modified( ) ), TQ_SLOT( slotModified( ) ) ); + connect( m_pPart, TQ_SIGNAL( controlPointMessage( const TQString& ) ), + TQ_SLOT( slotControlPointMsg( const TQString& ) ) ); } PMShell::~PMShell( ) @@ -95,67 +95,67 @@ void PMShell::setupActions( ) // m_helpMenu = new KHelpMenu( this, PMFactory::aboutData( ), true, // actionCollection( ) ); - KStdAction::openNew( this, TQT_SLOT( slotFileNew( ) ), actionCollection( ) ); - KStdAction::open( this, TQT_SLOT( slotFileOpen( ) ), actionCollection( ) ); - m_pRecent = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT( slotFileNew( ) ), actionCollection( ) ); + KStdAction::open( this, TQ_SLOT( slotFileOpen( ) ), actionCollection( ) ); + m_pRecent = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL& ) ), actionCollection( ) ); - KStdAction::save( this, TQT_SLOT( slotFileSave( ) ), actionCollection( ) ); - KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) ); + KStdAction::save( this, TQ_SLOT( slotFileSave( ) ), actionCollection( ) ); + KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs( ) ), actionCollection( ) ); - KStdAction::revert( this, TQT_SLOT( slotFileRevert( ) ), actionCollection( ) ); - KStdAction::print( this, TQT_SLOT( slotFilePrint( ) ), actionCollection( ) ); + KStdAction::revert( this, TQ_SLOT( slotFileRevert( ) ), actionCollection( ) ); + KStdAction::print( this, TQ_SLOT( slotFilePrint( ) ), actionCollection( ) ); - KStdAction::close( this, TQT_SLOT( slotFileClose( ) ), actionCollection( ) ); - KStdAction::quit( this, TQT_SLOT( close( ) ), actionCollection( ) ); + KStdAction::close( this, TQ_SLOT( slotFileClose( ) ), actionCollection( ) ); + KStdAction::quit( this, TQ_SLOT( close( ) ), actionCollection( ) ); m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, this, - TQT_SLOT( slotShowPath( ) ), actionCollection( ), + TQ_SLOT( slotShowPath( ) ), actionCollection( ), "options_show_path" ); m_pPathAction->setCheckedState(i18n("Hide &Path")); - m_pStatusbarAction = KStdAction::showStatusbar( this, TQT_SLOT( slotShowStatusbar( ) ), + m_pStatusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( slotShowStatusbar( ) ), actionCollection( ) ); - KStdAction::saveOptions( this, TQT_SLOT( saveOptions( ) ), actionCollection( ) ); + KStdAction::saveOptions( this, TQ_SLOT( saveOptions( ) ), actionCollection( ) ); - KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys( ) ), + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys( ) ), actionCollection( ) ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars( ) ), + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars( ) ), actionCollection( ) ); - KStdAction::preferences( this, TQT_SLOT( slotSettings( ) ), actionCollection( ) ); + KStdAction::preferences( this, TQ_SLOT( slotSettings( ) ), actionCollection( ) ); m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, this, - TQT_SLOT( slotNewTopView( ) ), + TQ_SLOT( slotNewTopView( ) ), actionCollection( ), "view_new_topview" ); m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, this, - TQT_SLOT( slotNewBottomView( ) ), + TQ_SLOT( slotNewBottomView( ) ), actionCollection( ), "view_new_bottomview" ); m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, this, - TQT_SLOT( slotNewLeftView( ) ), + TQ_SLOT( slotNewLeftView( ) ), actionCollection( ), "view_new_leftview" ); m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, this, - TQT_SLOT( slotNewRightView( ) ), + TQ_SLOT( slotNewRightView( ) ), actionCollection( ), "view_new_rightview" ); m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, this, - TQT_SLOT( slotNewFrontView( ) ), + TQ_SLOT( slotNewFrontView( ) ), actionCollection( ), "view_new_frontview" ); m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, this, - TQT_SLOT( slotNewBackView( ) ), + TQ_SLOT( slotNewBackView( ) ), actionCollection( ), "view_new_back_view" ); m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, this, - TQT_SLOT( slotNewCameraView( ) ), + TQ_SLOT( slotNewCameraView( ) ), actionCollection( ), "view_new_cameraview" ); m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, this, - TQT_SLOT( slotNewTreeView( ) ), actionCollection( ), + TQ_SLOT( slotNewTreeView( ) ), actionCollection( ), "view_new_treeview" ); m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, this, - TQT_SLOT( slotNewDialogView( ) ), actionCollection( ), + TQ_SLOT( slotNewDialogView( ) ), actionCollection( ), "view_new_dialogview" ); #ifdef KPM_WITH_OBJECT_LIBRARY m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, this, - TQT_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ), + TQ_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ), "view_new_librarybrowser" ); #endif @@ -163,12 +163,12 @@ void PMShell::setupActions( ) m_pViewLayoutsAction = new TDEActionMenu( i18n( "View Layouts" ), actionCollection( ), "view_layouts_menu" ); TDEPopupMenu* menu = m_pViewLayoutsAction->popupMenu( ); - connect( menu, TQT_SIGNAL( aboutToShow( ) ), TQT_SLOT( slotViewsMenuAboutToShow( ) ) ); + connect( menu, TQ_SIGNAL( aboutToShow( ) ), TQ_SLOT( slotViewsMenuAboutToShow( ) ) ); PMViewLayoutManager::theManager( )->fillPopupMenu( menu ); - connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSelectedLayout( int ) ) ); + connect( menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotSelectedLayout( int ) ) ); m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, this, - TQT_SLOT( slotSaveViewLayout( ) ), + TQ_SLOT( slotSaveViewLayout( ) ), actionCollection( ), "save_view_layout" ); } @@ -214,8 +214,8 @@ PMDockWidget* PMShell::createView( const TQString& t, PMViewOptions* o, } dock->setWidget( contents ); - connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ), - TQT_SLOT( slotDockWidgetClosed( ) ) ); + connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ), + TQ_SLOT( slotDockWidgetClosed( ) ) ); if( initPosition ) { @@ -238,8 +238,8 @@ PMDockWidget* PMShell::createTreeView( ) PMTreeView* tv = new PMTreeView( m_pPart, dock ); dock->setWidget( tv ); - connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ), - TQT_SLOT( slotDockWidgetClosed( ) ) ); + connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ), + TQ_SLOT( slotDockWidgetClosed( ) ) ); return dock; } @@ -255,8 +255,8 @@ PMDockWidget* PMShell::createDialogView( ) PMDialogView* dv = new PMDialogView( m_pPart, dock ); dock->setWidget( dv ); - connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ), - TQT_SLOT( slotDockWidgetClosed( ) ) ); + connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ), + TQ_SLOT( slotDockWidgetClosed( ) ) ); return dock; } @@ -271,12 +271,12 @@ PMDockWidget* PMShell::create3DView( PMGLView::PMViewType t ) dock->setDockSite( PMDockWidget::DockFullSite ); PMGLView* vgl = new PMGLView( m_pPart, t, dock ); dock->setWidget( vgl ); - connect( vgl, TQT_SIGNAL( viewTypeChanged( const TQString& ) ), - dock, TQT_SLOT( slotSetCaption( const TQString& ) ) ); + connect( vgl, TQ_SIGNAL( viewTypeChanged( const TQString& ) ), + dock, TQ_SLOT( slotSetCaption( const TQString& ) ) ); dock->slotSetCaption( PMGLView::viewTypeAsString( t ) ); - connect( dock, TQT_SIGNAL( headerCloseButtonClicked( ) ), - TQT_SLOT( slotDockWidgetClosed( ) ) ); + connect( dock, TQ_SIGNAL( headerCloseButtonClicked( ) ), + TQ_SLOT( slotDockWidgetClosed( ) ) ); return dock; } @@ -347,7 +347,7 @@ void PMShell::slotDockWidgetClosed( ) if( m_objectsToDelete.containsRef( o ) == 0 ) { m_objectsToDelete.append( o ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteClosedObjects( ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteClosedObjects( ) ) ); } } } @@ -377,7 +377,7 @@ void PMShell::openURL( const KURL& url ) void PMShell::slotOpenRecent( const KURL& url ) { m_openRecentURL = url; - TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenRecentTimer( ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenRecentTimer( ) ) ); } void PMShell::slotOpenRecentTimer( ) @@ -533,8 +533,8 @@ void PMShell::slotConfigureToolbars( ) { saveMainWindowSettings( TDEGlobal::config( ), "Appearance" ); KEditToolbar dlg( factory( ) ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig( ) ), - this, TQT_SLOT( slotNewToolbarConfig( ) ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig( ) ), + this, TQ_SLOT( slotNewToolbarConfig( ) ) ); dlg.exec( ); } diff --git a/kpovmodeler/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp index 16930e02..356393f0 100644 --- a/kpovmodeler/pmslopeedit.cpp +++ b/kpovmodeler/pmslopeedit.cpp @@ -54,8 +54,8 @@ void PMSlopeEdit::createTopWidgets( ) gl->addWidget( m_pSlopeEdit, 1, 1 ); hl->addStretch( 1 ); - connect( m_pHeightEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSlopeEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pHeightEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSlopeEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMSlopeEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp index 52e27f73..dd62cd07 100644 --- a/kpovmodeler/pmsolidcoloredit.cpp +++ b/kpovmodeler/pmsolidcoloredit.cpp @@ -42,7 +42,7 @@ void PMSolidColorEdit::createTopWidgets( ) layout->addWidget( label, 0, AlignTop ); layout->addWidget( m_pColorEdit ); - connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pColorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMSolidColorEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp index 98c4c7ca..ea379081 100644 --- a/kpovmodeler/pmsolidobjectedit.cpp +++ b/kpovmodeler/pmsolidobjectedit.cpp @@ -39,8 +39,8 @@ void PMSolidObjectEdit::createBottomWidgets( ) topLayout( )->addWidget( m_pInverseButton ); topLayout( )->addWidget( m_pHollowButton ); - connect( m_pHollowButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pInverseButton, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pHollowButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pInverseButton, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); Base::createBottomWidgets( ); } diff --git a/kpovmodeler/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp index 03179ea2..e6afdb96 100644 --- a/kpovmodeler/pmsoredit.cpp +++ b/kpovmodeler/pmsoredit.cpp @@ -43,9 +43,9 @@ void PMSurfaceOfRevolutionEdit::createBottomWidgets( ) topLayout( )->addWidget( new TQLabel( i18n( "Spline points:" ), this ) ); m_pPoints = new PMVectorListEdit( "u", "v", this ); - connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ), - TQT_SLOT( slotSelectionChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ), + TQ_SLOT( slotSelectionChanged( ) ) ); TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) ); hl->addWidget( m_pPoints, 2 ); @@ -55,9 +55,9 @@ void PMSurfaceOfRevolutionEdit::createBottomWidgets( ) m_pAddBelow->setPixmap( SmallIcon( "pmaddpoint" ) ); m_pRemove = new TQPushButton( this ); m_pRemove->setPixmap( SmallIcon( "pmremovepoint" ) ); - connect( m_pAddAbove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) ); - connect( m_pAddBelow, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) ); - connect( m_pRemove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) ); + connect( m_pAddAbove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) ); + connect( m_pAddBelow, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) ); + connect( m_pRemove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) ); TQVBoxLayout* bl = new TQVBoxLayout( hl ); bl->addWidget( m_pAddAbove ); @@ -67,10 +67,10 @@ void PMSurfaceOfRevolutionEdit::createBottomWidgets( ) m_pOpen = new TQCheckBox( i18n( "type of the object", "Open" ), this ); topLayout( )->addWidget( m_pOpen ); - connect( m_pOpen, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pOpen, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); m_pSturm = new TQCheckBox( i18n( "Sturm" ), this ); topLayout( )->addWidget( m_pSturm ); - connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); Base::createBottomWidgets( ); } diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp index 31406d5e..5dbc1a16 100644 --- a/kpovmodeler/pmsphereedit.cpp +++ b/kpovmodeler/pmsphereedit.cpp @@ -50,8 +50,8 @@ void PMSphereEdit::createTopWidgets( ) layout->addWidget( m_pRadius ); layout->addStretch( 1 ); - connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pCentre, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMSphereEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp index 06ae4ec1..92656913 100644 --- a/kpovmodeler/pmspheresweepedit.cpp +++ b/kpovmodeler/pmspheresweepedit.cpp @@ -53,8 +53,8 @@ void PMSphereSweepEdit::createTopWidgets( ) hl->addWidget( m_pSplineType ); hl->addStretch( 1 ); - connect( m_pSplineType, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_pSplineType, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotTypeChanged( int ) ) ); } void PMSphereSweepEdit::createBottomWidgets( ) @@ -62,9 +62,9 @@ void PMSphereSweepEdit::createBottomWidgets( ) topLayout( )->addWidget( new TQLabel( i18n( "Spheres:" ), this ) ); m_pPoints = new PMVectorListEdit( "x", "y", "z", "r", this ); - connect( m_pPoints, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pPoints, TQT_SIGNAL( selectionChanged( ) ), - TQT_SLOT( slotSelectionChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pPoints, TQ_SIGNAL( selectionChanged( ) ), + TQ_SLOT( slotSelectionChanged( ) ) ); TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) ); hl->addWidget( m_pPoints, 2 ); @@ -74,9 +74,9 @@ void PMSphereSweepEdit::createBottomWidgets( ) m_pAddBelow->setPixmap( SmallIcon( "pmaddpoint" ) ); m_pRemove = new TQPushButton( this ); m_pRemove->setPixmap( SmallIcon( "pmremovepoint" ) ); - connect( m_pAddAbove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointAbove( ) ) ); - connect( m_pAddBelow, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPointBelow( ) ) ); - connect( m_pRemove, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotRemovePoint( ) ) ); + connect( m_pAddAbove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointAbove( ) ) ); + connect( m_pAddBelow, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotAddPointBelow( ) ) ); + connect( m_pRemove, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotRemovePoint( ) ) ); TQVBoxLayout* bl = new TQVBoxLayout( hl ); bl->addWidget( m_pAddAbove ); @@ -89,7 +89,7 @@ void PMSphereSweepEdit::createBottomWidgets( ) m_pTolerance = new PMFloatEdit( this ); m_pTolerance->setValidation( true, 0, false, 0 ); hl->addWidget( m_pTolerance ); - connect( m_pTolerance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pTolerance, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); Base::createBottomWidgets( ); } diff --git a/kpovmodeler/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp index f802b22f..5ac86ca5 100644 --- a/kpovmodeler/pmsqeedit.cpp +++ b/kpovmodeler/pmsqeedit.cpp @@ -49,8 +49,8 @@ void PMSuperquadricEllipsoidEdit::createTopWidgets( ) gl->addWidget( m_pValueN, 1, 1 ); hl->addStretch( 1 ); - connect( m_pValueE, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pValueN, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pValueE, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pValueN, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMSuperquadricEllipsoidEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp index 7bf7a3ae..a7c065aa 100644 --- a/kpovmodeler/pmtextedit.cpp +++ b/kpovmodeler/pmtextedit.cpp @@ -63,16 +63,16 @@ void PMTextEdit::createTopWidgets( ) m_pOffset = new PMVectorEdit( "x", "y", this ); hl->addWidget( m_pOffset ); - connect( m_pFont, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_pChooseFont, TQT_SIGNAL( clicked( ) ), - TQT_SLOT( slotChooseFont( ) ) ); - connect( m_pText, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_pThickness, TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOffset, TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pFont, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_pChooseFont, TQ_SIGNAL( clicked( ) ), + TQ_SLOT( slotChooseFont( ) ) ); + connect( m_pText, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_pThickness, TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOffset, TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); } void PMTextEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp index ad68341d..16537e7b 100644 --- a/kpovmodeler/pmtexturebaseedit.cpp +++ b/kpovmodeler/pmtexturebaseedit.cpp @@ -37,7 +37,7 @@ void PMTextureBaseEdit::createTopWidgets( ) Base::createTopWidgets( ); m_pLinkEdit = new PMLinkEdit( this ); topLayout( )->addWidget( m_pLinkEdit ); - connect( m_pLinkEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pLinkEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp index 59ae2908..cdc62c93 100644 --- a/kpovmodeler/pmtextureedit.cpp +++ b/kpovmodeler/pmtextureedit.cpp @@ -37,7 +37,7 @@ void PMTextureEdit::createTopWidgets() m_pUVMapping = new TQCheckBox( i18n( "UV mapping" ), this ); topLayout( )->addWidget( m_pUVMapping ); - connect( m_pUVMapping, TQT_SIGNAL( clicked() ), TQT_SIGNAL( dataChanged() ) ); + connect( m_pUVMapping, TQ_SIGNAL( clicked() ), TQ_SIGNAL( dataChanged() ) ); } void PMTextureEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp index ad5545d8..6eb277dd 100644 --- a/kpovmodeler/pmtexturemapedit.cpp +++ b/kpovmodeler/pmtexturemapedit.cpp @@ -78,7 +78,7 @@ void PMTextureMapEdit::displayObject( PMObject* o ) edit->setValue( *vit ); edit->setValidation( true, 0.0, true, 1.0 ); edit->setReadOnly( readOnly ); - connect( edit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( edit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } m_numValues++; } diff --git a/kpovmodeler/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp index 596297bf..37a63484 100644 --- a/kpovmodeler/pmtorusedit.cpp +++ b/kpovmodeler/pmtorusedit.cpp @@ -54,9 +54,9 @@ void PMTorusEdit::createTopWidgets( ) topLayout( )->addWidget( m_pSturm ); - connect( m_pMinorRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMajorRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pSturm, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pMinorRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMajorRadius, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pSturm, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMTorusEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp index 51c5cdbe..33a9a1ba 100644 --- a/kpovmodeler/pmtranslateedit.cpp +++ b/kpovmodeler/pmtranslateedit.cpp @@ -37,7 +37,7 @@ void PMTranslateEdit::createTopWidgets( ) m_pVector = new PMVectorEdit( "x", "y", "z", this ); topLayout( )->addWidget( m_pVector ); - connect( m_pVector, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pVector, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMTranslateEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index d6597b97..99499d83 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -79,12 +79,12 @@ PMTreeView::PMTreeView( PMPart* part, TQWidget* parent /*= 0*/, setFocusPolicy( TQWidget::WheelFocus ); setAcceptDrops( true ); - connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) ); - connect( part, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); - connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) ); - connect( this, TQT_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), - part, TQT_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) ); + connect( part, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); + connect( part, TQ_SIGNAL( clear( ) ), TQ_SLOT( slotClear( ) ) ); + connect( this, TQ_SIGNAL( objectChanged( PMObject*, const int, TQObject* ) ), + part, TQ_SLOT( slotObjectChanged( PMObject*, const int, TQObject* ) ) ); slotRefresh( ); } diff --git a/kpovmodeler/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp index 64c554c0..e1143fd7 100644 --- a/kpovmodeler/pmtriangleedit.cpp +++ b/kpovmodeler/pmtriangleedit.cpp @@ -42,13 +42,13 @@ void PMTriangleEdit::createTopWidgets( ) TQHBoxLayout *hl = new TQHBoxLayout( topLayout( ) ); m_pSmooth = new TQCheckBox( i18n( "Smooth" ), this ); hl->addWidget( m_pSmooth ); - connect( m_pSmooth, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSmoothChecked( bool ) ) ); + connect( m_pSmooth, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSmoothChecked( bool ) ) ); m_pUVEnabled = new TQCheckBox( i18n( "UV vectors" ), this ); hl->addWidget( m_pUVEnabled ); - connect( m_pUVEnabled, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotUVVectorsChecked( bool ) ) ); + connect( m_pUVEnabled, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotUVVectorsChecked( bool ) ) ); TQGridLayout* gl = new TQGridLayout( topLayout( ), 9, 2 ); @@ -58,28 +58,28 @@ void PMTriangleEdit::createTopWidgets( ) gl->addWidget( new TQLabel( i18n( "Point %1:" ).arg( i+1 ), this ), i * 3, 0 ); gl->addWidget( m_pPoint[i], i * 3, 1 ); - connect( m_pPoint[i], TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pPoint[i], TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); m_pNormal[i] = new PMVectorEdit( "x", "y", "z", this ); m_pNormalLabel[i] = new TQLabel( i18n( "Normal %1:" ).arg( i+1 ), this ); gl->addWidget( m_pNormalLabel[i], i * 3 + 1, 0 ); gl->addWidget( m_pNormal[i], i * 3 + 1, 1 ); - connect( m_pNormal[i], TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pNormal[i], TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); m_pUVVector[i] = new PMVectorEdit( "u", "v", this ); m_pUVVectorLabel[i] = new TQLabel( i18n( "UV vector %1:" ).arg( i+1 ), this ); gl->addWidget( m_pUVVectorLabel[i], i * 3 + 2, 0 ); gl->addWidget( m_pUVVector[i], i * 3 + 2, 1 ); - connect( m_pUVVector[i], TQT_SIGNAL( dataChanged( ) ), - TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pUVVector[i], TQ_SIGNAL( dataChanged( ) ), + TQ_SIGNAL( dataChanged( ) ) ); } hl = new TQHBoxLayout( topLayout( ) ); m_pMirror = new TQPushButton( i18n( "Invert Normal Vectors" ), this ); hl->addWidget( m_pMirror ); hl->addStretch( 1 ); - connect( m_pMirror, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInvertNormals( ) ) ); + connect( m_pMirror, TQ_SIGNAL( clicked( ) ), TQ_SLOT( slotInvertNormals( ) ) ); } void PMTriangleEdit::displayObject( PMObject* o ) diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp index 017fae9c..e80f8d7b 100644 --- a/kpovmodeler/pmvectoredit.cpp +++ b/kpovmodeler/pmvectoredit.cpp @@ -39,8 +39,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, for( i = 0; i < 2; i++ ) { m_edits.insert( i, new TQLineEdit( this ) ); - connect( m_edits[i], TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_edits[i], TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); } layout = new TQHBoxLayout( this ); @@ -77,8 +77,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, for( i = 0; i < 3; i++ ) { m_edits.insert( i, new TQLineEdit( this ) ); - connect( m_edits[i], TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_edits[i], TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); } layout = new TQHBoxLayout( this ); @@ -125,8 +125,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA, for( i = 0; i < 4; i++ ) { m_edits.insert( i, new TQLineEdit( this ) ); - connect( m_edits[i], TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_edits[i], TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); } layout = new TQHBoxLayout( this ); diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index 3d3862c8..69402ade 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -119,8 +119,8 @@ void PMVectorListEdit::init( int dimensions ) setSelectionMode( TQTable::MultiRow ); for( i = 0; i < m_dimension; ++i ) setColumnStretchable( i, true ); - connect( this, TQT_SIGNAL( valueChanged( int, int ) ), - TQT_SLOT( slotTextChanged( int, int ) ) ); + connect( this, TQ_SIGNAL( valueChanged( int, int ) ), + TQ_SLOT( slotTextChanged( int, int ) ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); } diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index 92cab2e7..a61646db 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -884,13 +884,13 @@ PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent, m_pLayoutName = new TQLineEdit( w ); vl->addWidget( m_pLayoutName ); - connect( m_pLayoutName, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotNameChanged( const TQString& ) ) ); + connect( m_pLayoutName, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotNameChanged( const TQString& ) ) ); TQListBox* lb = new TQListBox( w ); vl->addWidget( lb ); - connect( lb, TQT_SIGNAL( highlighted( const TQString& ) ), - TQT_SLOT( slotNameSelected( const TQString& ) ) ); + connect( lb, TQ_SIGNAL( highlighted( const TQString& ) ), + TQ_SLOT( slotNameSelected( const TQString& ) ) ); lb->insertStringList( PMViewLayoutManager::theManager( ) ->availableLayouts( ) ); diff --git a/kpovmodeler/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp index ebca9664..d1c96f9c 100644 --- a/kpovmodeler/pmwarpedit.cpp +++ b/kpovmodeler/pmwarpedit.cpp @@ -162,24 +162,24 @@ void PMWarpEdit::createTopWidgets( ) vl->addWidget( m_pTurbulenceWidget ); vl->addWidget( m_pMappingWidget ); - connect( m_pWarpTypeEdit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboChanged( int ) ) ); - connect( m_pDirectionEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOffsetEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFlipEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLocationEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRadiusEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pStrengthEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pFalloffEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pInverseEdit, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pRepeatEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pTurbulenceEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pValueVectorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOctavesEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOmegaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pLambdaEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pOrientationEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pDistExpEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); - connect( m_pMajorRadiusEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); + connect( m_pWarpTypeEdit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboChanged( int ) ) ); + connect( m_pDirectionEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOffsetEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFlipEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLocationEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRadiusEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pStrengthEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pFalloffEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pInverseEdit, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pRepeatEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pTurbulenceEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pValueVectorEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOctavesEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOmegaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pLambdaEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pOrientationEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pDistExpEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); + connect( m_pMajorRadiusEdit, TQ_SIGNAL( dataChanged( ) ), TQ_SIGNAL( dataChanged( ) ) ); } void PMWarpEdit::displayObject( PMObject* o ) diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 477fc6cf..9e9187a2 100644 --- a/kruler/klineal.cpp +++ b/kruler/klineal.cpp @@ -146,25 +146,25 @@ KLineal::KLineal(TQWidget*parent,const char* name):TDEMainWindow(parent,name){ mMenu = new TDEPopupMenu(this); mMenu->insertTitle(i18n("KRuler")); TDEPopupMenu *oriMenu = new TDEPopupMenu(this); - oriMenu->insertItem(UserIconSet("kruler-north"), i18n("&North"), this, TQT_SLOT(setNorth()), Key_N); - oriMenu->insertItem(UserIconSet("kruler-east"), i18n("&East"), this, TQT_SLOT(setEast()), Key_E); - oriMenu->insertItem(UserIconSet("kruler-south"), i18n("&South"), this, TQT_SLOT(setSouth()), Key_S); - oriMenu->insertItem(UserIconSet("kruler-west"), i18n("&West"), this, TQT_SLOT(setWest()), Key_W); - oriMenu->insertItem(i18n("&Turn Right"), this, TQT_SLOT(turnRight()), Key_R); - oriMenu->insertItem(i18n("Turn &Left"), this, TQT_SLOT(turnLeft()), Key_L); + oriMenu->insertItem(UserIconSet("kruler-north"), i18n("&North"), this, TQ_SLOT(setNorth()), Key_N); + oriMenu->insertItem(UserIconSet("kruler-east"), i18n("&East"), this, TQ_SLOT(setEast()), Key_E); + oriMenu->insertItem(UserIconSet("kruler-south"), i18n("&South"), this, TQ_SLOT(setSouth()), Key_S); + oriMenu->insertItem(UserIconSet("kruler-west"), i18n("&West"), this, TQ_SLOT(setWest()), Key_W); + oriMenu->insertItem(i18n("&Turn Right"), this, TQ_SLOT(turnRight()), Key_R); + oriMenu->insertItem(i18n("Turn &Left"), this, TQ_SLOT(turnLeft()), Key_L); mMenu->insertItem(i18n("&Orientation"), oriMenu); mLenMenu = new TDEPopupMenu(this); - mLenMenu->insertItem(i18n("&Short"), this, TQT_SLOT(setShortLength()), CTRL+Key_S); - mLenMenu->insertItem(i18n("&Medium"), this, TQT_SLOT(setMediumLength()), CTRL+Key_M); - mLenMenu->insertItem(i18n("&Tall"), this, TQT_SLOT(setTallLength()), CTRL+Key_T); - mLenMenu->insertItem(i18n("&Full Screen Width"), this, TQT_SLOT(setFullLength()), CTRL+Key_F, FULLSCREENID); + mLenMenu->insertItem(i18n("&Short"), this, TQ_SLOT(setShortLength()), CTRL+Key_S); + mLenMenu->insertItem(i18n("&Medium"), this, TQ_SLOT(setMediumLength()), CTRL+Key_M); + mLenMenu->insertItem(i18n("&Tall"), this, TQ_SLOT(setTallLength()), CTRL+Key_T); + mLenMenu->insertItem(i18n("&Full Screen Width"), this, TQ_SLOT(setFullLength()), CTRL+Key_F, FULLSCREENID); mMenu->insertItem(i18n("&Length"), mLenMenu); - mMenu->insertItem(SmallIcon("application-x-kcsrc"), i18n("&Choose Color..."), this, TQT_SLOT(choseColor()), CTRL+Key_C); - mMenu->insertItem(SmallIcon("font-x-generic"), i18n("Choose &Font..."), this, TQT_SLOT(choseFont()), Key_F); + mMenu->insertItem(SmallIcon("application-x-kcsrc"), i18n("&Choose Color..."), this, TQ_SLOT(choseColor()), CTRL+Key_C); + mMenu->insertItem(SmallIcon("font-x-generic"), i18n("Choose &Font..."), this, TQ_SLOT(choseFont()), Key_F); mMenu->insertSeparator(); mMenu->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), helpMenu()); mMenu->insertSeparator(); - mMenu->insertItem(SmallIcon( "system-log-out" ), KStdGuiItem::quit().text(), kapp, TQT_SLOT(quit()), CTRL+Key_Q); + mMenu->insertItem(SmallIcon( "system-log-out" ), KStdGuiItem::quit().text(), kapp, TQ_SLOT(quit()), CTRL+Key_Q); mLastClickPos = geometry().topLeft()+TQPoint(width()/2, height()/2); } @@ -366,14 +366,14 @@ void KLineal::choseColor() { mColorSelector.setDefaultColor( DEFAULT_RULER_COLOR ); mColorSelector.show(); - connect(&mColorSelector, TQT_SIGNAL(okClicked()), this, TQT_SLOT(setColor())); - connect(&mColorSelector, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(setColor())); - connect(&mColorSelector, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(setColor())); - connect(&mColorSelector, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(setColor())); - connect(&mColorSelector, TQT_SIGNAL(colorSelected(const TQColor&)), this, TQT_SLOT(setColor(const TQColor&))); + connect(&mColorSelector, TQ_SIGNAL(okClicked()), this, TQ_SLOT(setColor())); + connect(&mColorSelector, TQ_SIGNAL(yesClicked()), this, TQ_SLOT(setColor())); + connect(&mColorSelector, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(setColor())); + connect(&mColorSelector, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(setColor())); + connect(&mColorSelector, TQ_SIGNAL(colorSelected(const TQColor&)), this, TQ_SLOT(setColor(const TQColor&))); /* - connect(&mColorSelector, TQT_SIGNAL(cancelPressed()), this, TQT_SLOT(restoreColor())); - connect(&mColorSelector, TQT_SIGNAL(okPressed()), this, TQT_SLOT(saveColor())); + connect(&mColorSelector, TQ_SIGNAL(cancelPressed()), this, TQ_SLOT(restoreColor())); + connect(&mColorSelector, TQ_SIGNAL(okPressed()), this, TQ_SLOT(saveColor())); */ } diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index 6f5a5e9f..0743de97 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -76,13 +76,13 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) TQVBox *vbox = makeVBoxMainWidget(); mainWidget = new KSnapshotWidget( vbox, "mainWidget" ); - connect(mainWidget, TQT_SIGNAL(startImageDrag()), TQT_SLOT(slotDragSnapshot())); - connect(mainWidget, TQT_SIGNAL(newClicked()), TQT_SLOT(slotGrab())); - connect(mainWidget, TQT_SIGNAL(saveClicked()), TQT_SLOT(slotSaveAs())); - connect(mainWidget, TQT_SIGNAL(printClicked()), TQT_SLOT(slotPrint())); - connect(mainWidget, TQT_SIGNAL(copyClicked()), TQT_SLOT(slotCopy())); - connect(mainWidget, TQT_SIGNAL(openWithKPClicked()), TQT_SLOT(slotOpenWithKP())); - connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotAboutToQuit())); + connect(mainWidget, TQ_SIGNAL(startImageDrag()), TQ_SLOT(slotDragSnapshot())); + connect(mainWidget, TQ_SIGNAL(newClicked()), TQ_SLOT(slotGrab())); + connect(mainWidget, TQ_SIGNAL(saveClicked()), TQ_SLOT(slotSaveAs())); + connect(mainWidget, TQ_SIGNAL(printClicked()), TQ_SLOT(slotPrint())); + connect(mainWidget, TQ_SIGNAL(copyClicked()), TQ_SLOT(slotCopy())); + connect(mainWidget, TQ_SIGNAL(openWithKPClicked()), TQ_SLOT(slotOpenWithKP())); + connect(tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotAboutToQuit())); grabber->show(); grabber->grabMouse( waitCursor ); @@ -111,9 +111,9 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) autoincFilename(); } - connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( grabTimerDone() ) ); - connect( &updateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updatePreview() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateCaption() ) ); + connect( &grabTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( grabTimerDone() ) ); + connect( &updateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updatePreview() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateCaption() ) ); KHelpMenu *helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); @@ -130,7 +130,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) ++i; // we need menu ids to match with OfferList indexes } mainWidget->btnOpenWith->setPopup(popupOpenWith); - connect(popupOpenWith, SIGNAL(activated(int)), this, SLOT(slotOpenWith(int))); + connect(popupOpenWith, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenWith(int))); // Check for KolourPaint availability KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint"); @@ -139,27 +139,27 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) } TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::Quit, kapp, TQT_SLOT(quit())); + accel->insert(TDEStdAccel::Quit, kapp, TQ_SLOT(quit())); accel->insert( "QuickSave", i18n("Quick Save Snapshot &As..."), i18n("Save the snapshot to the file specified by the user without showing the file dialog."), - CTRL+SHIFT+Key_S, this, TQT_SLOT(slotSave())); - accel->insert(TDEStdAccel::Save, this, TQT_SLOT(slotSaveAs())); -// accel->insert(TDEShortcut(CTRL+Key_A), this, TQT_SLOT(slotSaveAs())); + CTRL+SHIFT+Key_S, this, TQ_SLOT(slotSave())); + accel->insert(TDEStdAccel::Save, this, TQ_SLOT(slotSaveAs())); +// accel->insert(TDEShortcut(CTRL+Key_A), this, TQ_SLOT(slotSaveAs())); accel->insert( "SaveAs", i18n("Save Snapshot &As..."), i18n("Save the snapshot to the file specified by the user."), - CTRL+Key_A, this, TQT_SLOT(slotSaveAs())); - accel->insert(TDEStdAccel::Print, this, TQT_SLOT(slotPrint())); - accel->insert(TDEStdAccel::New, this, TQT_SLOT(slotGrab())); - accel->insert(TDEStdAccel::Copy, this, TQT_SLOT(slotCopy())); + CTRL+Key_A, this, TQ_SLOT(slotSaveAs())); + accel->insert(TDEStdAccel::Print, this, TQ_SLOT(slotPrint())); + accel->insert(TDEStdAccel::New, this, TQ_SLOT(slotGrab())); + accel->insert(TDEStdAccel::Copy, this, TQ_SLOT(slotCopy())); - accel->insert( "Quit2", Key_Q, this, TQT_SLOT(slotSave())); - accel->insert( "Save2", Key_S, this, TQT_SLOT(slotSaveAs())); - accel->insert( "Print2", Key_P, this, TQT_SLOT(slotPrint())); - accel->insert( "New2", Key_N, this, TQT_SLOT(slotGrab())); - accel->insert( "New3", Key_Space, this, TQT_SLOT(slotGrab())); + accel->insert( "Quit2", Key_Q, this, TQ_SLOT(slotSave())); + accel->insert( "Save2", Key_S, this, TQ_SLOT(slotSaveAs())); + accel->insert( "Print2", Key_P, this, TQ_SLOT(slotPrint())); + accel->insert( "New2", Key_N, this, TQ_SLOT(slotGrab())); + accel->insert( "New3", Key_Space, this, TQ_SLOT(slotGrab())); setEscapeButton( User1 ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( reject() ) ); mainWidget->btnNew->setFocus(); @@ -287,8 +287,8 @@ void KSnapshot::slotGrab() else { if ( mainWidget->mode() == Region ) { rgnGrab = new RegionGrabber(); - connect( rgnGrab, TQT_SIGNAL( regionGrabbed( const TQPixmap & ) ), - TQT_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); + connect( rgnGrab, TQ_SIGNAL( regionGrabbed( const TQPixmap & ) ), + TQ_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); } else { grabber->show(); @@ -425,8 +425,8 @@ void KSnapshot::openWithExternalApp(const KService &service) { TDEProcess *externalApp = new TDEProcess; *externalApp << args; - connect(externalApp, SIGNAL(processExited(TDEProcess*)), - this, SLOT(slotExternalAppClosed(TDEProcess*))); + connect(externalApp, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotExternalAppClosed(TDEProcess*))); if (!externalApp->start(TDEProcess::OwnGroup)) { KMessageBox::error(this, i18n("Cannot start %1!").arg(service.name())); @@ -535,8 +535,8 @@ void KSnapshot::grabTimerDone() { if ( mainWidget->mode() == Region ) { rgnGrab = new RegionGrabber(); - connect( rgnGrab, TQT_SIGNAL( regionGrabbed( const TQPixmap & ) ), - TQT_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); + connect( rgnGrab, TQ_SIGNAL( regionGrabbed( const TQPixmap & ) ), + TQ_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); } else { performGrab(); @@ -551,8 +551,8 @@ void KSnapshot::performGrab() grabTimer.stop(); if ( mainWidget->mode() == ChildWindow ) { WindowGrabber wndGrab; - connect( &wndGrab, TQT_SIGNAL( windowGrabbed( const TQPixmap & ) ), - TQT_SLOT( slotWindowGrabbed( const TQPixmap & ) ) ); + connect( &wndGrab, TQ_SIGNAL( windowGrabbed( const TQPixmap & ) ), + TQ_SLOT( slotWindowGrabbed( const TQPixmap & ) ) ); wndGrab.exec(); } else if ( mainWidget->mode() == WindowUnderCursor ) { diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 9b2c438b..a562fdcc 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -74,9 +74,9 @@ RegionGrabber::RegionGrabber() sizeTip = new SizeTip( ( TQWidget * )0L ); tipTimer = new TQTimer( this ); - connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) ); + connect( tipTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateSizeTip() ) ); - TQTimer::singleShot( 200, this, TQT_SLOT( initGrabber() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( initGrabber() ) ); } RegionGrabber::~RegionGrabber() diff --git a/ksvg/core/DocumentFactory.cpp b/ksvg/core/DocumentFactory.cpp index ea02163a..f72e2299 100644 --- a/ksvg/core/DocumentFactory.cpp +++ b/ksvg/core/DocumentFactory.cpp @@ -68,7 +68,7 @@ DocumentFactory *DocumentFactory::self() SVGDocument *DocumentFactory::requestDocument(TQObject *notifyObject, const char *notifySlot) const { SVGDocumentImpl *impl = requestDocumentImpl(false); - TQObject::connect(impl, TQT_SIGNAL(finishedParsing(bool, const TQString &)), notifyObject, notifySlot); + TQObject::connect(impl, TQ_SIGNAL(finishedParsing(bool, const TQString &)), notifyObject, notifySlot); return new SVGDocument(impl); } diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp index 91fdc0fb..63b22d28 100644 --- a/ksvg/core/KSVGLoader.cpp +++ b/ksvg/core/KSVGLoader.cpp @@ -72,8 +72,8 @@ void KSVGLoader::getSVGContent(::KURL url) m_job->setAutoErrorHandlingEnabled(true); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } } @@ -90,8 +90,8 @@ void KSVGLoader::newImageJob(SVGImageElementImpl *image, ::KURL baseURL) map->imageElement = image; TDEIO::TransferJob *imageJob = TDEIO::get(::KURL(baseURL, map->imageElement->fileName()), false, false); - connect(imageJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(imageJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(imageJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(imageJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); m_imageJobs.insert(imageJob, map); } @@ -212,7 +212,7 @@ void KSVGLoader::postUrl(::KURL url, const TQByteArray &data, const TQString &mi m_postUrlData.status = &status; m_postUrlData.callBackFunction = &callBackFunction; - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); } class CharacterDataSearcher : public TQXmlDefaultHandler diff --git a/ksvg/impl/SVGDocumentImpl.cpp b/ksvg/impl/SVGDocumentImpl.cpp index ce6de16e..ce3c1341 100644 --- a/ksvg/impl/SVGDocumentImpl.cpp +++ b/ksvg/impl/SVGDocumentImpl.cpp @@ -231,7 +231,7 @@ bool SVGDocumentImpl::open(const ::KURL &url) if(!m_loader) m_loader = new KSVGLoader(); - connect(m_loader, TQT_SIGNAL(gotResult(TQIODevice *)), this, TQT_SLOT(slotSVGContent(TQIODevice *))); + connect(m_loader, TQ_SIGNAL(gotResult(TQIODevice *)), this, TQ_SLOT(slotSVGContent(TQIODevice *))); m_loader->getSVGContent(url); } else @@ -257,7 +257,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev) args.SVGFragmentId = url.mid(pos + 1); m_reader = new KSVGReader(this, m_canvas, args); - connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &))); + connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &))); m_t.start(); #if USE_VALGRIND @@ -277,7 +277,7 @@ void SVGDocumentImpl::parseSVG(TQXmlInputSource *inputSource, bool getURLMode) args.fit = m_fit; args.getURLMode = getURLMode; m_reader = new KSVGReader(this, 0, args); - connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &))); + connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &))); #if USE_VALGRIND CALLTREE_ZERO_STATS(); @@ -454,7 +454,7 @@ void SVGDocumentImpl::executeScripts() bool test = executeScriptsRecursiveCheck(*rootElement()); if(!test) - TQTimer::singleShot(50, this, TQT_SLOT(executeScripts())); + TQTimer::singleShot(50, this, TQ_SLOT(executeScripts())); else { executeScriptsRecursive(*rootElement()); diff --git a/ksvg/impl/SVGImageElementImpl.cpp b/ksvg/impl/SVGImageElementImpl.cpp index 65c678d2..c33d3737 100644 --- a/ksvg/impl/SVGImageElementImpl.cpp +++ b/ksvg/impl/SVGImageElementImpl.cpp @@ -273,8 +273,8 @@ void SVGImageElementImpl::createItem(KSVGCanvas *c) m_doc->ref(); m_doc->attach(c); - connect(m_doc, TQT_SIGNAL(finishedParsing(bool, const TQString &)), this, TQT_SLOT(slotParsingFinished(bool, const TQString &))); - connect(m_doc, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(slotLoadingFinished())); + connect(m_doc, TQ_SIGNAL(finishedParsing(bool, const TQString &)), this, TQ_SLOT(slotParsingFinished(bool, const TQString &))); + connect(m_doc, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(slotLoadingFinished())); KURL file; diff --git a/ksvg/impl/SVGScriptElementImpl.cpp b/ksvg/impl/SVGScriptElementImpl.cpp index cecf7fb2..ce1aede9 100644 --- a/ksvg/impl/SVGScriptElementImpl.cpp +++ b/ksvg/impl/SVGScriptElementImpl.cpp @@ -75,8 +75,8 @@ void SVGScriptElementImpl::setAttributes() if(m_job == 0) m_job = TDEIO::get(url, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } } diff --git a/ksvg/impl/SVGTimeScheduler.cpp b/ksvg/impl/SVGTimeScheduler.cpp index b38eceaa..cf8bc75d 100644 --- a/ksvg/impl/SVGTimeScheduler.cpp +++ b/ksvg/impl/SVGTimeScheduler.cpp @@ -50,7 +50,7 @@ const TQTimer *SVGTimer::qtimer() const void SVGTimer::start(TQObject *receiver, const char *member) { - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), receiver, member); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), receiver, member); m_timer->start(m_ms, m_singleShot); } @@ -165,7 +165,7 @@ void SVGTimeScheduler::startAnimations() { SVGTimer *svgTimer = *it; if(svgTimer && !svgTimer->isActive()) - svgTimer->start(this, TQT_SLOT(slotTimerNotify())); + svgTimer->start(this, TQ_SLOT(slotTimerNotify())); } } @@ -174,7 +174,7 @@ void SVGTimeScheduler::toggleAnimations() if(m_intervalTimer->isActive()) m_intervalTimer->stop(); else - m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify())); + m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify())); } bool SVGTimeScheduler::animationsPaused() const @@ -223,7 +223,7 @@ void SVGTimeScheduler::slotTimerNotify() // by the previous call, and now all connections to the interval timer // are created and now we just need to fire that timer (Niko) if(svgTimer != m_intervalTimer && !m_intervalTimer->isActive()) - m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify())); + m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify())); } float SVGTimeScheduler::elapsed() const diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index 6ad05900..aac100f5 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -96,7 +96,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const ksvgd->doc = 0; ksvgd->window = new KSVGWidget(this, wparent, "Rendering Widget"); - connect(ksvgd->window, TQT_SIGNAL(browseURL(const TQString &)), this, TQT_SLOT(browseURL(const TQString &))); + connect(ksvgd->window, TQ_SIGNAL(browseURL(const TQString &)), this, TQ_SLOT(browseURL(const TQString &))); ksvgd->window->show(); KParts::Part::setWidget(ksvgd->window); @@ -112,24 +112,24 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window); - ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection()); - ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection()); - ksvgd->zoomResetAction = new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQT_SLOT(slotZoomReset()), actionCollection(), "zoom_reset"); - ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "process-stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims"); - ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "text-x-generic-template", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source"); - ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "text-x-generic-template", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory"); - ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png"); -// ksvgd->aboutApp = KStdAction::aboutApp(this, TQT_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG"); - ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "image-svg+xml", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app"); - ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "zoom-fit-best", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning"); - ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQT_SLOT(slotProgressiveRendering()), actionCollection(), "progressive"); + ksvgd->zoomInAction = KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection()); + ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection()); + ksvgd->zoomResetAction = new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQ_SLOT(slotZoomReset()), actionCollection(), "zoom_reset"); + ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "process-stop", Key_Escape, this, TQ_SLOT(slotStop()), actionCollection(), "stop_anims"); + ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "text-x-generic-template", Key_F6, this, TQ_SLOT(slotViewSource()), actionCollection(), "view_source"); + ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "text-x-generic-template", Key_F7, this, TQ_SLOT(slotViewMemory()), actionCollection(), "view_memory"); + ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQ_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png"); +// ksvgd->aboutApp = KStdAction::aboutApp(this, TQ_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG"); + ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "image-svg+xml", 0, this, TQ_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app"); + ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "zoom-fit-best", Key_F8, this, TQ_SLOT(slotFontKerning()), actionCollection(), "font_kerning"); + ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQ_SLOT(slotProgressiveRendering()), actionCollection(), "progressive"); KSimpleConfig config("ksvgpluginrc", true); config.setGroup("Rendering"); ksvgd->fontKerningAction->setChecked(config.readBoolEntry("FontKerning", true)); ksvgd->progressiveAction->setChecked(config.readBoolEntry("ProgressiveRendering", true)); - ksvgd->renderingBackendAction = new TDESelectAction(i18n("Rendering &Backend"), 0, this, TQT_SLOT(slotRenderingBackend()), actionCollection(), "rendering_backend"); + ksvgd->renderingBackendAction = new TDESelectAction(i18n("Rendering &Backend"), 0, this, TQ_SLOT(slotRenderingBackend()), actionCollection(), "rendering_backend"); TQStringList items; TQPtrList<KSVG::CanvasInfo> canvasList = KSVG::CanvasFactory::self()->canvasList(); @@ -204,12 +204,12 @@ bool KSVGPlugin::openURL(const KURL &url) ksvgd->doc->addToDocumentDict(ksvgd->doc->handle(), ksvgd->doc); ksvgd->doc->setReferrer(ksvgd->extension->urlArgs().metaData()["referrer"]); - connect(ksvgd->doc, TQT_SIGNAL(finishedParsing(bool, const TQString &)), this, TQT_SLOT(slotParsingFinished(bool, const TQString &))); - connect(ksvgd->doc, TQT_SIGNAL(finishedRendering()), this, TQT_SLOT(slotRenderingFinished())); - connect(ksvgd->doc, TQT_SIGNAL(gotDescription(const TQString &)), this, TQT_SLOT(slotSetDescription(const TQString &))); - connect(ksvgd->doc, TQT_SIGNAL(gotTitle(const TQString &)), this, TQT_SLOT(slotSetTitle(const TQString &))); - connect(ksvgd->doc, TQT_SIGNAL(gotURL(const TQString &)), this, TQT_SLOT(slotGotURL(const TQString &))); - connect(ksvgd->window, TQT_SIGNAL(redraw(const TQRect &)), this, TQT_SLOT(slotRedraw(const TQRect &))); + connect(ksvgd->doc, TQ_SIGNAL(finishedParsing(bool, const TQString &)), this, TQ_SLOT(slotParsingFinished(bool, const TQString &))); + connect(ksvgd->doc, TQ_SIGNAL(finishedRendering()), this, TQ_SLOT(slotRenderingFinished())); + connect(ksvgd->doc, TQ_SIGNAL(gotDescription(const TQString &)), this, TQ_SLOT(slotSetDescription(const TQString &))); + connect(ksvgd->doc, TQ_SIGNAL(gotTitle(const TQString &)), this, TQ_SLOT(slotSetTitle(const TQString &))); + connect(ksvgd->doc, TQ_SIGNAL(gotURL(const TQString &)), this, TQ_SLOT(slotGotURL(const TQString &))); + connect(ksvgd->window, TQ_SIGNAL(redraw(const TQRect &)), this, TQ_SLOT(slotRedraw(const TQRect &))); ksvgd->backgroundPixmap->fill(); bitBlt(ksvgd->window, 0, 0, ksvgd->backgroundPixmap, 0, 0, ksvgd->backgroundPixmap->width(), ksvgd->backgroundPixmap->height()); diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp index 9eecc993..bbc59e2a 100644 --- a/ksvg/plugin/svgcreator.cpp +++ b/ksvg/plugin/svgcreator.cpp @@ -62,7 +62,7 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im c->setup(&pix, &pix); doc->attach(c); - connect(doc, TQT_SIGNAL(finishedRendering()), TQT_SLOT(slotFinished())); + connect(doc, TQ_SIGNAL(finishedRendering()), TQ_SLOT(slotFinished())); doc->open( KURL::fromPathOrURL(path)); m_finished = false; diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp index dd79370b..64944736 100644 --- a/ksvg/test/external/SVGTestWidget.cpp +++ b/ksvg/test/external/SVGTestWidget.cpp @@ -20,7 +20,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url) setMouseTracking(true); setFocusPolicy(TQWidget::WheelFocus); - m_doc = DocumentFactory::self()->requestDocument(this, TQT_SLOT(slotRenderingFinished())); + m_doc = DocumentFactory::self()->requestDocument(this, TQ_SLOT(slotRenderingFinished())); if(!m_doc) return; diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp index 3597d5bb..355e4f0e 100644 --- a/ksvg/test/external/printnodetest.cpp +++ b/ksvg/test/external/printnodetest.cpp @@ -21,7 +21,7 @@ static TDECmdLineOptions options[] = Worker::Worker(const KURL &url) { - m_doc = DocumentFactory::self()->requestDocument(this, TQT_SLOT(slotParsingFinished(bool, const TQString &))); + m_doc = DocumentFactory::self()->requestDocument(this, TQ_SLOT(slotParsingFinished(bool, const TQString &))); if(!m_doc) return; diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index 734241ca..fc483c45 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -37,7 +37,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) imFiltered = 0L; cbEnableMods = new TQCheckBox( i18n("Apply default image modifications"), this ); - connect( cbEnableMods, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( enableWidgets(bool) )); + connect( cbEnableMods, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( enableWidgets(bool) )); // create all the widgets @@ -52,8 +52,8 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) sbMaxUpScaleFactor = new KIntNumInput( gbScale, "upscale factor" ); sbMaxUpScaleFactor->setRange( 1, 100, 1, false ); - connect(cbUpScale, TQT_SIGNAL( toggled(bool)), sbMaxUpScaleFactor, - TQT_SLOT( setEnabled(bool) )); + connect(cbUpScale, TQ_SIGNAL( toggled(bool)), sbMaxUpScaleFactor, + TQ_SLOT( setEnabled(bool) )); // -- @@ -99,7 +99,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) lbImFiltered = new TQLabel( i18n("Modified"), gbPreview ); imFiltered = new ImlibWidget( 0L, imOrig->getImlibData(), gbPreview, "" ); - connect( imFiltered, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotNoImage() )); + connect( imFiltered, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotNoImage() )); //// //////////////// @@ -159,16 +159,16 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) //////////////// // connect them all to the update slot - connect( cbDownScale, TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() )); - connect( cbUpScale, TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() )); - connect( cbFlipVertically, TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() )); - connect( cbFlipHorizontally, TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() )); - connect( sbMaxUpScaleFactor, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() )); - connect( sbBrightness, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() )); - connect( sbContrast, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() )); - connect( sbGamma, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() )); - - connect( comboRotate, TQT_SIGNAL( activated(int) ), TQT_SLOT( updatePreview() )); + connect( cbDownScale, TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() )); + connect( cbUpScale, TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() )); + connect( cbFlipVertically, TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() )); + connect( cbFlipHorizontally, TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() )); + connect( sbMaxUpScaleFactor, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() )); + connect( sbBrightness, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() )); + connect( sbContrast, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() )); + connect( sbGamma, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() )); + + connect( comboRotate, TQ_SIGNAL( activated(int) ), TQ_SLOT( updatePreview() )); TQString filename = locate( "data", "kuickshow/pics/calibrate.png" ); diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index 2874db06..c3e18505 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -37,12 +37,12 @@ FileFinder::FileFinder( TQWidget *parent, const char *name ) setHandleSignals( true ); // we want the completionbox signals completionBox()->setTabHandling( true ); - connect( completionBox(), TQT_SIGNAL( userCancelled(const TQString&) ), - TQT_SLOT( hide() )); - connect( completionBox(), TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotAccept( const TQString& ))); - connect( this, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SLOT( slotAccept( const TQString& ) )); + connect( completionBox(), TQ_SIGNAL( userCancelled(const TQString&) ), + TQ_SLOT( hide() )); + connect( completionBox(), TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotAccept( const TQString& ))); + connect( this, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SLOT( slotAccept( const TQString& ) )); KURLCompletion *comp = new KURLCompletion(); comp->setReplaceHome( true ); diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 379abd84..d65e98b4 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -55,21 +55,21 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name ) dirCompletionObject()->setCompletionMode( TDEGlobalSettings::CompletionAuto); slotViewChanged(); - connect( this, TQT_SIGNAL( viewChanged( KFileView * )), - TQT_SLOT( slotViewChanged() )); + connect( this, TQ_SIGNAL( viewChanged( KFileView * )), + TQ_SLOT( slotViewChanged() )); - connect( dirLister(), TQT_SIGNAL( clear() ), TQT_SLOT( slotItemsCleared() )); - connect( dirLister(), TQT_SIGNAL( deleteItem( KFileItem * ) ), - TQT_SLOT( slotItemDeleted( KFileItem *) )); + connect( dirLister(), TQ_SIGNAL( clear() ), TQ_SLOT( slotItemsCleared() )); + connect( dirLister(), TQ_SIGNAL( deleteItem( KFileItem * ) ), + TQ_SLOT( slotItemDeleted( KFileItem *) )); - connect( this, TQT_SIGNAL( fileHighlighted( const KFileItem * )), - TQT_SLOT( slotHighlighted( const KFileItem * ))); + connect( this, TQ_SIGNAL( fileHighlighted( const KFileItem * )), + TQ_SLOT( slotHighlighted( const KFileItem * ))); - connect( this, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT( slotURLEntered( const KURL& ))); + connect( this, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT( slotURLEntered( const KURL& ))); // should actually be KDirOperator's job! - connect( this, TQT_SIGNAL( finishedLoading() ), TQT_SLOT( slotFinishedLoading() )); + connect( this, TQ_SIGNAL( finishedLoading() ), TQ_SLOT( slotFinishedLoading() )); } FileWidget::~FileWidget() @@ -201,11 +201,11 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e ) if ( !m_fileFinder ) { m_fileFinder = new FileFinder( this, "file finder" ); - connect( m_fileFinder, TQT_SIGNAL( completion(const TQString&)), - TQT_SLOT( findCompletion( const TQString& ))); + connect( m_fileFinder, TQ_SIGNAL( completion(const TQString&)), + TQ_SLOT( findCompletion( const TQString& ))); connect( m_fileFinder, - TQT_SIGNAL( enterDir( const TQString& ) ), - TQT_SLOT( slotReturnPressed( const TQString& ))); + TQ_SIGNAL( enterDir( const TQString& ) ), + TQ_SLOT( slotReturnPressed( const TQString& ))); m_fileFinder->move( width() - m_fileFinder->width(), height() - m_fileFinder->height() ); } diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp index d51fe7d9..db8d5c7c 100644 --- a/kuickshow/src/generalwidget.cpp +++ b/kuickshow/src/generalwidget.cpp @@ -47,8 +47,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) logo->setTipText( i18n( "Open KuickShow Website" ) ); logo->setUseTips( true ); - connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ), - TQT_SLOT( slotURLClicked( const TQString & ) ) ); + connect( logo, TQ_SIGNAL( leftClickedURL( const TQString & ) ), + TQ_SLOT( slotURLClicked( const TQString & ) ) ); layout->addWidget( logo, 0, AlignRight ); @@ -92,7 +92,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) cbOwnPalette = new TQCheckBox( i18n("Use own color palette"), gbox2, "pal"); - connect( cbOwnPalette, TQT_SIGNAL( clicked() ), this, TQT_SLOT( useOwnPalette() ) ); + connect( cbOwnPalette, TQ_SIGNAL( clicked() ), this, TQ_SLOT( useOwnPalette() ) ); cbFastRemap = new TQCheckBox( i18n("Fast palette remapping"), gbox2, "remap"); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 8f957cb9..6b934f18 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -146,103 +146,103 @@ void ImageWindow::updateActions() void ImageWindow::setupActions() { new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(), - this, TQT_SLOT( slotRequestNext() ), + this, TQ_SLOT( slotRequestNext() ), m_actions, "next_image" ); new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(), - this, TQT_SLOT( slotRequestPrevious() ), + this, TQ_SLOT( slotRequestPrevious() ), m_actions, "previous_image" ); new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete, - this, TQT_SLOT( imageDelete() ), + this, TQ_SLOT( imageDelete() ), m_actions, "delete_image" ); new TDEAction( i18n("Move Image to Trash"), Key_Delete, - this, TQT_SLOT( imageTrash() ), + this, TQ_SLOT( imageTrash() ), m_actions, "trash_image" ); new TDEAction( i18n("Zoom In"), Key_Plus, - this, TQT_SLOT( zoomIn() ), + this, TQ_SLOT( zoomIn() ), m_actions, "zoom_in" ); new TDEAction( i18n("Zoom Out"), Key_Minus, - this, TQT_SLOT( zoomOut() ), + this, TQ_SLOT( zoomOut() ), m_actions, "zoom_out" ); new TDEAction( i18n("Restore Original Size"), Key_O, - this, TQT_SLOT( showImageOriginalSize() ), + this, TQ_SLOT( showImageOriginalSize() ), m_actions, "original_size" ); new TDEAction( i18n("Maximize"), Key_M, - this, TQT_SLOT( maximize() ), + this, TQ_SLOT( maximize() ), m_actions, "maximize" ); new TDEAction( i18n("Rotate 90 Degrees"), Key_9, - this, TQT_SLOT( rotate90() ), + this, TQ_SLOT( rotate90() ), m_actions, "rotate90" ); new TDEAction( i18n("Rotate 180 Degrees"), Key_8, - this, TQT_SLOT( rotate180() ), + this, TQ_SLOT( rotate180() ), m_actions, "rotate180" ); new TDEAction( i18n("Rotate 270 Degrees"), Key_7, - this, TQT_SLOT( rotate270() ), + this, TQ_SLOT( rotate270() ), m_actions, "rotate270" ); new TDEAction( i18n("Flip Horizontally"), Key_Asterisk, - this, TQT_SLOT( flipHoriz() ), + this, TQ_SLOT( flipHoriz() ), m_actions, "flip_horicontally" ); new TDEAction( i18n("Flip Vertically"), Key_Slash, - this, TQT_SLOT( flipVert() ), + this, TQ_SLOT( flipVert() ), m_actions, "flip_vertically" ); new TDEAction( i18n("Print Image..."), TDEStdAccel::print(), - this, TQT_SLOT( printImage() ), + this, TQ_SLOT( printImage() ), m_actions, "print_image" ); - KStdAction::saveAs( this, TQT_SLOT( saveImage() ), + KStdAction::saveAs( this, TQ_SLOT( saveImage() ), m_actions, "save_image_as" ); - KStdAction::close( this, TQT_SLOT( close() ), + KStdAction::close( this, TQ_SLOT( close() ), m_actions, "close_image" ); // -------- new TDEAction( i18n("More Brightness"), Key_B, - this, TQT_SLOT( moreBrightness() ), + this, TQ_SLOT( moreBrightness() ), m_actions, "more_brightness" ); new TDEAction( i18n("Less Brightness"), SHIFT + Key_B, - this, TQT_SLOT( lessBrightness() ), + this, TQ_SLOT( lessBrightness() ), m_actions, "less_brightness" ); new TDEAction( i18n("More Contrast"), Key_C, - this, TQT_SLOT( moreContrast() ), + this, TQ_SLOT( moreContrast() ), m_actions, "more_contrast" ); new TDEAction( i18n("Less Contrast"), SHIFT + Key_C, - this, TQT_SLOT( lessContrast() ), + this, TQ_SLOT( lessContrast() ), m_actions, "less_contrast" ); new TDEAction( i18n("More Gamma"), Key_G, - this, TQT_SLOT( moreGamma() ), + this, TQ_SLOT( moreGamma() ), m_actions, "more_gamma" ); new TDEAction( i18n("Less Gamma"), SHIFT + Key_G, - this, TQT_SLOT( lessGamma() ), + this, TQ_SLOT( lessGamma() ), m_actions, "less_gamma" ); // -------- new TDEAction( i18n("Scroll Up"), Key_Up, - this, TQT_SLOT( scrollUp() ), + this, TQ_SLOT( scrollUp() ), m_actions, "scroll_up" ); new TDEAction( i18n("Scroll Down"), Key_Down, - this, TQT_SLOT( scrollDown() ), + this, TQ_SLOT( scrollDown() ), m_actions, "scroll_down" ); new TDEAction( i18n("Scroll Left"), Key_Left, - this, TQT_SLOT( scrollLeft() ), + this, TQ_SLOT( scrollLeft() ), m_actions, "scroll_left" ); new TDEAction( i18n("Scroll Right"), Key_Right, - this, TQT_SLOT( scrollRight() ), + this, TQ_SLOT( scrollRight() ), m_actions, "scroll_right" ); // -------- new TDEAction( i18n("Pause Slideshow"), Key_P, - this, TQT_SLOT( pauseSlideShow() ), + this, TQ_SLOT( pauseSlideShow() ), m_actions, "kuick_slideshow_pause" ); - TDEAction *fullscreenAction = KStdAction::fullScreen(this, TQT_SLOT( toggleFullscreen() ), m_actions, 0 ); + TDEAction *fullscreenAction = KStdAction::fullScreen(this, TQ_SLOT( toggleFullscreen() ), m_actions, 0 ); TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload), - this, TQT_SLOT( reload() ), + this, TQ_SLOT( reload() ), m_actions, "reload_image" ); new TDEAction( i18n("Properties"), ALT + Key_Return, - this, TQT_SLOT( slotProperties() ), + this, TQ_SLOT( slotProperties() ), m_actions, "properties" ); m_actions->readShortcutSettings(); diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 033d73db..631e540d 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -117,8 +117,8 @@ void ImlibWidget::init() setBackgroundMode( PaletteBackground ); imageCache = new ImageCache( id, 4 ); // cache 4 images (FIXME?) - connect( imageCache, TQT_SIGNAL( sigBusy() ), TQT_SLOT( setBusyCursor() )); - connect( imageCache, TQT_SIGNAL( sigIdle() ), TQT_SLOT( restoreCursor() )); + connect( imageCache, TQ_SIGNAL( sigBusy() ), TQ_SLOT( setBusyCursor() )); + connect( imageCache, TQ_SIGNAL( sigIdle() ), TQ_SLOT( restoreCursor() )); win = XCreateSimpleWindow(x11Display(), winId(), 0,0,w,h,0,0,0); } @@ -206,7 +206,7 @@ bool ImlibWidget::cacheImage( const KURL& url ) if ( !file->download() ) { return false; } - connect( file, TQT_SIGNAL( downloaded( KuickFile * )), TQT_SLOT( cacheImage( KuickFile * )) ); + connect( file, TQ_SIGNAL( downloaded( KuickFile * )), TQ_SLOT( cacheImage( KuickFile * )) ); return true; // optimistic } } @@ -647,8 +647,8 @@ KuickImage * ImageCache::getKuimage( KuickFile * file, Imlib_set_image_modifier( myId, im, &mod ); kuim = new KuickImage( file, im, myId ); - connect( kuim, TQT_SIGNAL( startRendering() ), TQT_SLOT( slotBusy() )); - connect( kuim, TQT_SIGNAL( stoppedRendering() ), TQT_SLOT( slotIdle() )); + connect( kuim, TQ_SIGNAL( startRendering() ), TQ_SLOT( slotBusy() )); + connect( kuim, TQ_SIGNAL( stoppedRendering() ), TQ_SLOT( slotIdle() )); kuickList.insert( 0, kuim ); fileList.prepend( file ); diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp index baee42b8..a6c520b9 100644 --- a/kuickshow/src/kuickconfigdlg.cpp +++ b/kuickshow/src/kuickconfigdlg.cpp @@ -64,7 +64,7 @@ KuickConfigDialog::KuickConfigDialog( TDEActionCollection *_coll, TQWidget *pare box = addVBoxPage( i18n("Bro&wser Shortcuts") ); browserKeyChooser = new KKeyChooser( coll, box ); - connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( resetDefaults() )); + connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( resetDefaults() )); } KuickConfigDialog::~KuickConfigDialog() diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 0f970f85..9b5aab44 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -86,8 +86,8 @@ bool KuickFile::download() m_job = TDEIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves m_job->setAutoErrorHandlingEnabled( true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), TQT_SLOT( slotResult( TDEIO::Job * ) )); - connect( m_job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) )); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), TQ_SLOT( slotResult( TDEIO::Job * ) )); + connect( m_job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) )); // TODO: generify background/foreground downloading? diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 6e48642a..9ff903b3 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -111,7 +111,7 @@ KuickShow::KuickShow( const char *name ) resize( 400, 500 ); m_slideTimer = new TQTimer( this ); - connect( m_slideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( nextSlide() )); + connect( m_slideTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( nextSlide() )); TDEConfig *kc = TDEGlobal::config(); @@ -231,39 +231,39 @@ void KuickShow::initGUI( const KURL& startDir ) redirectDeleteAndTrashActions(coll); - connect( fileWidget, TQT_SIGNAL( fileSelected( const KFileItem * ) ), - this, TQT_SLOT( slotSelected( const KFileItem * ) )); + connect( fileWidget, TQ_SIGNAL( fileSelected( const KFileItem * ) ), + this, TQ_SLOT( slotSelected( const KFileItem * ) )); - connect( fileWidget, TQT_SIGNAL( fileHighlighted( const KFileItem * )), - this, TQT_SLOT( slotHighlighted( const KFileItem * ) )); + connect( fileWidget, TQ_SIGNAL( fileHighlighted( const KFileItem * )), + this, TQ_SLOT( slotHighlighted( const KFileItem * ) )); - connect( fileWidget, TQT_SIGNAL( urlEntered( const KURL& )), - this, TQT_SLOT( dirSelected( const KURL& )) ); + connect( fileWidget, TQ_SIGNAL( urlEntered( const KURL& )), + this, TQ_SLOT( dirSelected( const KURL& )) ); fileWidget->setAcceptDrops(true); - connect( fileWidget, TQT_SIGNAL( dropped( const KFileItem *, TQDropEvent *, const KURL::List & )), - this, TQT_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) ); + connect( fileWidget, TQ_SIGNAL( dropped( const KFileItem *, TQDropEvent *, const KURL::List & )), + this, TQ_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) ); // setup actions - TDEAction *open = KStdAction::open( this, TQT_SLOT( slotOpenURL() ), + TDEAction *open = KStdAction::open( this, TQ_SLOT( slotOpenURL() ), coll, "openURL" ); - TDEAction *print = KStdAction::print( this, TQT_SLOT( slotPrint() ), + TDEAction *print = KStdAction::print( this, TQ_SLOT( slotPrint() ), coll, "kuick_print" ); print->setText( i18n("Print Image...") ); TDEAction *configure = new TDEAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure", TDEShortcut(), - this, TQT_SLOT( configuration() ), + this, TQ_SLOT( configuration() ), coll, "kuick_configure" ); TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide", TDEShortcut( Key_F2 ), - this, TQT_SLOT( startSlideShow() ), + this, TQ_SLOT( startSlideShow() ), coll, "kuick_slideshow" ); TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about", TDEShortcut(), - this, TQT_SLOT( about() ), coll, "about" ); + this, TQ_SLOT( about() ), coll, "about" ); oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"), "window-new", @@ -272,21 +272,21 @@ void KuickShow::initGUI( const KURL& startDir ) m_toggleBrowserAction = new TDEToggleAction( i18n("Show File Browser"), TDEShortcut( Key_Space ), coll, "toggleBrowser" ); m_toggleBrowserAction->setCheckedState(i18n("Hide File Browser")); - connect( m_toggleBrowserAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleBrowser() )); + connect( m_toggleBrowserAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleBrowser() )); TDEAction *showInOther = new TDEAction( i18n("Show Image"), TDEShortcut(), - this, TQT_SLOT( slotShowInOtherWindow() ), + this, TQ_SLOT( slotShowInOtherWindow() ), coll, "kuick_showInOtherWindow" ); TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"), TDEShortcut(), - this, TQT_SLOT( slotShowInSameWindow() ), + this, TQ_SLOT( slotShowInSameWindow() ), coll, "kuick_showInSameWindow" ); TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"), - TDEShortcut(), this, TQT_SLOT( slotShowFullscreen() ), + TDEShortcut(), this, TQ_SLOT( slotShowFullscreen() ), coll, "kuick_showFullscreen" ); - TDEAction *quit = KStdAction::quit( this, TQT_SLOT(slotQuit()), coll, "quit"); + TDEAction *quit = KStdAction::quit( this, TQ_SLOT(slotQuit()), coll, "quit"); // remove TQString() parameter -- ellis coll->readShortcutSettings( TQString() ); @@ -394,10 +394,10 @@ void KuickShow::initGUI( const KURL& startDir ) addressToolBar->insertWidget( ID_ADDRESSBAR, 1, cmbPath); addressToolBar->setItemAutoSized( ID_ADDRESSBAR ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( slotSetURL( const KURL& ))); - connect( cmbPath, TQT_SIGNAL( returnPressed()), - this, TQT_SLOT( slotURLComboReturnPressed())); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( slotSetURL( const KURL& ))); + connect( cmbPath, TQ_SIGNAL( returnPressed()), + this, TQ_SLOT( slotURLComboReturnPressed())); fileWidget->initActions(); @@ -422,14 +422,14 @@ void KuickShow::redirectDeleteAndTrashActions(TDEActionCollection *coll) if (action) { action->disconnect(fileWidget); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotDeleteCurrentImage())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotDeleteCurrentImage())); } action = coll->action("trash"); if (action) { action->disconnect(fileWidget); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotTrashCurrentImage())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotTrashCurrentImage())); } } @@ -537,19 +537,19 @@ bool KuickShow::showImage( const KFileItem *fi, m_viewer->setFullscreen( fullscreen ); s_viewers.append( m_viewer ); - connect( m_viewer, TQT_SIGNAL( destroyed() ), TQT_SLOT( viewerDeleted() )); - connect( m_viewer, TQT_SIGNAL( sigFocusWindow( ImageWindow *) ), - this, TQT_SLOT( slotSetActiveViewer( ImageWindow * ) )); - connect( m_viewer, TQT_SIGNAL( sigImageError(const KuickFile *, const TQString& ) ), - this, TQT_SLOT( messageCantLoadImage(const KuickFile *, const TQString &) )); - connect( m_viewer, TQT_SIGNAL( requestImage( ImageWindow *, int )), - this, TQT_SLOT( slotAdvanceImage( ImageWindow *, int ))); - connect( m_viewer, TQT_SIGNAL( pauseSlideShowSignal() ), - this, TQT_SLOT( pauseSlideShow() ) ); - connect( m_viewer, TQT_SIGNAL (deleteImage (ImageWindow *)), - this, TQT_SLOT (slotDeleteCurrentImage (ImageWindow *))); - connect( m_viewer, TQT_SIGNAL (trashImage (ImageWindow *)), - this, TQT_SLOT (slotTrashCurrentImage (ImageWindow *))); + connect( m_viewer, TQ_SIGNAL( destroyed() ), TQ_SLOT( viewerDeleted() )); + connect( m_viewer, TQ_SIGNAL( sigFocusWindow( ImageWindow *) ), + this, TQ_SLOT( slotSetActiveViewer( ImageWindow * ) )); + connect( m_viewer, TQ_SIGNAL( sigImageError(const KuickFile *, const TQString& ) ), + this, TQ_SLOT( messageCantLoadImage(const KuickFile *, const TQString &) )); + connect( m_viewer, TQ_SIGNAL( requestImage( ImageWindow *, int )), + this, TQ_SLOT( slotAdvanceImage( ImageWindow *, int ))); + connect( m_viewer, TQ_SIGNAL( pauseSlideShowSignal() ), + this, TQ_SLOT( pauseSlideShow() ) ); + connect( m_viewer, TQ_SIGNAL (deleteImage (ImageWindow *)), + this, TQ_SLOT (slotDeleteCurrentImage (ImageWindow *))); + connect( m_viewer, TQ_SIGNAL (trashImage (ImageWindow *)), + this, TQ_SLOT (slotTrashCurrentImage (ImageWindow *))); if ( s_viewers.count() == 1 && moveToTopLeft ) { // we have to move to 0x0 before showing _and_ // after showing, otherwise we get some bogus geometry() @@ -698,7 +698,7 @@ void KuickShow::tryShowNextImage() if (!haveBrowser()) { // ### when simply calling toggleBrowser(), this main window is completely messed up - TQTimer::singleShot(0, this, TQT_SLOT(toggleBrowser())); + TQTimer::singleShot(0, this, TQ_SLOT(toggleBrowser())); } m_viewer->deleteLater(); } @@ -952,7 +952,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e ) if ( fileWidget->dirLister()->rootItem() ) { fileWidget->setCurrentItem( file->url().fileName() ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotReplayEvent())); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReplayEvent())); } else // finished, but no root-item -- probably an error, kill repeat-item! { @@ -962,8 +962,8 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e ) else // not finished yet { fileWidget->setInitialItem( file->url().fileName() ); - connect( fileWidget, TQT_SIGNAL( finished() ), - TQT_SLOT( slotReplayEvent() )); + connect( fileWidget, TQ_SIGNAL( finished() ), + TQ_SLOT( slotReplayEvent() )); } return true; @@ -1081,12 +1081,12 @@ void KuickShow::configuration() dialog->resize( 540, 510 ); dialog->setIcon( kapp->miniIcon() ); - connect( dialog, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotConfigApplied() ) ); - connect( dialog, TQT_SIGNAL( applyClicked() ), - this, TQT_SLOT( slotConfigApplied() ) ); - connect( dialog, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotConfigClosed() ) ); + connect( dialog, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotConfigApplied() ) ); + connect( dialog, TQ_SIGNAL( applyClicked() ), + this, TQ_SLOT( slotConfigApplied() ) ); + connect( dialog, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotConfigClosed() ) ); fileWidget->actionCollection()->action( "kuick_configure" )->setEnabled( false ); dialog->show(); @@ -1294,8 +1294,8 @@ void KuickShow::abortDelayedEvent() void KuickShow::slotReplayEvent() { - disconnect( fileWidget, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotReplayEvent() )); + disconnect( fileWidget, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotReplayEvent() )); DelayedRepeatEvent *e = m_delayedRepeatItem; m_delayedRepeatItem = 0L; // otherwise, eventFilter aborts @@ -1346,13 +1346,13 @@ void KuickShow::delayAction(DelayedRepeatEvent *event) fileWidget->dirLister()->rootItem() ) { fileWidget->setCurrentItem( url.fileName() ); - TQTimer::singleShot( 0, this, TQT_SLOT( doReplay())); + TQTimer::singleShot( 0, this, TQ_SLOT( doReplay())); } else { fileWidget->setInitialItem( url.fileName() ); - connect( fileWidget, TQT_SIGNAL( finished() ), - TQT_SLOT( doReplay() )); + connect( fileWidget, TQ_SIGNAL( finished() ), + TQ_SLOT( doReplay() )); } } @@ -1361,8 +1361,8 @@ void KuickShow::doReplay() if (!m_delayedRepeatItem) return; - disconnect( fileWidget, TQT_SIGNAL( finished() ), - this, TQT_SLOT( doReplay() )); + disconnect( fileWidget, TQ_SIGNAL( finished() ), + this, TQ_SLOT( doReplay() )); switch (m_delayedRepeatItem->action) { @@ -1424,7 +1424,7 @@ void KuickShow::deleteAllViewers() { TQValueListIterator<ImageWindow*> it = s_viewers.begin(); for ( ; it != s_viewers.end(); ++it ) { - (*it)->disconnect( TQT_SIGNAL( destroyed() ), this, TQT_SLOT( viewerDeleted() )); + (*it)->disconnect( TQ_SIGNAL( destroyed() ), this, TQ_SLOT( viewerDeleted() )); (*it)->close( true ); } diff --git a/kuickshow/src/kurlwidget.cpp b/kuickshow/src/kurlwidget.cpp index 342c78c5..4cab4a79 100644 --- a/kuickshow/src/kurlwidget.cpp +++ b/kuickshow/src/kurlwidget.cpp @@ -27,7 +27,7 @@ KURLWidget::KURLWidget(const TQString& text, TQWidget *parent, const char *name) : KURLLabel( parent, name ) { setText( text ); - connect( this, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( run() )); + connect( this, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( run() )); setUseTips( true ); } diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index feefec43..3146370e 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -229,7 +229,7 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name ) m_scale->setEnabled( false ); // ### grid->addMultiCellWidget( m_scale, 0, 0, 0, 1 ); group->insert( m_scale ); - connect( m_scale, TQT_SIGNAL( toggled( bool )), TQT_SLOT( toggleScaling( bool ))); + connect( m_scale, TQ_SIGNAL( toggled( bool )), TQ_SLOT( toggleScaling( bool ))); m_units = new KComboBox( false, widget, "unit combobox" ); grid->addWidget( m_units, 0, 2, AlignLeft ); diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index 1c2bcec5..2889e4d4 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -39,7 +39,7 @@ KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/ m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this ); m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) ); + connect( m_pResizeGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( resizeChanged( int ) ) ); layout->addWidget( m_pResizeGroup ); ( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup ); diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h index dbbc1205..b697c01e 100644 --- a/kview/kimageviewer/canvas.h +++ b/kview/kimageviewer/canvas.h @@ -55,8 +55,8 @@ namespace KImageViewer kapp->quit(); } setCentralWidget( widget ); - connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( mySlot( const TQPoint & ) ) ); - connect( m_canvas->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( mySlot( const TQPoint & ) ) ); + connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) ); + connect( m_canvas->widget(), TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) ); </pre> * * You can't connect signals or slots using KImageViewer::Canvas, because this interface diff --git a/kview/kview.cpp b/kview/kview.cpp index 33b57312..34dd83ee 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -82,28 +82,28 @@ KView::KView() setStandardToolBarMenuEnabled( true ); - connect( part->widget(), TQT_SIGNAL( imageSizeChanged( const TQSize & ) ), - TQT_SLOT( imageSizeChanged( const TQSize & ) ) ); - connect( part->widget(), TQT_SIGNAL( selectionChanged( const TQRect & ) ), - TQT_SLOT( selectionChanged( const TQRect & ) ) ); - connect( part->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ), - TQT_SLOT( contextPress( const TQPoint & ) ) ); - - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( clipboardDataChanged() ) ); - - connect( m_pViewer, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( jobStarted( TDEIO::Job * ) ) ); - connect( m_pViewer, TQT_SIGNAL( completed() ), - this, TQT_SLOT( jobCompleted() ) ); - connect( m_pViewer, TQT_SIGNAL( completed( bool ) ), - this, TQT_SLOT( jobCompleted( bool ) ) ); - connect( m_pViewer, TQT_SIGNAL( canceled( const TQString & ) ), - this, TQT_SLOT( jobCanceled( const TQString & ) ) ); - connect( m_pViewer, TQT_SIGNAL( imageOpened( const KURL & ) ), - m_paRecent, TQT_SLOT( addURL( const KURL & ) ) ); - - connect( m_pCanvas->widget(), TQT_SIGNAL( cursorPos( const TQPoint & ) ), TQT_SLOT( cursorPos( const TQPoint & ) ) ); + connect( part->widget(), TQ_SIGNAL( imageSizeChanged( const TQSize & ) ), + TQ_SLOT( imageSizeChanged( const TQSize & ) ) ); + connect( part->widget(), TQ_SIGNAL( selectionChanged( const TQRect & ) ), + TQ_SLOT( selectionChanged( const TQRect & ) ) ); + connect( part->widget(), TQ_SIGNAL( contextPress( const TQPoint & ) ), + TQ_SLOT( contextPress( const TQPoint & ) ) ); + + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( clipboardDataChanged() ) ); + + connect( m_pViewer, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( jobStarted( TDEIO::Job * ) ) ); + connect( m_pViewer, TQ_SIGNAL( completed() ), + this, TQ_SLOT( jobCompleted() ) ); + connect( m_pViewer, TQ_SIGNAL( completed( bool ) ), + this, TQ_SLOT( jobCompleted( bool ) ) ); + connect( m_pViewer, TQ_SIGNAL( canceled( const TQString & ) ), + this, TQ_SLOT( jobCanceled( const TQString & ) ) ); + connect( m_pViewer, TQ_SIGNAL( imageOpened( const KURL & ) ), + m_paRecent, TQ_SLOT( addURL( const KURL & ) ) ); + + connect( m_pCanvas->widget(), TQ_SIGNAL( cursorPos( const TQPoint & ) ), TQ_SLOT( cursorPos( const TQPoint & ) ) ); m_paRecent->loadEntries( TDEGlobal::config() ); if (!initialGeometrySet()) @@ -112,7 +112,7 @@ KView::KView() m_pViewer->widget()->installEventFilter( this ); // reload configuration when it's changed by the conf dlg - KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( readSettings() ) ); setPluginLoadingMode( LoadPluginsIfEnabled ); createGUI( part ); @@ -145,7 +145,7 @@ KView::KView() else { KMessageBox::error( this, i18n( "An error occurred while loading the KViewViewer KPart. Check your installation." ) ); - TQTimer::singleShot( 0, kapp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 0, kapp, TQ_SLOT( quit() ) ); } } @@ -387,7 +387,7 @@ void KView::slotConfigureToolbars() { saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar dlg( factory() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } @@ -422,9 +422,9 @@ void KView::jobStarted( TDEIO::Job * job ) { if( job ) { - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( loadingProgress( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( speedProgress( TDEIO::Job *, unsigned long ) ) ); - //connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT() ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( loadingProgress( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( speedProgress( TDEIO::Job *, unsigned long ) ) ); + //connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT() ); loadingProgress( job, 0 ); speedProgress( job, 0 ); } @@ -489,51 +489,51 @@ void KView::cursorPos( const TQPoint & pos ) void KView::setupActions( TQObject * partobject ) { // File - KStdAction::open( this, TQT_SLOT( slotOpenFile() ), actionCollection() ); - m_paRecent = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); - TDEAction * aClose = KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() ); + KStdAction::open( this, TQ_SLOT( slotOpenFile() ), actionCollection() ); + m_paRecent = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); + TDEAction * aClose = KStdAction::close( this, TQ_SLOT( slotClose() ), actionCollection() ); aClose->setEnabled( false ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), aClose, TQ_SLOT( setEnabled( bool ) ) ); TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false ); if( extension ) { TQStrList slotNames = extension->metaObject()->slotNames(); if( slotNames.contains( "print()" ) ) - KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" ); + KStdAction::print( extension, TQ_SLOT( print() ), actionCollection(), "print" ); if( slotNames.contains( "del()" ) ) ( void )new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, - extension, TQT_SLOT( del() ), actionCollection(), "del" ); - connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) ); + extension, TQ_SLOT( del() ), actionCollection(), "del" ); + connect( extension, TQ_SIGNAL( enableAction( const char *, bool ) ), TQ_SLOT( enableAction( const char *, bool ) ) ); } - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); // Edit - TDEAction * aCopy = KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); + TDEAction * aCopy = KStdAction::copy( this, TQ_SLOT( slotCopy() ), actionCollection() ); aCopy->setEnabled( false ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aCopy, TQT_SLOT( setEnabled( bool ) ) ); - m_paPaste = KStdAction::paste( this, TQT_SLOT( slotPaste() ), actionCollection() ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), aCopy, TQ_SLOT( setEnabled( bool ) ) ); + m_paPaste = KStdAction::paste( this, TQ_SLOT( slotPaste() ), actionCollection() ); clipboardDataChanged(); //enable or disable paste - TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, this, TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); + TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, this, TQ_SLOT( slotCrop() ), actionCollection(), "crop" ); aCrop->setEnabled( false ); TDEAction * aReload = new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), partobject, - TQT_SLOT( reload() ), actionCollection(), "reload" ); + TQ_SLOT( reload() ), actionCollection(), "reload" ); aReload->setEnabled( false ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), aReload, TQ_SLOT( setEnabled( bool ) ) ); // Settings - m_paShowMenubar = KStdAction::showMenubar( this, TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + m_paShowMenubar = KStdAction::showMenubar( this, TQ_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); m_paShowStatusBar = ::tqt_cast<TDEToggleAction*>( action( "options_show_statusbar" ) ); if( m_paShowStatusBar ) - connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) ); + connect( m_paShowStatusBar, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( statusbarToggled( bool ) ) ); m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); - connect( m_paShowFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); - KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), actionCollection() ); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + connect( m_paShowFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); + KStdAction::preferences( this, TQ_SLOT( slotPreferences() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); } void KView::handleResize() diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index ec43813b..d9cf9669 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -56,17 +56,17 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS m_items.append( item ); } - connect( m_pWidget->m_pListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, TQT_SLOT( configChanged() ) ); - - connect( m_pWidget->m_pSmoothScaling, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pKeepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pCenterImage, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_bgColor, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMinWidth, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMaxWidth, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMinHeight, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMaxHeight, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); + connect( m_pWidget->m_pListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, TQ_SLOT( configChanged() ) ); + + connect( m_pWidget->m_pSmoothScaling, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pKeepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pCenterImage, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_bgColor, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMinWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMaxWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMinHeight, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMaxHeight, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); load(); } diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index 5b51acee..95406913 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -71,12 +71,12 @@ KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQString setMinimumSize( 0, 0 ); setBgColor( Defaults::bgColor ); - connect( this, TQT_SIGNAL( imageChanged() ), this, TQT_SLOT( slotImageChanged() ) ); - connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideCursor() ) ); + connect( this, TQ_SIGNAL( imageChanged() ), this, TQ_SLOT( slotImageChanged() ) ); + connect( m_pTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( hideCursor() ) ); KSettings::Dispatcher::self()->registerInstance( KImageCanvasFactory::instance(), this, - TQT_SLOT( loadSettings() ) ); + TQ_SLOT( loadSettings() ) ); viewport()->setFocusProxy( this ); clear(); @@ -517,7 +517,7 @@ void KImageCanvas::updateImage() { kdDebug( 4620 ) << k_funcinfo << endl; if( ! m_bImageUpdateScheduled ) - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateImage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateImage() ) ); m_bImageUpdateScheduled = true; } @@ -940,10 +940,10 @@ KImageHolder * KImageCanvas::createNewClient() addChild( client, 0, 0 ); - connect( client, TQT_SIGNAL( contextPress( const TQPoint& ) ), TQT_SIGNAL( contextPress( const TQPoint& ) ) ); - connect( client, TQT_SIGNAL( cursorPos( const TQPoint & ) ), TQT_SLOT( mapCursorPos( const TQPoint & ) ) ); - connect( client, TQT_SIGNAL( selected( const TQRect & ) ), TQT_SLOT( selected( const TQRect & ) ) ); - connect( client, TQT_SIGNAL( wannaScroll( int, int ) ), TQT_SLOT( scrollBy( int, int ) ) ); + connect( client, TQ_SIGNAL( contextPress( const TQPoint& ) ), TQ_SIGNAL( contextPress( const TQPoint& ) ) ); + connect( client, TQ_SIGNAL( cursorPos( const TQPoint & ) ), TQ_SLOT( mapCursorPos( const TQPoint & ) ) ); + connect( client, TQ_SIGNAL( selected( const TQRect & ) ), TQ_SLOT( selected( const TQRect & ) ) ); + connect( client, TQ_SIGNAL( wannaScroll( int, int ) ), TQ_SLOT( scrollBy( int, int ) ) ); return client; } diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 48195506..a51d29e3 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -104,21 +104,21 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, else setXMLFile( "kviewviewer_ro.rc" ); - connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ), - this, TQT_SLOT( slotPopupMenu( const TQPoint & ) ) ); - connect( widget, TQT_SIGNAL( zoomChanged( double ) ), - this, TQT_SLOT( zoomChanged( double ) ) ); - connect( widget, TQT_SIGNAL( showingImageDone() ), - this, TQT_SLOT( switchBlendEffect() ) ); - connect( widget, TQT_SIGNAL( hasImage( bool ) ), - this, TQT_SLOT( hasImage( bool ) ) ); - connect( widget, TQT_SIGNAL( imageChanged() ), - this, TQT_SLOT( setModified() ) ); - - connect( m_pFileWatch, TQT_SIGNAL( dirty( const TQString & ) ), - this, TQT_SLOT( slotFileDirty( const TQString & ) ) ); - - KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); + connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ), + this, TQ_SLOT( slotPopupMenu( const TQPoint & ) ) ); + connect( widget, TQ_SIGNAL( zoomChanged( double ) ), + this, TQ_SLOT( zoomChanged( double ) ) ); + connect( widget, TQ_SIGNAL( showingImageDone() ), + this, TQ_SLOT( switchBlendEffect() ) ); + connect( widget, TQ_SIGNAL( hasImage( bool ) ), + this, TQ_SLOT( hasImage( bool ) ) ); + connect( widget, TQ_SIGNAL( imageChanged() ), + this, TQ_SLOT( setModified() ) ); + + connect( m_pFileWatch, TQ_SIGNAL( dirty( const TQString & ) ), + this, TQ_SLOT( slotFileDirty( const TQString & ) ) ); + + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( readSettings() ) ); // by default disable progress info (so it won't open the dialog in Konqueror) setProgressInfoEnabled( false ); @@ -202,8 +202,8 @@ bool KViewViewer::saveAs( const KURL & kurl ) TDEIO::Job * job = TDEIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() ); emit started( job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResultSaveAs( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResultSaveAs( TDEIO::Job * ) ) ); return true; } kdDebug( 4610 ) << "call KParts::ReadWritePart::saveAs( " << kurl.prettyURL() << " )" << endl; @@ -268,8 +268,8 @@ bool KViewViewer::openURL( const KURL & url ) m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() ); emit started( m_pJob ); - connect( m_pJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); - connect( m_pJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_pJob, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( m_pJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); return true; } } @@ -466,33 +466,33 @@ bool KViewViewer::saveFile() void KViewViewer::setupActions() { m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "zoom-in", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this, - TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); + TQ_SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "zoom-out", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this, - TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); + TQ_SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); m_paZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( m_paZoom, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( setZoom( const TQString & ) ) ); + connect( m_paZoom, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( setZoom( const TQString & ) ) ); m_paZoom->setEditable( true ); m_paZoom->clear(); m_paZoom->setItems( TQStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) ); m_paZoom->setCurrentItem( 5 ); m_paFlipMenu = new TDEActionMenu( i18n( "&Flip" ), actionCollection(), "flip" ); - m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); - m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); + m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQ_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); + m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQ_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); m_paFlipMenu->insert( m_paFlipV ); m_paFlipMenu->insert( m_paFlipH ); m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "object-rotate-left", 0, this, - TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); + TQ_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "object-rotate-right", 0, this, - TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); - m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); + TQ_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); + m_paSave = KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() ); m_paSave->setEnabled( false ); - m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() ); + m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotSaveAs() ), actionCollection() ); m_paFitToWin = new TDEAction( i18n( "Fit Image to Window" ), 0, 0, this, - TQT_SLOT( slotFitToWin() ), actionCollection(), "fittowin" ); + TQ_SLOT( slotFitToWin() ), actionCollection(), "fittowin" ); m_paZoomIn->setEnabled( false ); m_paZoomOut->setEnabled( false ); m_paZoom->setEnabled( false ); @@ -503,18 +503,18 @@ void KViewViewer::setupActions() m_paFlipMenu->setEnabled( false ); m_paFlipV->setEnabled( false ); m_paFlipH->setEnabled( false ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoom, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipV, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipH, TQT_SLOT( setEnabled( bool ) ) ); - - m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ), + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoom, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipV, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipH, TQ_SLOT( setEnabled( bool ) ) ); + + m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQ_SLOT( slotToggleScrollbars() ), actionCollection(), "show_scrollbars" ); m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars")); } @@ -754,7 +754,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos ) { KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc ); - (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ), + (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveAs() ), popupGUIClient->actionCollection(), "saveimageas" ); // ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon) @@ -818,9 +818,9 @@ void KViewViewer::slotFileDirty( const TQString & ) KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb ); layout->addWidget( no ); layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); - connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReloadUnmodified() ) ); - connect( yes, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) ); - connect( no, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) ); + connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReloadUnmodified() ) ); + connect( yes, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) ); + connect( no, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) ); pop->setView( vb ); pop->setTimeout( 0 ); pop->setAutoDelete( true ); diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index a8c2fed6..fff86dbb 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -45,9 +45,9 @@ KViewBrowser::KViewBrowser( TQObject* parent, const char* name, const TQStringLi m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); if( m_pViewer ) { - m_paBack = KStdAction::back ( this, TQT_SLOT( slotBack() ), actionCollection(), "previous_image" ); + m_paBack = KStdAction::back ( this, TQ_SLOT( slotBack() ), actionCollection(), "previous_image" ); m_paBack->setShortcut( SHIFT+Key_Left ); - m_paForward = KStdAction::forward( this, TQT_SLOT( slotForward() ), actionCollection(), "next_image" ); + m_paForward = KStdAction::forward( this, TQ_SLOT( slotForward() ), actionCollection(), "next_image" ); m_paForward->setShortcut( SHIFT+Key_Right ); m_pExtension = m_pViewer->browserExtension(); } @@ -156,8 +156,8 @@ void KViewBrowser::setupDirLister() m_pDirLister = new KDirLister(); m_pDirLister->setMimeFilter( KImageIO::mimeTypes( KImageIO::Reading ) ); m_pDirLister->setShowingDotFiles( true ); - connect( m_pDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_pDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_pDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_pDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); } if( m_pDirLister->url() != KURL( m_pViewer->url().directory( true, false ) ) ) { diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index 4ae192a6..fd42504d 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -38,20 +38,20 @@ KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringLi if( m_pViewer ) { TDEAction * gammaaction = new TDEAction( i18n( "&Gamma Correction..." ), 0, 0, - this, TQT_SLOT( gamma() ), + this, TQ_SLOT( gamma() ), actionCollection(), "plugin_effects_gamma" ); TDEAction * blendaction = new TDEAction( i18n( "&Blend Color..." ), 0, 0, - this, TQT_SLOT( blend() ), + this, TQ_SLOT( blend() ), actionCollection(), "plugin_effects_blend" ); TDEAction * intensityaction = new TDEAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0, - this, TQT_SLOT( intensity() ), + this, TQ_SLOT( intensity() ), actionCollection(), "plugin_effects_intensity" ); gammaaction->setEnabled( m_pViewer->canvas()->image() != 0 ); blendaction->setEnabled( m_pViewer->canvas()->image() != 0 ); intensityaction->setEnabled( m_pViewer->canvas()->image() != 0 ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), gammaaction, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), blendaction, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), intensityaction, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), gammaaction, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), blendaction, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), intensityaction, TQ_SLOT( setEnabled( bool ) ) ); } else kdWarning( 4630 ) << "no KImageViewer interface found - the effects plugin won't work" << endl; @@ -67,7 +67,7 @@ KViewEffects::~KViewEffects() void KViewEffects::intensity() { KDialogBase dlg( m_pViewer->widget(), "Intensity Dialog", true /*modal*/, i18n( "Change Intensity" ), KDialogBase::Ok | KDialogBase::Try | KDialogBase::Cancel ); - connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyIntensity() ) ); + connect( &dlg, TQ_SIGNAL( tryClicked() ), this, TQ_SLOT( applyIntensity() ) ); TQVBox * vbox = new TQVBox( &dlg ); vbox->setSpacing( KDialog::spacingHint() ); @@ -77,7 +77,7 @@ void KViewEffects::intensity() percent->setValue( m_intensity ); percent->setLabel( i18n( "&Intensity:" ) ); percent->setSuffix( TQString::fromAscii( "%" ) ); - connect( percent, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setIntensity( int ) ) ); + connect( percent, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( setIntensity( int ) ) ); int result = dlg.exec(); if( result == TQDialog::Accepted ) @@ -117,7 +117,7 @@ void KViewEffects::applyIntensity() void KViewEffects::blend() { KDialogBase dlg( m_pViewer->widget(), "Blend Color Dialog", true /*modal*/, i18n( "Blend Color" ), KDialogBase::Ok | KDialogBase::Try | KDialogBase::Cancel ); - connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyBlend() ) ); + connect( &dlg, TQ_SIGNAL( tryClicked() ), this, TQ_SLOT( applyBlend() ) ); TQVBox * vbox = new TQVBox( &dlg ); vbox->setSpacing( KDialog::spacingHint() ); @@ -127,11 +127,11 @@ void KViewEffects::blend() opacity->setValue( m_opacity ); opacity->setLabel( i18n( "O&pacity:" ) ); opacity->setSuffix( TQString::fromAscii( "%" ) ); - connect( opacity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setOpacity( int ) ) ); + connect( opacity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( setOpacity( int ) ) ); TQLabel * label = new TQLabel( i18n( "Blend c&olor:" ), vbox ); KColorButton * color = new KColorButton( m_color, vbox, "Color Input Button" ); label->setBuddy( color ); - connect( color, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( setColor( const TQColor & ) ) ); + connect( color, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SLOT( setColor( const TQColor & ) ) ); int result = dlg.exec(); if( result == TQDialog::Accepted ) @@ -175,12 +175,12 @@ void KViewEffects::applyBlend() void KViewEffects::gamma() { KDialogBase dlg( m_pViewer->widget(), "Gamma Correction Dialog", true /*modal*/, i18n( "Gamma Correction" ), KDialogBase::Ok | KDialogBase::Try | KDialogBase::Cancel ); - connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyGammaCorrection() ) ); + connect( &dlg, TQ_SIGNAL( tryClicked() ), this, TQ_SLOT( applyGammaCorrection() ) ); // create dialog KDoubleNumInput * gammavalue = new KDoubleNumInput( 0.0, 1.0, 0.5, 0.01, 4, &dlg, "Gamma value input" ); gammavalue->setRange( 0.0, 1.0, 0.01, true ); - connect( gammavalue, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setGammaValue( double ) ) ); + connect( gammavalue, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setGammaValue( double ) ) ); gammavalue->setLabel( i18n( "Gamma value:" ) ); dlg.setMainWidget( gammavalue ); diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index f88f09b1..1e1e091c 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -38,7 +38,7 @@ KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, con layout->setAutoAdd( true ); m_pCheckBox = new TQCheckBox( "This is only for testing...", this ); - connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) ); + connect( m_pCheckBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( checkChanged() ) ); } KViewPresenterConfig::~KViewPresenterConfig() diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index b54867d0..965f96b9 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -68,18 +68,18 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri if( m_pViewer ) { ( void ) new TDEAction( i18n( "&Image List..." ), 0, 0, - this, TQT_SLOT( slotImageList() ), + this, TQ_SLOT( slotImageList() ), actionCollection(), "plugin_presenter_imageList" ); m_paSlideshow = new TDEToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" ); ( void ) new TDEAction( i18n( "&Previous Image in List" ), "go-previous", ALT+Key_Left, - this, TQT_SLOT( prev() ), + this, TQ_SLOT( prev() ), actionCollection(), "plugin_presenter_prev" ); ( void ) new TDEAction( i18n( "&Next Image in List" ), "go-next", ALT+Key_Right, - this, TQT_SLOT( next() ), + this, TQ_SLOT( next() ), actionCollection(), "plugin_presenter_next" ); - connect( m_paSlideshow, TQT_SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, TQT_SLOT( setOn( bool ) ) ); - connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) ); + connect( m_paSlideshow, TQ_SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, TQ_SLOT( setOn( bool ) ) ); + connect( m_pImageList->m_pSlideshow, TQ_SIGNAL( toggled( bool ) ), m_paSlideshow, TQ_SLOT( setChecked( bool ) ) ); // search for file_open action KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( parent->tqt_cast( "KXMLGUIClient" ) ); @@ -89,48 +89,48 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri m_paFileClose = parentClient->actionCollection()->action( "file_close" ); } if( m_paFileClose ) - connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); + connect( m_paFileClose, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotClose() ) ); if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) ); - connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); + disconnect( m_paFileOpen, TQ_SIGNAL( activated() ), parent, TQ_SLOT( slotOpenFile() ) ); + connect( m_paFileOpen, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotOpenFiles() ) ); } else { (void) new TDEAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O, - this, TQT_SLOT( slotOpenFiles() ), + this, TQ_SLOT( slotOpenFiles() ), actionCollection(), "plugin_presenter_openFiles" ); } - connect( m_pViewer, TQT_SIGNAL( imageOpened( const KURL & ) ), - TQT_SLOT( slotImageOpened( const KURL & ) ) ); + connect( m_pViewer, TQ_SIGNAL( imageOpened( const KURL & ) ), + TQ_SLOT( slotImageOpened( const KURL & ) ) ); } else kdWarning( 4630 ) << "no KImageViewer interface found - the presenter plugin won't work" << endl; //( void )new KViewPresenterConfModule( this ); - connect( m_pImageList->m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( changeItem( TQListViewItem* ) ) ); - connect( m_pImageList->m_pPrevious, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( prev() ) ); - connect( m_pImageList->m_pNext, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( next() ) ); - connect( m_pImageList->m_pListView, TQT_SIGNAL( spacePressed( TQListViewItem* ) ), - this, TQT_SLOT( changeItem( TQListViewItem* ) ) ); - connect( m_pImageList->m_pListView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( changeItem( TQListViewItem* ) ) ); - connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slideshow( bool ) ) ); - connect( m_pImageList->m_pInterval, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setSlideshowInterval( int ) ) ); - connect( m_pImageList->m_pShuffle, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( shuffle() ) ); - connect( m_pImageList->m_pLoad, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( loadList() ) ); - connect( m_pImageList->m_pSave, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( saveList() ) ); - connect( m_pImageList->m_pCloseAll, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( closeAll() ) ); + connect( m_pImageList->m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( changeItem( TQListViewItem* ) ) ); + connect( m_pImageList->m_pPrevious, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( prev() ) ); + connect( m_pImageList->m_pNext, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( next() ) ); + connect( m_pImageList->m_pListView, TQ_SIGNAL( spacePressed( TQListViewItem* ) ), + this, TQ_SLOT( changeItem( TQListViewItem* ) ) ); + connect( m_pImageList->m_pListView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( changeItem( TQListViewItem* ) ) ); + connect( m_pImageList->m_pSlideshow, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slideshow( bool ) ) ); + connect( m_pImageList->m_pInterval, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setSlideshowInterval( int ) ) ); + connect( m_pImageList->m_pShuffle, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( shuffle() ) ); + connect( m_pImageList->m_pLoad, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( loadList() ) ); + connect( m_pImageList->m_pSave, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( saveList() ) ); + connect( m_pImageList->m_pCloseAll, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( closeAll() ) ); // allow drop on the dialog m_pImageList->installEventFilter( this ); @@ -140,8 +140,8 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri // grab drops on the main view m_pViewer->widget()->installEventFilter( this ); - connect( m_pSlideshowTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( next() ) ); + connect( m_pSlideshowTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( next() ) ); } KViewPresenter::~KViewPresenter() @@ -149,13 +149,13 @@ KViewPresenter::~KViewPresenter() kdDebug( 4630 ) << k_funcinfo << endl; if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); + disconnect( m_paFileOpen, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotOpenFiles() ) ); // If the parent() doesn't exist we either leave the "File Open" action // in an unusable state or KView was just shutting down and therefor we // can ignore this. I've only seen the second one happening and to get // rid of the TQObject::connect warning we do the parent() check. if( parent() ) - connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) ); + connect( m_paFileOpen, TQ_SIGNAL( activated() ), parent(), TQ_SLOT( slotOpenFile() ) ); } } diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index 0dc7fb33..cd30e1f3 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -42,7 +42,7 @@ KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsign , m_doselection( true ) { setRange( minValue, maxValue, step, precision ); - connect( this, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotValueChanged( int ) ) ); + connect( this, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotValueChanged( int ) ) ); } KFloatSpinBox::~KFloatSpinBox() diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 28298323..1813bac9 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -47,7 +47,7 @@ KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & m_pCanvas = m_pViewer->canvas(); (void) new TDEAction( i18n( "&Scale Image..." ), 0, 0, - this, TQT_SLOT( slotScaleDlg() ), + this, TQ_SLOT( slotScaleDlg() ), actionCollection(), "plugin_scale" ); } else diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 308546cd..d4c33262 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -157,16 +157,16 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name m_newsizeunit2 = 0; m_resolutionunit = 0; - connect( m_pNewWidth, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewWidth( float ) ) ); - connect( m_pNewHeight, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewHeight( float ) ) ); - connect( m_pNewWidth2, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewWidth2( float ) ) ); - connect( m_pNewHeight2, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewHeight2( float ) ) ); - connect( m_pResolutionX, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotResolutionX( float ) ) ); - connect( m_pResolutionY, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotResolutionY( float ) ) ); - - connect( m_pNewSizeUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotChangeNewSizeUnit( int ) ) ); - connect( m_pNewSizeUnit2, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotChangeNewSizeUnit2( int ) ) ); - connect( m_pResolutionUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotChangeResolutionUnit( int ) ) ); + connect( m_pNewWidth, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewWidth( float ) ) ); + connect( m_pNewHeight, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewHeight( float ) ) ); + connect( m_pNewWidth2, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewWidth2( float ) ) ); + connect( m_pNewHeight2, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewHeight2( float ) ) ); + connect( m_pResolutionX, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotResolutionX( float ) ) ); + connect( m_pResolutionY, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotResolutionY( float ) ) ); + + connect( m_pNewSizeUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotChangeNewSizeUnit( int ) ) ); + connect( m_pNewSizeUnit2, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotChangeNewSizeUnit2( int ) ) ); + connect( m_pResolutionUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotChangeResolutionUnit( int ) ) ); } ScaleDlg::~ScaleDlg() diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index 8f464522..ee964d4f 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -47,7 +47,7 @@ KViewScanner::KViewScanner( TQObject* parent, const char* name, if( m_pViewer ) { (void) new TDEAction( i18n( "&Scan Image..." ), "scanner", 0, - this, TQT_SLOT( slotScan() ), + this, TQ_SLOT( slotScan() ), actionCollection(), "plugin_scan" ); } else @@ -67,8 +67,8 @@ void KViewScanner::slotScan() { m_pScandlg->setMinimumSize( 300, 300 ); - connect( m_pScandlg, TQT_SIGNAL( finalImage( const TQImage &, int ) ), - this, TQT_SLOT( slotImgScanned( const TQImage & ) ) ); + connect( m_pScandlg, TQ_SIGNAL( finalImage( const TQImage &, int ) ), + this, TQ_SLOT( slotImgScanned( const TQImage & ) ) ); } else { diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index 023788c7..3a22d9df 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -24,7 +24,7 @@ KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQString if( m_pViewer ) { (void) new TDEAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0, - this, TQT_SLOT( yourSlot() ), + this, TQ_SLOT( yourSlot() ), actionCollection(), "plugin_template" ); } else diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index 00b0790b..80a420f5 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -50,24 +50,24 @@ Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes) mPhotoBook = parent; mMimeTypes = mimetypes; - connect(&mDirLister, TQT_SIGNAL(clear()), TQT_SLOT(slotClearView())); - connect(&mDirLister, TQT_SIGNAL(completed()), TQT_SLOT(doneListing())); + connect(&mDirLister, TQ_SIGNAL(clear()), TQ_SLOT(slotClearView())); + connect(&mDirLister, TQ_SIGNAL(completed()), TQ_SLOT(doneListing())); connect( - &mDirLister, TQT_SIGNAL(newItems(const KFileItemList &)), - TQT_SLOT(insertNewFiles(const KFileItemList &)) + &mDirLister, TQ_SIGNAL(newItems(const KFileItemList &)), + TQ_SLOT(insertNewFiles(const KFileItemList &)) ); connect( - signaler(), TQT_SIGNAL(fileSelected(const KFileItem*)), - TQT_SLOT(open(const KFileItem*)) + signaler(), TQ_SIGNAL(fileSelected(const KFileItem*)), + TQ_SLOT(open(const KFileItem*)) ); connect( - &mDirLister, TQT_SIGNAL(deleteItem(KFileItem *)), - TQT_SLOT(removeItem(KFileItem *)) + &mDirLister, TQ_SIGNAL(deleteItem(KFileItem *)), + TQ_SLOT(removeItem(KFileItem *)) ); connect( - &mDirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) + &mDirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); setFixedWidth(128); @@ -136,7 +136,7 @@ void Previews::open(const KFileItem *item) void Previews::doneListing() { // eep! -- this should not be necessary - TQTimer::singleShot(0, this, TQT_SLOT(goToFirst())); + TQTimer::singleShot(0, this, TQ_SLOT(goToFirst())); } void Previews::goToFirst() @@ -184,8 +184,8 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) mFit = mViewer->action("fittowin"); - connect(mList, TQT_SIGNAL(open(const KURL&)), mViewer, TQT_SLOT(openURL(const KURL&))); - connect(mViewer, TQT_SIGNAL(completed()), mFit, TQT_SLOT(activate())); + connect(mList, TQ_SIGNAL(open(const KURL&)), mViewer, TQ_SLOT(openURL(const KURL&))); + connect(mViewer, TQ_SIGNAL(completed()), mFit, TQ_SLOT(activate())); part->insertChildClient(mViewer); } @@ -233,11 +233,11 @@ PhotoBookPart::PhotoBookPart( setWidget(bv); connect( - bv, TQT_SIGNAL(emitUpdateButton(bool, bool)), - this, TQT_SLOT(slotUpdateButton(bool, bool)) + bv, TQ_SIGNAL(emitUpdateButton(bool, bool)), + this, TQ_SLOT(slotUpdateButton(bool, bool)) ); - m_pNextAction = KStdAction::next(bv, TQT_SLOT(next()), actionCollection(), "next"); - m_pPreviousAction = KStdAction::prior(bv, TQT_SLOT(previous()), actionCollection(), "previous"); + m_pNextAction = KStdAction::next(bv, TQ_SLOT(next()), actionCollection(), "next"); + m_pPreviousAction = KStdAction::prior(bv, TQ_SLOT(previous()), actionCollection(), "previous"); setXMLFile( "photobookui.rc" ); diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index a4737821..90533c26 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -85,7 +85,7 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache setMouseTracking(true); setFocusPolicy(TQWidget::ClickFocus); - connect(&clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar())); + connect(&clearStatusBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearStatusBar())); setBackgroundMode(TQt::NoBackground); if (!busyIcon) @@ -260,7 +260,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) { // Request page pixmap. pixmapRequested = true; - TQTimer::singleShot(50, this, TQT_SLOT(delayedRequestPage())); + TQTimer::singleShot(50, this, TQ_SLOT(delayedRequestPage())); } return; } @@ -367,7 +367,7 @@ void DocumentWidget::drawScrollGuide(int ycoord) //kdDebug() << "draw scroll guide for page " << pageNr << " at y = " << ycoord << endl; scrollGuide = ycoord; update(TQRect(1, scrollGuide, pageSize().width(), 1)); - TQTimer::singleShot(1000, this, TQT_SLOT(clearScrollGuide())); + TQTimer::singleShot(1000, this, TQ_SLOT(clearScrollGuide())); } void DocumentWidget::clearScrollGuide() diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index aec9a7c5..a370bc76 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -68,7 +68,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p setInstance(KViewPartFactory::instance()); watch = KDirWatch::self(); - connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(fileChanged(const TQString&))); + connect(watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(fileChanged(const TQString&))); watch->startScan(); mainWidget = new TQHBox(parentWidget, widgetName); @@ -83,7 +83,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Without this the GUI-items of the KMultiPages are not merged partManager->setAllowNestedParts(true); - connect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + connect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); partManager->addPart(this); // create the displaying part @@ -170,28 +170,28 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Add the multipage to the GUI. partManager->addPart(multiPage); - exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text"); + exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQ_SLOT(mp_exportText()), actionCollection(), "export_text"); // edit menu - findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find"); - findNextAction = KStdAction::findNext(this, TQT_SLOT(mp_findNextText()), actionCollection(), "findnext"); + findTextAction = KStdAction::find(this, TQ_SLOT(mp_showFindTextDialog()), actionCollection(), "find"); + findNextAction = KStdAction::findNext(this, TQ_SLOT(mp_findNextText()), actionCollection(), "findnext"); findNextAction->setEnabled(false); - findPrevAction = KStdAction::findPrev(this, TQT_SLOT(mp_findPrevText()), actionCollection(), "findprev"); + findPrevAction = KStdAction::findPrev(this, TQ_SLOT(mp_findPrevText()), actionCollection(), "findprev"); findPrevAction->setEnabled(false); - selectAllAction = KStdAction::selectAll(this, TQT_SLOT(mp_doSelectAll()), actionCollection(), "edit_select_all"); + selectAllAction = KStdAction::selectAll(this, TQ_SLOT(mp_doSelectAll()), actionCollection(), "edit_select_all"); - copyTextAction = KStdAction::copy(this, TQT_SLOT(mp_copyText()), actionCollection(), "copy_text"); + copyTextAction = KStdAction::copy(this, TQ_SLOT(mp_copyText()), actionCollection(), "copy_text"); copyTextAction->setEnabled(false); - deselectAction = KStdAction::deselect(this, TQT_SLOT(mp_clearSelection()), actionCollection(), "edit_deselect_all"); + deselectAction = KStdAction::deselect(this, TQ_SLOT(mp_clearSelection()), actionCollection(), "edit_deselect_all"); deselectAction->setEnabled(false); - saveAction = KStdAction::save(this, TQT_SLOT(mp_slotSave_defaultFilename()), actionCollection()); + saveAction = KStdAction::save(this, TQ_SLOT(mp_slotSave_defaultFilename()), actionCollection()); // settings menu showSidebar = new TDEToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this, - TQT_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar"); + TQ_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar"); showSidebar->setCheckedState(i18n("Hide &Sidebar")); watchAct = new TDEToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file"); scrollbarHandling = new TDEToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling"); @@ -212,17 +212,17 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p orientations.append(i18n("Landscape")); orientation = new TDESelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation"); orientation->setItems(orientations); - connect(orientation, TQT_SIGNAL(activated (int)), &userRequestedPaperSize, TQT_SLOT(setOrientation(int))); + connect(orientation, TQ_SIGNAL(activated (int)), &userRequestedPaperSize, TQ_SLOT(setOrientation(int))); // Zoom Menu zoom_action = new TDESelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom"); zoom_action->setEditable(true); zoom_action->setItems(_zoomVal.zoomNames()); - connect (&_zoomVal, TQT_SIGNAL(zoomNamesChanged(const TQStringList &)), zoom_action, TQT_SLOT(setItems(const TQStringList &))); - connect (&_zoomVal, TQT_SIGNAL(valNoChanged(int)), zoom_action, TQT_SLOT(setCurrentItem(int))); - connect (&_zoomVal, TQT_SIGNAL(zoomNameChanged(const TQString &)), this, TQT_SIGNAL(zoomChanged(const TQString &)) ); - connect (zoom_action, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setZoomValue(const TQString &))); + connect (&_zoomVal, TQ_SIGNAL(zoomNamesChanged(const TQStringList &)), zoom_action, TQ_SLOT(setItems(const TQStringList &))); + connect (&_zoomVal, TQ_SIGNAL(valNoChanged(int)), zoom_action, TQ_SLOT(setCurrentItem(int))); + connect (&_zoomVal, TQ_SIGNAL(zoomNameChanged(const TQString &)), this, TQ_SIGNAL(zoomChanged(const TQString &)) ); + connect (zoom_action, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setZoomValue(const TQString &))); _zoomVal.setZoomValue(1.0); // should not be necessary @@@@ emit(zoomChanged("100%")); @@ -231,14 +231,14 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p TQStringList items = userRequestedPaperSize.pageSizeNames(); items.prepend(i18n("Custom Size...")); media->setItems(items); - connect (media, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMedia(int))); + connect (media, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMedia(int))); - useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()), + useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQ_SLOT(slotShowSidebar()), actionCollection(), "view_use_document_specified_size"); // Zoom Actions - zoomInAct = KStdAction::zoomIn (this, TQT_SLOT(zoomIn()), actionCollection()); - zoomOutAct = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection()); + zoomInAct = KStdAction::zoomIn (this, TQ_SLOT(zoomIn()), actionCollection()); + zoomOutAct = KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection()); fitPageAct = new TDEToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P, actionCollection(), "view_fit_to_page"); @@ -251,24 +251,24 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p fitWidthAct -> setExclusiveGroup("view_fit"); fitHeightAct -> setExclusiveGroup("view_fit"); - connect(fitPageAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToPage(bool))); - connect(fitWidthAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToWidth(bool))); - connect(fitHeightAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToHeight(bool))); + connect(fitPageAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToPage(bool))); + connect(fitWidthAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToWidth(bool))); + connect(fitHeightAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToHeight(bool))); // go menu - backAct = KStdAction::prior(this, TQT_SLOT(mp_prevPage()), actionCollection()); - forwardAct = KStdAction::next(this, TQT_SLOT(mp_nextPage()), actionCollection()); - startAct = KStdAction::firstPage(this, TQT_SLOT(mp_firstPage()), actionCollection()); - endAct = KStdAction::lastPage(this, TQT_SLOT(mp_lastPage()), actionCollection()); - gotoAct = KStdAction::gotoPage(this, TQT_SLOT(goToPage()), actionCollection()); + backAct = KStdAction::prior(this, TQ_SLOT(mp_prevPage()), actionCollection()); + forwardAct = KStdAction::next(this, TQ_SLOT(mp_nextPage()), actionCollection()); + startAct = KStdAction::firstPage(this, TQ_SLOT(mp_firstPage()), actionCollection()); + endAct = KStdAction::lastPage(this, TQ_SLOT(mp_lastPage()), actionCollection()); + gotoAct = KStdAction::gotoPage(this, TQ_SLOT(goToPage()), actionCollection()); gotoAct->setShortcut("CTRL+G"); - readUpAct = new TDEAction(i18n("Read Up Document"), "go-up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up"); - readDownAct = new TDEAction(i18n("Read Down Document"), "go-down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down"); + readUpAct = new TDEAction(i18n("Read Up Document"), "go-up", SHIFT+Key_Space, this, TQ_SLOT(mp_readUp()), actionCollection(), "go_read_up"); + readDownAct = new TDEAction(i18n("Read Down Document"), "go-down", Key_Space, this, TQ_SLOT(mp_readDown()), actionCollection(), "go_read_down"); - printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); + printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); - saveAsAction = KStdAction::saveAs(this, TQT_SLOT(mp_slotSave()), actionCollection()); + saveAsAction = KStdAction::saveAs(this, TQ_SLOT(mp_slotSave()), actionCollection()); // mode action moveModeAction = new TDERadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool"); @@ -279,20 +279,20 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p moveModeAction->setChecked(true); - connect(moveModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableMoveTool(bool))); - //connect(selectionModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSelectionTool(bool))); + connect(moveModeAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableMoveTool(bool))); + //connect(selectionModeAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSelectionTool(bool))); // history action backAction = new TDEAction(i18n("&Back"), "1leftarrow", 0, - this, TQT_SLOT(mp_doGoBack()), actionCollection(), "go_back"); + this, TQ_SLOT(mp_doGoBack()), actionCollection(), "go_back"); forwardAction = new TDEAction(i18n("&Forward"), "1rightarrow", 0, - this, TQT_SLOT(mp_doGoForward()), actionCollection(), "go_forward"); + this, TQ_SLOT(mp_doGoForward()), actionCollection(), "go_forward"); backAction->setEnabled(false); forwardAction->setEnabled(false); - settingsAction = KStdAction::preferences(this, TQT_SLOT(doSettings()), actionCollection()); + settingsAction = KStdAction::preferences(this, TQ_SLOT(doSettings()), actionCollection()); // We only show this menuitem if no default mimetype is set. This usually means kviewshell // has been started by itself. Otherwise if KDVI or KFaxView has been started show the @@ -300,20 +300,20 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p if (!args.isEmpty()) { aboutAction = new TDEAction(i18n("About KViewShell"), "kviewshell", 0, this, - TQT_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell"); + TQ_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell"); } // keyboard accelerators accel = new TDEAccel(mainWidget); - accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQT_SLOT(mp_scrollUp())); - accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQT_SLOT(mp_scrollDown())); - accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQT_SLOT(mp_scrollLeft())); - accel->insert(I18N_NOOP("Scroll Right"), Key_Right, this, TQT_SLOT(mp_scrollRight())); + accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQ_SLOT(mp_scrollUp())); + accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQ_SLOT(mp_scrollDown())); + accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQ_SLOT(mp_scrollLeft())); + accel->insert(I18N_NOOP("Scroll Right"), Key_Right, this, TQ_SLOT(mp_scrollRight())); - accel->insert(I18N_NOOP("Scroll Up Page"), SHIFT+Key_Up, this, TQT_SLOT(mp_scrollUpPage())); - accel->insert(I18N_NOOP("Scroll Down Page"), SHIFT+Key_Down, this, TQT_SLOT(mp_scrollDownPage())); - accel->insert(I18N_NOOP("Scroll Left Page"), SHIFT+Key_Left, this, TQT_SLOT(mp_scrollLeftPage())); - accel->insert(I18N_NOOP("Scroll Right Page"), SHIFT+Key_Right, this, TQT_SLOT(mp_scrollRightPage())); + accel->insert(I18N_NOOP("Scroll Up Page"), SHIFT+Key_Up, this, TQ_SLOT(mp_scrollUpPage())); + accel->insert(I18N_NOOP("Scroll Down Page"), SHIFT+Key_Down, this, TQ_SLOT(mp_scrollDownPage())); + accel->insert(I18N_NOOP("Scroll Left Page"), SHIFT+Key_Left, this, TQ_SLOT(mp_scrollLeftPage())); + accel->insert(I18N_NOOP("Scroll Right Page"), SHIFT+Key_Right, this, TQ_SLOT(mp_scrollRightPage())); accel->readSettings(); readSettings(); @@ -333,7 +333,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // We disconnect because we dont want some FocusEvents to trigger a GUI update, which might mess // with our menus. - disconnect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + disconnect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); } KViewPart::~KViewPart() @@ -360,41 +360,41 @@ void KViewPart::initializeMultiPage() // Paper Size handling multiPage->setUseDocumentSpecifiedSize(useDocumentSpecifiedSize->isChecked()); multiPage->setUserPreferredSize(userRequestedPaperSize); - connect(&userRequestedPaperSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), multiPage, TQT_SLOT(setUserPreferredSize(const SimplePageSize&))); - connect(useDocumentSpecifiedSize, TQT_SIGNAL(toggled(bool)), multiPage, TQT_SLOT(setUseDocumentSpecifiedSize(bool))); + connect(&userRequestedPaperSize, TQ_SIGNAL(sizeChanged(const SimplePageSize&)), multiPage, TQ_SLOT(setUserPreferredSize(const SimplePageSize&))); + connect(useDocumentSpecifiedSize, TQ_SIGNAL(toggled(bool)), multiPage, TQ_SLOT(setUseDocumentSpecifiedSize(bool))); - connect(scrollbarHandling, TQT_SIGNAL(toggled(bool)), multiPage, TQT_SLOT(slotShowScrollbars(bool))); + connect(scrollbarHandling, TQ_SIGNAL(toggled(bool)), multiPage, TQ_SLOT(slotShowScrollbars(bool))); // connect to the multi page view - connect( this, TQT_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQT_SLOT(slotShowScrollbars(bool))); - connect( multiPage, TQT_SIGNAL(pageInfo(int, int)), this, TQT_SLOT(pageInfo(int, int)) ); - connect( multiPage, TQT_SIGNAL(askingToCheckActions()), this, TQT_SLOT(checkActions()) ); - connect( multiPage, TQT_SIGNAL( started( TDEIO::Job * ) ), this, TQT_SIGNAL( started( TDEIO::Job * ) ) ); - connect( multiPage, TQT_SIGNAL( completed() ), this, TQT_SIGNAL( completed() ) ); - connect( multiPage, TQT_SIGNAL( canceled( const TQString & ) ), this, TQT_SIGNAL( canceled( const TQString & ) ) ); - connect( multiPage, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) ); + connect( this, TQ_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQ_SLOT(slotShowScrollbars(bool))); + connect( multiPage, TQ_SIGNAL(pageInfo(int, int)), this, TQ_SLOT(pageInfo(int, int)) ); + connect( multiPage, TQ_SIGNAL(askingToCheckActions()), this, TQ_SLOT(checkActions()) ); + connect( multiPage, TQ_SIGNAL( started( TDEIO::Job * ) ), this, TQ_SIGNAL( started( TDEIO::Job * ) ) ); + connect( multiPage, TQ_SIGNAL( completed() ), this, TQ_SIGNAL( completed() ) ); + connect( multiPage, TQ_SIGNAL( canceled( const TQString & ) ), this, TQ_SIGNAL( canceled( const TQString & ) ) ); + connect( multiPage, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) ); - connect( multiPage, TQT_SIGNAL(zoomIn()), this, TQT_SLOT(zoomIn()) ); - connect( multiPage, TQT_SIGNAL(zoomOut()), this, TQT_SLOT(zoomOut()) ); + connect( multiPage, TQ_SIGNAL(zoomIn()), this, TQ_SLOT(zoomIn()) ); + connect( multiPage, TQ_SIGNAL(zoomOut()), this, TQ_SLOT(zoomOut()) ); // change the viewmode - connect(viewModeAction, TQT_SIGNAL(activated (int)), multiPage, TQT_SLOT(setViewMode(int))); + connect(viewModeAction, TQ_SIGNAL(activated (int)), multiPage, TQ_SLOT(setViewMode(int))); // Update zoomlevel on viewmode changes - connect(multiPage, TQT_SIGNAL(viewModeChanged()), this, TQT_SLOT(updateZoomLevel())); + connect(multiPage, TQ_SIGNAL(viewModeChanged()), this, TQ_SLOT(updateZoomLevel())); // navigation history - connect(multiPage->history(), TQT_SIGNAL(backItem(bool)), backAction, TQT_SLOT(setEnabled(bool))); - connect(multiPage->history(), TQT_SIGNAL(forwardItem(bool)), forwardAction, TQT_SLOT(setEnabled(bool))); + connect(multiPage->history(), TQ_SIGNAL(backItem(bool)), backAction, TQ_SLOT(setEnabled(bool))); + connect(multiPage->history(), TQ_SIGNAL(forwardItem(bool)), forwardAction, TQ_SLOT(setEnabled(bool))); // text selection - connect(multiPage, TQT_SIGNAL(textSelected(bool)), copyTextAction, TQT_SLOT(setEnabled(bool))); - connect(multiPage, TQT_SIGNAL(textSelected(bool)), deselectAction, TQT_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(textSelected(bool)), copyTextAction, TQ_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(textSelected(bool)), deselectAction, TQ_SLOT(setEnabled(bool))); // text search - connect(multiPage, TQT_SIGNAL(searchEnabled(bool)), findNextAction, TQT_SLOT(setEnabled(bool))); - connect(multiPage, TQT_SIGNAL(searchEnabled(bool)), findPrevAction, TQT_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(searchEnabled(bool)), findNextAction, TQ_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(searchEnabled(bool)), findPrevAction, TQ_SLOT(setEnabled(bool))); // allow parts to have a GUI, too :-) // (will be merged automatically) @@ -845,7 +845,7 @@ bool KViewPart::openFile() // Remember the name of the part. So only need to switch if really necessary. multiPageLibrary = service->library(); - connect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + connect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); // Switch to the new multiPage partManager->replacePart(oldMultiPage, multiPage); @@ -862,7 +862,7 @@ bool KViewPart::openFile() // We disconnect because we dont want some FocusEvents to trigger a GUI update, which might mess // with our menus. - disconnect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + disconnect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); readSettings(); } @@ -1083,15 +1083,15 @@ void KViewPart::enableFitToPage(bool enable) if (enable) { fitToPage(); - connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToPage())); + connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToPage())); } else { - disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToPage())); + disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToPage())); } } @@ -1100,15 +1100,15 @@ void KViewPart::enableFitToWidth(bool enable) if (enable) { fitToWidth(); - connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToWidth())); + connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToWidth())); } else { - disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToWidth())); + disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToWidth())); } } @@ -1117,15 +1117,15 @@ void KViewPart::enableFitToHeight(bool enable) if (enable) { fitToHeight(); - connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToHeight())); + connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToHeight())); } else { - disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToHeight())); + disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToHeight())); } } @@ -1460,7 +1460,7 @@ void KViewPart::doSettings() multiPage->addConfigDialogs(configDialog); - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(preferencesChanged())); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(preferencesChanged())); configDialog->show(); } diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 69641150..12d56b73 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -73,33 +73,33 @@ KViewShell::KViewShell(const TQString& defaultMimeType) setCentralWidget(view->widget()); // file menu - KStdAction::open(view, TQT_SLOT(slotFileOpen()), actionCollection()); - recent = KStdAction::openRecent (this, TQT_SLOT(openURL(const KURL &)), actionCollection()); - reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload"); - closeAction = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::open(view, TQ_SLOT(slotFileOpen()), actionCollection()); + recent = KStdAction::openRecent (this, TQ_SLOT(openURL(const KURL &)), actionCollection()); + reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQ_SLOT(reload()), actionCollection(), "reload"); + closeAction = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit (this, TQ_SLOT(slotQuit()), actionCollection()); - connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile())); + connect(view, TQ_SIGNAL(fileOpened()), this, TQ_SLOT(addRecentFile())); // view menu - fullScreenAction = KStdAction::fullScreen(this, TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); + fullScreenAction = KStdAction::fullScreen(this, TQ_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); // settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbar()), actionCollection()); // statusbar connects - connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) ); - connect( view, TQT_SIGNAL( pageChanged(const TQString &) ), this,TQT_SLOT( slotChangePageText(const TQString &) ) ); - connect( view, TQT_SIGNAL( sizeChanged(const TQString &) ), this,TQT_SLOT( slotChangeSizeText(const TQString &) ) ); + connect( view, TQ_SIGNAL( zoomChanged(const TQString &) ), this,TQ_SLOT( slotChangeZoomText(const TQString &) ) ); + connect( view, TQ_SIGNAL( pageChanged(const TQString &) ), this,TQ_SLOT( slotChangePageText(const TQString &) ) ); + connect( view, TQ_SIGNAL( sizeChanged(const TQString &) ), this,TQ_SLOT( slotChangeSizeText(const TQString &) ) ); // Setup session management - connect( this, TQT_SIGNAL( restoreDocument(const KURL &, int) ), view, TQT_SLOT( restoreDocument(const KURL &, int))); - connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*))); + connect( this, TQ_SIGNAL( restoreDocument(const KURL &, int) ), view, TQ_SLOT( restoreDocument(const KURL &, int))); + connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*))); setXMLFile( "kviewshell.rc" ); createGUI(view); @@ -120,7 +120,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType) statusBar()->changeItem("", StatusBar_ID_Zoom); statusBar()->insertItem(view->pageSizeDescription(), StatusBar_ID_PageSize, 0, true); - connect( view, TQT_SIGNAL(pluginChanged(KParts::Part*)), this, TQT_SLOT(createGUI(KParts::Part*))); + connect( view, TQ_SIGNAL(pluginChanged(KParts::Part*)), this, TQ_SLOT(createGUI(KParts::Part*))); } @@ -290,7 +290,7 @@ void KViewShell::slotEditToolbar() { saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(factory()); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 799b5eea..0d895df3 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -108,7 +108,7 @@ void ThumbnailWidget::paintEvent(TQPaintEvent* e) // TODO: Disable or find something less distractiong. p.drawPixmap(10, 10, *waitIcon); - TQTimer::singleShot(50, this, TQT_SLOT(setThumbnail())); + TQTimer::singleShot(50, this, TQ_SLOT(setThumbnail())); return; } @@ -325,8 +325,8 @@ void MarkList::setNumberOfPages(int numberOfPages, bool _showThumbnails) { MarkListWidget* item = new MarkListWidget(viewport(), this, page, pageCache, showThumbnails); - connect(item, TQT_SIGNAL(selected(const PageNumber&)), this, TQT_SLOT(thumbnailSelected(const PageNumber&))); - connect(item, TQT_SIGNAL(showPopupMenu(const PageNumber&, const TQPoint&)), this, TQT_SLOT(showPopupMenu(const PageNumber&, const TQPoint&))); + connect(item, TQ_SIGNAL(selected(const PageNumber&)), this, TQ_SLOT(thumbnailSelected(const PageNumber&))); + connect(item, TQ_SIGNAL(showPopupMenu(const PageNumber&, const TQPoint&)), this, TQ_SLOT(showPopupMenu(const PageNumber&, const TQPoint&))); widgetList.insert(page - 1, item); diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index 9c6d387d..b9fd432b 100644 --- a/kviewshell/pageSizeWidget.cpp +++ b/kviewshell/pageSizeWidget.cpp @@ -26,7 +26,7 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) : pageSizeWidget_base( parent, name, fl ) { - connect(&chosenSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQT_SLOT(setSize(const SimplePageSize&))); + connect(&chosenSize, TQ_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQ_SLOT(setSize(const SimplePageSize&))); // Set up the formatChoice TQComboBox formatChoice->insertItem(i18n("Custom Size")); @@ -42,17 +42,17 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) } paperSize(formatChoice->currentItem()); - connect(formatChoice, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paperSize(int))); - connect(orientationChoice, TQT_SIGNAL(activated(int)), this, TQT_SLOT(orientationChanged(int))); + connect(formatChoice, TQ_SIGNAL(activated(int)), this, TQ_SLOT(paperSize(int))); + connect(orientationChoice, TQ_SIGNAL(activated(int)), this, TQ_SLOT(orientationChanged(int))); // Update the text fields when the user switches to a new unit, and // when the "custom format" is NOT selected. - connect(widthUnits, TQT_SIGNAL(activated(int)), this, TQT_SLOT(unitsChanged(int))); - connect(heightUnits, TQT_SIGNAL(activated(int)), this, TQT_SLOT(unitsChanged(int))); + connect(widthUnits, TQ_SIGNAL(activated(int)), this, TQ_SLOT(unitsChanged(int))); + connect(heightUnits, TQ_SIGNAL(activated(int)), this, TQ_SLOT(unitsChanged(int))); // Upate the chosen size whenever the user edits the input field. - connect(widthInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(input(const TQString &))); - connect(heightInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(input(const TQString &))); + connect(widthInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(input(const TQString &))); + connect(heightInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(input(const TQString &))); // Allow entries between 0 and 1200. More filtering is done by the // pageSize class, which silently ignores values which are out of diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index c651b0b6..028522f1 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -54,7 +54,7 @@ PageView::PageView( TQWidget* parent, const char* name ) continuousViewmode = true; fullScreen = false; - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(calculateCurrentPageNumber(int, int))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(calculateCurrentPageNumber(int, int))); } diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index ae1ab9f6..8cfde527 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -67,10 +67,10 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO renderModeAction->setCurrentItem(Prefs::renderMode()); - deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); + deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQ_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); // change the rendermode - connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int))); + connect(renderModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setRenderMode(int))); /* It is very important that this method is called in the constructor. Otherwise tdemultipage does not know how to render diff --git a/kviewshell/plugins/djvu/pageRangeWidget.cpp b/kviewshell/plugins/djvu/pageRangeWidget.cpp index 1d5c7be1..4acd8294 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.cpp +++ b/kviewshell/plugins/djvu/pageRangeWidget.cpp @@ -41,8 +41,8 @@ PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _cur _current = _to; } - connect(from, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fromValueChanged(int))); - connect(to, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(toValueChanged(int))); + connect(from, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(fromValueChanged(int))); + connect(to, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(toValueChanged(int))); from->setRange(_from, _to); from->setValue(_current); diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index a753ec45..cd971934 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -72,12 +72,12 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl) caseSensitiveCheckBox->setText(i18n("Case sensitive")); layout->addWidget(caseSensitiveCheckBox); - connect(stopButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSearch())); + connect(stopButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(stopSearch())); - connect(findNextButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNextText())); - connect(findPrevButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findPrevText())); + connect(findNextButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findNextText())); + connect(findPrevButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findPrevText())); - connect(searchText, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged())); + connect(searchText, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged())); textChanged(); } diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp index 82862d14..e5e54598 100644 --- a/kviewshell/tableOfContents.cpp +++ b/kviewshell/tableOfContents.cpp @@ -55,7 +55,7 @@ TableOfContents::TableOfContents(TQWidget* parent) readSettings(); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(itemClicked(TQListViewItem*))); } TableOfContents::~TableOfContents() diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index d1f3fc87..49294609 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -63,7 +63,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject tableOfContents = new TableOfContents(sideBar); sideBar->addItem(tableOfContents, TQIconSet(SmallIcon("contents")), i18n("Contents")); - connect(tableOfContents, TQT_SIGNAL(gotoPage(const Anchor&)), this, TQT_SLOT(gotoPage(const Anchor&))); + connect(tableOfContents, TQ_SIGNAL(gotoPage(const Anchor&)), this, TQ_SLOT(gotoPage(const Anchor&))); // Create MarkList _markList = new MarkList(sideBar, "marklist"); @@ -74,30 +74,30 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject splitterWidget->setResizeMode(sideBar, TQSplitter::KeepSize); - connect(_markList, TQT_SIGNAL(selected(const PageNumber&)), this, TQT_SLOT(gotoPage(const PageNumber&))); + connect(_markList, TQ_SIGNAL(selected(const PageNumber&)), this, TQ_SLOT(gotoPage(const PageNumber&))); _scrollView = new PageView(splitterWidget, widgetName); // Create Search Panel searchWidget = new SearchWidget(verticalBox); searchWidget->hide(); - connect(searchWidget, TQT_SIGNAL(findNextText()), this, TQT_SLOT(findNextText())); - connect(searchWidget, TQT_SIGNAL(findPrevText()), this, TQT_SLOT(findPrevText())); + connect(searchWidget, TQ_SIGNAL(findNextText()), this, TQ_SLOT(findNextText())); + connect(searchWidget, TQ_SIGNAL(findPrevText()), this, TQ_SLOT(findPrevText())); sideBar->setMinimumWidth(80); sideBar->setMaximumWidth(300); - connect(_scrollView, TQT_SIGNAL(currentPageChanged(const PageNumber&)), this, TQT_SLOT(setCurrentPageNumber(const PageNumber&))); - connect(_scrollView, TQT_SIGNAL(viewSizeChanged(const TQSize&)), scrollView(), TQT_SLOT(calculateCurrentPageNumber())); - connect(_scrollView, TQT_SIGNAL(wheelEventReceived(TQWheelEvent *)), this, TQT_SLOT(wheelEvent(TQWheelEvent*))); + connect(_scrollView, TQ_SIGNAL(currentPageChanged(const PageNumber&)), this, TQ_SLOT(setCurrentPageNumber(const PageNumber&))); + connect(_scrollView, TQ_SIGNAL(viewSizeChanged(const TQSize&)), scrollView(), TQ_SLOT(calculateCurrentPageNumber())); + connect(_scrollView, TQ_SIGNAL(wheelEventReceived(TQWheelEvent *)), this, TQ_SLOT(wheelEvent(TQWheelEvent*))); - connect(this, TQT_SIGNAL(enableMoveTool(bool)), _scrollView, TQT_SLOT(slotEnableMoveTool(bool))); + connect(this, TQ_SIGNAL(enableMoveTool(bool)), _scrollView, TQ_SLOT(slotEnableMoveTool(bool))); splitterWidget->setCollapsible(sideBar, false); splitterWidget->setSizes(KVSPrefs::guiLayout()); - connect(searchWidget, TQT_SIGNAL(searchEnabled(bool)), this, TQT_SIGNAL(searchEnabled(bool))); - connect(searchWidget, TQT_SIGNAL(stopSearch()), this, TQT_SLOT(stopSearch())); + connect(searchWidget, TQ_SIGNAL(searchEnabled(bool)), this, TQ_SIGNAL(searchEnabled(bool))); + connect(searchWidget, TQ_SIGNAL(stopSearch()), this, TQ_SLOT(stopSearch())); } @@ -173,7 +173,7 @@ void KMultiPage::slotSave() } TDEIO::Job *job = TDEIO::file_copy( KURL( m_file ), KURL( fileName ), 0600, true, false, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) ); return; } @@ -352,8 +352,8 @@ void KMultiPage::initializePageCache() DocumentWidget* KMultiPage::createDocumentWidget() { DocumentWidget* documentWidget = new DocumentWidget(scrollView()->viewport(), scrollView(), pageCache, "singlePageWidget"); - connect(documentWidget, TQT_SIGNAL(clearSelection()), this, TQT_SLOT(clearSelection())); - connect(this, TQT_SIGNAL(enableMoveTool(bool)), documentWidget, TQT_SLOT(slotEnableMoveTool(bool))); + connect(documentWidget, TQ_SIGNAL(clearSelection()), this, TQ_SLOT(clearSelection())); + connect(this, TQ_SIGNAL(enableMoveTool(bool)), documentWidget, TQ_SLOT(slotEnableMoveTool(bool))); return documentWidget; } @@ -436,8 +436,8 @@ void KMultiPage::generateDocumentWidgets(const PageNumber& _startPage) widgetList.insert(i, documentWidget); documentWidget->show(); - connect(documentWidget, TQT_SIGNAL(localLink(const TQString &)), this, TQT_SLOT(handleLocalLink(const TQString &))); - connect(documentWidget, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)) ); + connect(documentWidget, TQ_SIGNAL(localLink(const TQString &)), this, TQ_SLOT(handleLocalLink(const TQString &))); + connect(documentWidget, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&)) ); } } @@ -868,11 +868,11 @@ void KMultiPage::setRenderer(DocumentRenderer* _renderer) widgetList.resize(0); // Relay signals. - connect(renderer, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); - connect(pageCache, TQT_SIGNAL(paperSizeChanged()), this, TQT_SLOT(renderModeChanged())); - connect(pageCache, TQT_SIGNAL(textSelected(bool)), this, TQT_SIGNAL(textSelected(bool))); - connect(renderer, TQT_SIGNAL(documentIsChanged()), this, TQT_SLOT(renderModeChanged())); - connect(this, TQT_SIGNAL(zoomChanged()), this, TQT_SLOT(repaintAllVisibleWidgets())); + connect(renderer, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&))); + connect(pageCache, TQ_SIGNAL(paperSizeChanged()), this, TQ_SLOT(renderModeChanged())); + connect(pageCache, TQ_SIGNAL(textSelected(bool)), this, TQ_SIGNAL(textSelected(bool))); + connect(renderer, TQ_SIGNAL(documentIsChanged()), this, TQ_SLOT(renderModeChanged())); + connect(this, TQ_SIGNAL(zoomChanged()), this, TQ_SLOT(repaintAllVisibleWidgets())); } diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp index 2c6c601a..4ff60be9 100644 --- a/libkscan/gammadialog.cpp +++ b/libkscan/gammadialog.cpp @@ -41,13 +41,13 @@ GammaDialog::GammaDialog( TQWidget *parent ) : /* This connect is for recalculating the table every time a new * Bright., Contrast or Gamma-Value is set */ - connect( gt, TQT_SIGNAL(tableChanged()), gt, TQT_SLOT(getTable())); + connect( gt, TQ_SIGNAL(tableChanged()), gt, TQ_SLOT(getTable())); gtDisp = new DispGamma( page ); gtDisp->setValueRef( gt->getArrayPtr() ); gtDisp->resize( 280, 280 ); - connect( gt, TQT_SIGNAL(tableChanged()), gtDisp, TQT_SLOT( repaint())); + connect( gt, TQ_SIGNAL(tableChanged()), gtDisp, TQ_SLOT( repaint())); // setCaption( i18n( "Gamma Table" )); @@ -67,17 +67,17 @@ GammaDialog::GammaDialog( TQWidget *parent ) : wBright = new KScanSlider ( page, i18n("Brightness"), -50.0, 50.0 ); TQ_CHECK_PTR(wBright); wBright->slSetSlider( 0 ); - connect( wBright, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setBrightness(int))); + connect( wBright, TQ_SIGNAL(valueChanged(int)), gt, TQ_SLOT(setBrightness(int))); wContrast = new KScanSlider ( page, i18n("Contrast") , -50.0, 50.0 ); TQ_CHECK_PTR(wContrast); wContrast->slSetSlider( 0 ); - connect( wContrast, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setContrast(int))); + connect( wContrast, TQ_SIGNAL(valueChanged(int)), gt, TQ_SLOT(setContrast(int))); wGamma = new KScanSlider ( page, i18n("Gamma"), 30.0, 300.0 ); TQ_CHECK_PTR(wGamma); wGamma->slSetSlider(100); - connect( wGamma, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setGamma(int))); + connect( wGamma, TQ_SIGNAL(valueChanged(int)), gt, TQ_SLOT(setGamma(int))); /* and add the Sliders */ lvSliders->addWidget( wBright, 1 ); diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index c4b2c680..0003520e 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -114,8 +114,8 @@ ImageCanvas::ImageCanvas(TQWidget *parent, update_scaled_pixmap(); // timer-Start and stop - connect( this, TQT_SIGNAL( newRect()), TQT_SLOT( newRectSlot())); - connect( this, TQT_SIGNAL( noRect()), TQT_SLOT( noRectSlot())); + connect( this, TQ_SIGNAL( newRect()), TQ_SLOT( newRectSlot())); + connect( this, TQ_SIGNAL( noRect()), TQ_SLOT( noRectSlot())); //zoomOut();scrollview/scrollview viewport()->setCursor( crossCursor ); diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp index 2726baf9..05ccc8ec 100644 --- a/libkscan/imgscaledialog.cpp +++ b/libkscan/imgscaledialog.cpp @@ -45,8 +45,8 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel, TQ_CHECK_PTR(radios); radios->setTitle( i18n("Select Image Zoom") ); - connect( radios, TQT_SIGNAL( clicked( int )), - this, TQT_SLOT( setSelValue( int ))); + connect( radios, TQ_SIGNAL( clicked( int )), + this, TQ_SLOT( setSelValue( int ))); // left gap: smaller Image TQRadioButton *rb25 = new TQRadioButton (i18n ("25 %"), radios); @@ -109,10 +109,10 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel, sn.setNum(curr_sel ); leCust->setValidator( new KIntValidator( leCust ) ); leCust->setText(sn ); - connect( leCust, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( customChanged( const TQString& ))); - connect( rbCust, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT(enableAndFocus(bool))); + connect( leCust, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( customChanged( const TQString& ))); + connect( rbCust, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT(enableAndFocus(bool))); leCust->setEnabled( rbCust->isChecked()); diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index a4d46da5..8dad6e2a 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -135,8 +135,8 @@ KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *parent w = so->createWidget( parent, desc, tooltip ); if( w ) { - connect( so, TQT_SIGNAL( optionChanged( KScanOption* ) ), - this, TQT_SLOT( slOptChanged( KScanOption* ))); + connect( so, TQ_SIGNAL( optionChanged( KScanOption* ) ), + this, TQ_SLOT( slOptChanged( KScanOption* ))); w->setEnabled( so->active() ); } else @@ -209,7 +209,7 @@ KScanDevice::KScanDevice( TQObject *parent ) } } #if 0 - connect( this, TQT_SIGNAL(sigOptionsChanged()), TQT_SLOT(slReloadAll())); + connect( this, TQ_SIGNAL(sigOptionsChanged()), TQ_SLOT(slReloadAll())); #endif gammaTables = new KScanOptSet( "GammaTables" ); } @@ -218,7 +218,7 @@ KScanDevice::KScanDevice( TQObject *parent ) kdDebug(29000) << "ERROR: sane_init failed -> SANE installed ?" << endl; } - connect( this, TQT_SIGNAL( sigScanFinished( KScanStat )), TQT_SLOT( slScanFinished( KScanStat ))); + connect( this, TQ_SIGNAL( sigScanFinished( KScanStat )), TQ_SLOT( slScanFinished( KScanStat ))); } @@ -1105,8 +1105,8 @@ KScanStat KScanDevice::acquire_data( bool isPreview ) if( sane_get_select_fd( scanner_handle, &fd ) == SANE_STATUS_GOOD ) { sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); - TQObject::connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( doProcessABlock() ) ); + TQObject::connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( doProcessABlock() ) ); } } diff --git a/libkscan/kscanoption.cpp b/libkscan/kscanoption.cpp index 4a820ee9..db116203 100644 --- a/libkscan/kscanoption.cpp +++ b/libkscan/kscanoption.cpp @@ -1085,8 +1085,8 @@ TQWidget *KScanOption::createWidget( TQWidget *parent, const TQString& w_desc, case BOOL: /* Widget Type is ToggleButton */ w = new TQCheckBox( text, parent, "AUTO_TOGGLE_BUTTON" ); - connect( w, TQT_SIGNAL(clicked()), this, - TQT_SLOT(slWidgetChange())); + connect( w, TQ_SIGNAL(clicked()), this, + TQ_SLOT(slWidgetChange())); break; case SINGLE_VAL: /* Widget Type is Entry-Field */ @@ -1120,8 +1120,8 @@ TQWidget *KScanOption::createWidget( TQWidget *parent, const TQString& w_desc, if( w ) { internal_widget = w; - connect( this, TQT_SIGNAL( optionChanged( KScanOption*)), - TQT_SLOT( slRedrawWidget( KScanOption* ))); + connect( this, TQ_SIGNAL( optionChanged( KScanOption*)), + TQ_SLOT( slRedrawWidget( KScanOption* ))); TQString tt = tooltip; if( tt.isEmpty() && desc ) tt = TQString::fromLocal8Bit( desc->desc ); @@ -1143,8 +1143,8 @@ TQWidget *KScanOption::comboBox( TQWidget *parent, const TQString& text ) KScanCombo *cb = new KScanCombo( parent, text, list); - connect( cb, TQT_SIGNAL( valueChanged( const TQCString& )), this, - TQT_SLOT( slWidgetChange( const TQCString& ))); + connect( cb, TQ_SIGNAL( valueChanged( const TQCString& )), this, + TQ_SLOT( slWidgetChange( const TQCString& ))); return( cb ); } @@ -1153,8 +1153,8 @@ TQWidget *KScanOption::comboBox( TQWidget *parent, const TQString& text ) TQWidget *KScanOption::entryField( TQWidget *parent, const TQString& text ) { KScanEntry *ent = new KScanEntry( parent, text ); - connect( ent, TQT_SIGNAL( valueChanged( TQCString )), this, - TQT_SLOT( slWidgetChange( TQCString ))); + connect( ent, TQ_SIGNAL( valueChanged( TQCString )), this, + TQ_SLOT( slWidgetChange( TQCString ))); return( ent ); } @@ -1167,8 +1167,8 @@ TQWidget *KScanOption::KSaneSlider( TQWidget *parent, const TQString& text ) KScanSlider *slider = new KScanSlider( parent, text, min, max ); /* Connect to the options change Slot */ - connect( slider, TQT_SIGNAL( valueChanged(int)), this, - TQT_SLOT( slWidgetChange(int))); + connect( slider, TQ_SIGNAL( valueChanged(int)), this, + TQ_SLOT( slWidgetChange(int))); return( slider ); } diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp index 01179b8d..03988072 100644 --- a/libkscan/kscanslider.cpp +++ b/libkscan/kscanslider.cpp @@ -49,8 +49,8 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text, m_stdButt->setPixmap( loader->loadIcon( "edit-undo",TDEIcon::Small )); /* connect the button click to setting the value */ - connect( m_stdButt, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slRevertValue())); + connect( m_stdButt, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slRevertValue())); TQToolTip::add( m_stdButt, i18n( "Revert value back to its standard value %1" ).arg( stdValue )); @@ -73,11 +73,11 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text, /* make spin box changes change the slider */ - connect( m_spin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slSliderChange(int))); + connect( m_spin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slSliderChange(int))); /* Handle internal number display */ - // connect(slider, TQT_SIGNAL(valueChanged(int)), numdisp, TQT_SLOT( setNum(int) )); - connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT( slSliderChange(int) )); + // connect(slider, TQ_SIGNAL(valueChanged(int)), numdisp, TQ_SLOT( setNum(int) )); + connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT( slSliderChange(int) )); /* set Value 0 to the widget */ slider->setValue( (int) min -1 ); @@ -159,10 +159,10 @@ KScanEntry::KScanEntry( TQWidget *parent, const TQString& text ) entry = new TQLineEdit( this, "AUTO_ENTRYFIELD_E" ); l1->setBuddy( entry ); - connect( entry, TQT_SIGNAL( textChanged(const TQString& )), - this, TQT_SLOT( slEntryChange(const TQString&))); - connect( entry, TQT_SIGNAL( returnPressed()), - this, TQT_SLOT( slReturnPressed())); + connect( entry, TQ_SIGNAL( textChanged(const TQString& )), + this, TQ_SLOT( slEntryChange(const TQString&))); + connect( entry, TQ_SIGNAL( returnPressed()), + this, TQ_SLOT( slReturnPressed())); hb->addWidget( entry,3 ); hb->activate(); @@ -249,10 +249,10 @@ void KScanCombo::createCombo( const TQString& text ) combo = new TQComboBox( this, "AUTO_COMBO" ); - connect( combo, TQT_SIGNAL(activated( const TQString &)), this, - TQT_SLOT( slComboChange( const TQString &))); - connect( combo, TQT_SIGNAL(activated( int )), - this, TQT_SLOT(slFireActivated(int))); + connect( combo, TQ_SIGNAL(activated( const TQString &)), this, + TQ_SLOT( slComboChange( const TQString &))); + connect( combo, TQ_SIGNAL(activated( int )), + this, TQ_SLOT(slFireActivated(int))); } diff --git a/libkscan/massscandialog.cpp b/libkscan/massscandialog.cpp index fb686bab..2a805fe6 100644 --- a/libkscan/massscandialog.cpp +++ b/libkscan/massscandialog.cpp @@ -84,13 +84,13 @@ MassScanDialog::MassScanDialog( TQWidget *parent ) bigdad->addLayout( l_but ); TQPushButton *b_start = new TQPushButton( i18n("Start Scan"), this, "ButtOK" ); - connect( b_start, TQT_SIGNAL(clicked()), this, TQT_SLOT( slStartScan()) ); + connect( b_start, TQ_SIGNAL(clicked()), this, TQ_SLOT( slStartScan()) ); TQPushButton *b_cancel = new TQPushButton( i18n("Stop"), this, "ButtCancel" ); - connect( b_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slStopScan()) ); + connect( b_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slStopScan()) ); TQPushButton *b_finish = new KPushButton( KStdGuiItem::close(), this, "ButtFinish" ); - connect( b_finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(slFinished()) ); + connect( b_finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(slFinished()) ); l_but->addWidget( b_start ); l_but->addWidget( b_cancel ); diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index b899c76f..2409dd08 100644 --- a/libkscan/previewer.cpp +++ b/libkscan/previewer.cpp @@ -147,16 +147,16 @@ Previewer::Previewer(TQWidget *parent, const char *name ) /* Actions for the previewer zoom */ TDEAction *act; act = new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I, - this, TQT_SLOT( slScaleToWidth()), this, "preview_scaletowidth" ); + this, TQ_SLOT( slScaleToWidth()), this, "preview_scaletowidth" ); act->plug( img_canvas->contextMenu()); act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H, - this, TQT_SLOT( slScaleToHeight()), this, "preview_scaletoheight" ); + this, TQ_SLOT( slScaleToHeight()), this, "preview_scaletoheight" ); act->plug( img_canvas->contextMenu()); /*Signals: Control the custom-field and show size of selection */ - connect( img_canvas, TQT_SIGNAL(newRect()), this, TQT_SLOT(slCustomChange())); - connect( img_canvas, TQT_SIGNAL(newRect(TQRect)), this, TQT_SLOT(slNewDimen(TQRect))); + connect( img_canvas, TQ_SIGNAL(newRect()), this, TQ_SLOT(slCustomChange())); + connect( img_canvas, TQ_SIGNAL(newRect(TQRect)), this, TQ_SLOT(slNewDimen(TQRect))); /* Stuff for the preview-Notification */ left->addWidget( new TQLabel( i18n("<B>Preview</B>"), frame ), 1); @@ -174,8 +174,8 @@ Previewer::Previewer(TQWidget *parent, const char *name ) pre_format_combo->insertItem( i18n( "10x15 cm" ), ID_10_15 ); pre_format_combo->insertItem( i18n( "Letter" ), ID_LETTER); - connect( pre_format_combo, TQT_SIGNAL(activated (int)), - this, TQT_SLOT( slFormatChange(int))); + connect( pre_format_combo, TQ_SIGNAL(activated (int)), + this, TQ_SLOT( slFormatChange(int))); left->addWidget( pre_format_combo, 1 ); @@ -190,7 +190,7 @@ Previewer::Previewer(TQWidget *parent, const char *name ) portrait_id = bgroup->id( rb2 ); bgroup->setButton( portrait_id ); - connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slOrientChange(int))); + connect(bgroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slOrientChange(int))); int rblen = 5+w+12; // 12 for the button? rb1->setGeometry( 5, 6, rblen, h ); @@ -211,22 +211,22 @@ Previewer::Previewer(TQWidget *parent, const char *name ) d->m_cbBackground = new TQComboBox( hbox ); d->m_cbBackground->insertItem(i18n("Black"), BG_ITEM_BLACK ); d->m_cbBackground->insertItem(i18n("White"), BG_ITEM_WHITE ); - connect( d->m_cbBackground, TQT_SIGNAL(activated(int) ), - this, TQT_SLOT( slScanBackgroundChanged( int ))); + connect( d->m_cbBackground, TQ_SIGNAL(activated(int) ), + this, TQ_SLOT( slScanBackgroundChanged( int ))); TQToolTip::add( d->m_cbBackground, i18n("Select whether a scan of the empty\n" "scanner glass results in a\n" "black or a white image.")); - connect( d->m_cbAutoSel, TQT_SIGNAL(toggled(bool) ), TQT_SLOT(slAutoSelToggled(bool))); + connect( d->m_cbAutoSel, TQ_SIGNAL(toggled(bool) ), TQ_SLOT(slAutoSelToggled(bool))); (void) new TQLabel( i18n("scanner background"), d->m_autoSelGroup ); TQLabel *l1= new TQLabel( i18n("Thresh&old:"), d->m_autoSelGroup ); d->m_sliderThresh = new TQSlider( 0, 254, 10, d->m_autoSelThresh, TQt::Horizontal, d->m_autoSelGroup ); - connect( d->m_sliderThresh, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelThresh(int))); + connect( d->m_sliderThresh, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slSetAutoSelThresh(int))); TQToolTip::add( d->m_sliderThresh, i18n("Threshold for autodetection.\n" "All pixels higher (on black background)\n" @@ -237,7 +237,7 @@ Previewer::Previewer(TQWidget *parent, const char *name ) #if 0 /** Dustsize-Slider: No deep impact on result **/ (void) new TQLabel( i18n("Dust size:"), grBox ); d->m_sliderDust = new TQSlider( 0, 50, 5, d->m_dustsize, TQt::Horizontal, grBox ); - connect( d->m_sliderDust, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelDustsize(int))); + connect( d->m_sliderDust, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slSetAutoSelDustsize(int))); #endif /* disable Autoselbox as long as no scanner is connected */ @@ -251,10 +251,10 @@ Previewer::Previewer(TQWidget *parent, const char *name ) TQLabel *l2 = new TQLabel( i18n("width - mm" ), gbox ); TQLabel *l3 = new TQLabel( i18n("height - mm" ), gbox ); - connect( this, TQT_SIGNAL(setScanWidth(const TQString&)), - l2, TQT_SLOT(setText(const TQString&))); - connect( this, TQT_SIGNAL(setScanHeight(const TQString&)), - l3, TQT_SLOT(setText(const TQString&))); + connect( this, TQ_SIGNAL(setScanWidth(const TQString&)), + l2, TQ_SLOT(setText(const TQString&))); + connect( this, TQ_SIGNAL(setScanHeight(const TQString&)), + l3, TQ_SLOT(setText(const TQString&))); /* size indicator */ TQHBox *hb = new TQHBox( gbox ); @@ -265,8 +265,8 @@ Previewer::Previewer(TQWidget *parent, const char *name ) "changing its background color." )); indi->setText( i18n("-") ); - connect( this, TQT_SIGNAL( setSelectionSize(long)), - indi, TQT_SLOT( setSizeInByte (long)) ); + connect( this, TQ_SIGNAL( setSelectionSize(long)), + indi, TQ_SLOT( setSizeInByte (long)) ); left->addWidget( gbox, 1 ); diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index 2a989212..8c852bea 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -79,13 +79,13 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) m_scanParams = 0; m_device = new KScanDevice( this ); - connect(m_device, TQT_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)), - this, TQT_SLOT(slotFinalImage(TQImage *, ImgScanInfo *))); + connect(m_device, TQ_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)), + this, TQ_SLOT(slotFinalImage(TQImage *, ImgScanInfo *))); - connect( m_device, TQT_SIGNAL(sigScanStart()), this, TQT_SLOT(slotScanStart())); - connect( m_device, TQT_SIGNAL(sigScanFinished(KScanStat)), - this, TQT_SLOT(slotScanFinished(KScanStat))); - connect( m_device, TQT_SIGNAL(sigAcquireStart()), this, TQT_SLOT(slotAcquireStart())); + connect( m_device, TQ_SIGNAL(sigScanStart()), this, TQ_SLOT(slotScanStart())); + connect( m_device, TQ_SIGNAL(sigScanFinished(KScanStat)), + this, TQ_SLOT(slotScanFinished(KScanStat))); + connect( m_device, TQ_SIGNAL(sigAcquireStart()), this, TQ_SLOT(slotAcquireStart())); /* Create a preview widget to the right side of the splitter */ m_previewer = new Previewer( splitter ); TQ_CHECK_PTR(m_previewer ); @@ -93,8 +93,8 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) /* ... and connect to the selector-slots. They communicate user's * selection to the scanner parameter engine */ /* a new preview signal */ - connect( m_device, TQT_SIGNAL( sigNewPreview( TQImage*, ImgScanInfo* )), - this, TQT_SLOT( slotNewPreview( TQImage* ))); + connect( m_device, TQ_SIGNAL( sigNewPreview( TQImage*, ImgScanInfo* )), + this, TQ_SLOT( slotNewPreview( TQImage* ))); m_previewer->setEnabled( false ); // will be enabled in setup() @@ -136,10 +136,10 @@ void ScanDialog::createOptionsTab( void ) /* Note: flag must be inverted because of question is 'the other way round' */ cb_askOnStart->setChecked( !skipDialog ); - connect( cb_askOnStart, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAskOnStartToggle(bool))); + connect( cb_askOnStart, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAskOnStartToggle(bool))); cb_network->setChecked( !onlyLocal ); - connect( cb_network, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNetworkToggle(bool))); + connect( cb_network, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNetworkToggle(bool))); TQWidget *spaceEater = new TQWidget( page ); @@ -230,13 +230,13 @@ bool ScanDialog::setup() } m_scanParams = new ScanParams( splitter ); - connect( m_previewer->getImageCanvas(), TQT_SIGNAL( newRect(TQRect)), - m_scanParams, TQT_SLOT(slCustomScanSize(TQRect))); - connect( m_previewer->getImageCanvas(), TQT_SIGNAL( noRect()), - m_scanParams, TQT_SLOT(slMaximalScanSize())); + connect( m_previewer->getImageCanvas(), TQ_SIGNAL( newRect(TQRect)), + m_scanParams, TQ_SLOT(slCustomScanSize(TQRect))); + connect( m_previewer->getImageCanvas(), TQ_SIGNAL( noRect()), + m_scanParams, TQ_SLOT(slMaximalScanSize())); - connect( m_scanParams, TQT_SIGNAL( scanResolutionChanged( int, int )), - m_previewer, TQT_SLOT( slNewScanResolutions( int, int ))); + connect( m_scanParams, TQ_SIGNAL( scanResolutionChanged( int, int )), + m_previewer, TQ_SLOT( slNewScanResolutions( int, int ))); /* continue to attach a real scanner */ diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index 3dafbc6e..99b3f1ff 100644 --- a/libkscan/scanparams.cpp +++ b/libkscan/scanparams.cpp @@ -157,9 +157,9 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice ) (void) new KSeparator( KSeparator::HLine, this); KButtonBox *kbb = new KButtonBox( this ); TQPushButton* pb = kbb->addButton( KGuiItem( i18n( "Final S&can" ), "scanner" ) ); - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slStartScan()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slStartScan()) ); pb = kbb->addButton( i18n( "&Preview Scan" )); - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slAcquirePreview()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slAcquirePreview()) ); kbb->layout(); /* Initialise the progress dialog */ @@ -169,12 +169,12 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice ) progressDialog->setAutoClose( true ); progressDialog->setAutoReset( true ); - connect( sane_device, TQT_SIGNAL(sigScanProgress(int)), - progressDialog, TQT_SLOT(setProgress(int))); + connect( sane_device, TQ_SIGNAL(sigScanProgress(int)), + progressDialog, TQ_SLOT(setProgress(int))); /* Connect the Progress Dialogs cancel-Button */ - connect( progressDialog, TQT_SIGNAL( cancelled() ), sane_device, - TQT_SLOT( slStopScanning() ) ); + connect( progressDialog, TQ_SIGNAL( cancelled() ), sane_device, + TQ_SLOT( slStopScanning() ) ); return( true ); } @@ -260,8 +260,8 @@ TQScrollView *ScanParams::scannerParams( ) hb->setStretchFactor( cb, 5 ); initialise( so ); - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); } /* Add a button for Source-Selection */ @@ -277,7 +277,7 @@ TQScrollView *ScanParams::scannerParams( ) if( l.count() > 1 ) { pb_source_sel = new TQPushButton( i18n("Source..."), hb ); - connect( pb_source_sel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slSourceSelect())); + connect( pb_source_sel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slSourceSelect())); initialise( &source ); hb->setStretchFactor( pb_source_sel, 3 ); @@ -302,8 +302,8 @@ TQScrollView *ScanParams::scannerParams( ) if( so ) { initialise(so); - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); } } @@ -316,8 +316,8 @@ TQScrollView *ScanParams::scannerParams( ) if( so ) { initialise(so); - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); } } @@ -330,8 +330,8 @@ TQScrollView *ScanParams::scannerParams( ) if( so ) { initialise(so); - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); } } @@ -349,11 +349,11 @@ TQScrollView *ScanParams::scannerParams( ) so->slRedrawWidget( so ); /* connect to slot that passes the resolution to the previewer */ - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT( slNewXResolution(KScanOption*))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT( slNewXResolution(KScanOption*))); - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); xy_resolution_bind = sane_device->getGuiElement(SANE_NAME_RESOLUTION_BIND, pbox, @@ -364,8 +364,8 @@ TQScrollView *ScanParams::scannerParams( ) initialise( xy_resolution_bind ); xy_resolution_bind->slRedrawWidget( xy_resolution_bind ); /* Connect to Gui-change-Slot */ - connect( xy_resolution_bind, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( xy_resolution_bind, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); } /* Resolution Setting -> Y-Resolution Setting */ @@ -451,8 +451,8 @@ TQScrollView *ScanParams::scannerParams( ) SANE_TITLE_CUSTOM_GAMMA, SANE_DESC_CUSTOM_GAMMA ); initialise( so ); - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slReloadAllGui( KScanOption* ))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slReloadAllGui( KScanOption* ))); } else { @@ -465,14 +465,14 @@ TQScrollView *ScanParams::scannerParams( ) pb_edit_gtable = new TQPushButton( i18n("Edit..."), hb1 ); TQ_CHECK_PTR(pb_edit_gtable); - connect( pb_edit_gtable, TQT_SIGNAL( clicked () ), - this, TQT_SLOT( slEditCustGamma () ) ); + connect( pb_edit_gtable, TQ_SIGNAL( clicked () ), + this, TQ_SLOT( slEditCustGamma () ) ); setEditCustomGammaTableState(); /* This connection cares for enabling/disabling the edit-Button */ if(so ) - connect( so, TQT_SIGNAL(guiChange(KScanOption*)), - this, TQT_SLOT(slOptionNotify(KScanOption*))); + connect( so, TQ_SIGNAL(guiChange(KScanOption*)), + this, TQ_SLOT(slOptionNotify(KScanOption*))); /* my Epson Perfection backends offer a list of user defined gamma values */ @@ -664,8 +664,8 @@ void ScanParams::virtualScannerParams( void ) /* Selection if virt. Scanner or SANE Debug */ bg_virt_scan_mode = new TQButtonGroup( 2, TQt::Horizontal, this, "GroupBoxVirtScanner" ); - connect( bg_virt_scan_mode, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT( slVirtScanModeSelect(int))); + connect( bg_virt_scan_mode, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT( slVirtScanModeSelect(int))); TQRadioButton *rb1 = new TQRadioButton( i18n("SANE debug (pnm only)"), bg_virt_scan_mode, "VirtScanSANEDebug" ); @@ -696,8 +696,8 @@ void ScanParams::virtualScannerParams( void ) top->addLayout( hb ); w = virt_filename->widget(); w->setMinimumHeight( (w->sizeHint()).height()); - connect( w, TQT_SIGNAL(returnPressed()), this, - TQT_SLOT( slCheckGlob())); + connect( w, TQ_SIGNAL(returnPressed()), this, + TQ_SLOT( slCheckGlob())); hb->addWidget( w, 12 ); @@ -705,7 +705,7 @@ void ScanParams::virtualScannerParams( void ) pb_file_sel->setPixmap(miniFloppyPixmap); //hb->addStretch( 1 ); hb->addWidget( pb_file_sel, 1 ); - connect( pb_file_sel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slFileSelect())); + connect( pb_file_sel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slFileSelect())); } @@ -863,8 +863,8 @@ void ScanParams::slEditCustGamma( void ) kdDebug(29000) << "Old gamma table: " << old_gt.getGamma() << ", " << old_gt.getBrightness() << ", " << old_gt.getContrast() << endl; GammaDialog gdiag( this ); - connect( &gdiag, TQT_SIGNAL( gammaToApply(KGammaTable*) ), - this, TQT_SLOT( slApplyGamma(KGammaTable*) ) ); + connect( &gdiag, TQ_SIGNAL( gammaToApply(KGammaTable*) ), + this, TQ_SLOT( slApplyGamma(KGammaTable*) ) ); gdiag.setGt( old_gt ); diff --git a/libkscan/scansourcedialog.cpp b/libkscan/scansourcedialog.cpp index e0e7a0d4..cf0408ab 100644 --- a/libkscan/scansourcedialog.cpp +++ b/libkscan/scansourcedialog.cpp @@ -59,7 +59,7 @@ ScanSourceDialog::ScanSourceDialog( TQWidget *parent, const TQStrList list, ADF_ sources = new KScanCombo( vbox, i18n("Select the Scanner document source:"), xx); - connect( sources, TQT_SIGNAL( activated(int)), this, TQT_SLOT( slChangeSource(int))); + connect( sources, TQ_SIGNAL( activated(int)), this, TQ_SLOT( slChangeSource(int))); /* Button Group for ADF-Behaviour */ @@ -70,7 +70,7 @@ ScanSourceDialog::ScanSourceDialog( TQWidget *parent, const TQStrList list, ADF_ { bgroup = new TQVButtonGroup( i18n("Advanced ADF-Options"), vbox, "ADF_BGROUP" ); - connect( bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT( slNotifyADF(int))); + connect( bgroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT( slNotifyADF(int))); /* Two buttons inside */ TQRadioButton *rbADFTillEnd = new TQRadioButton( i18n("Scan until ADF reports out of paper"), diff --git a/tdeiconedit/knew.cpp b/tdeiconedit/knew.cpp index 2536816f..5bbc4ed0 100644 --- a/tdeiconedit/knew.cpp +++ b/tdeiconedit/knew.cpp @@ -157,7 +157,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent ) { wiz = (KWizard*) parent; grp = new TQButtonGroup( this ); - connect( grp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); + connect( grp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); grp->setExclusive( true ); TQVBoxLayout* ml = new TQVBoxLayout( this ); @@ -203,7 +203,7 @@ NewFromTemplate::NewFromTemplate( TQWidget* parent ) TQHBoxLayout* l = new TQHBoxLayout( grp, 15 ); templates = new TDEIconListBox( grp ); - connect( templates, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( checkSelection( int ) ) ); + connect( templates, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( checkSelection( int ) ) ); l->addWidget( templates ); for( int i = 0; i < (int) TDEIconTemplateContainer::self()->count(); i++ ) @@ -237,14 +237,14 @@ KNewIcon::KNewIcon( TQWidget* parent ) nextButton()->setEnabled( false ); select = new NewSelect( this ); - connect( select, TQT_SIGNAL( iconopenstyle( int ) ), TQT_SLOT( iconOpenStyle( int ) ) ); + connect( select, TQ_SIGNAL( iconopenstyle( int ) ), TQ_SLOT( iconOpenStyle( int ) ) ); scratch = new KResizeWidget( this, 0, TQSize( 32, 32 ) ); // this doesn't accept default valid size, besides spin buttons won't allow // an invalid size to be set by the user - forces user to change valid default // size to create the new icon object - - connect( scratch, TQT_SIGNAL( validSize( bool ) ), TQT_SLOT( checkPage( bool ) ) ); - connect(this, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(checkPage(const TQString &))); + connect( scratch, TQ_SIGNAL( validSize( bool ) ), TQ_SLOT( checkPage( bool ) ) ); + connect(this, TQ_SIGNAL(selected(const TQString &)), this, TQ_SLOT(checkPage(const TQString &))); templ = new NewFromTemplate(this); templ->hide(); diff --git a/tdeiconedit/palettetoolbar.cpp b/tdeiconedit/palettetoolbar.cpp index 407821cc..879acdb7 100644 --- a/tdeiconedit/palettetoolbar.cpp +++ b/tdeiconedit/palettetoolbar.cpp @@ -63,8 +63,8 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) vlayout->addWidget( m_sysColors ); - connect( m_sysColors, TQT_SIGNAL( newColor(uint) ), - TQT_SIGNAL( newColor(uint) ) ); + connect( m_sysColors, TQ_SIGNAL( newColor(uint) ), + TQ_SIGNAL( newColor(uint) ) ); vlayout = new TQVBoxLayout( m_layout, 0 ); l = new TQLabel( i18n( "Custom colors:" ), base ); @@ -76,10 +76,10 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) vlayout->addWidget( m_customColors ); - connect( m_customColors, TQT_SIGNAL( newColor(uint) ), - TQT_SIGNAL( newColor(uint) ) ); - connect( this, TQT_SIGNAL( newColor(uint)), - this, TQT_SLOT(currentColorChanged(uint))); + connect( m_customColors, TQ_SIGNAL( newColor(uint) ), + TQ_SIGNAL( newColor(uint) ) ); + connect( this, TQ_SIGNAL( newColor(uint)), + this, TQ_SLOT(currentColorChanged(uint))); currentColorChanged(OPAQUE_MASK|0); setEnableContextMenu( false ); diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp index 464497f3..3763f4db 100644 --- a/tdeiconedit/tdeiconconfig.cpp +++ b/tdeiconedit/tdeiconconfig.cpp @@ -65,13 +65,13 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) TQGridLayout *l = new TQGridLayout(grp->layout()); ln_name = new TQLineEdit( grp ); - connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotTextChanged() ) ); + connect( ln_name, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotTextChanged() ) ); TQLabel* lb_name = new TQLabel( ln_name, i18n( "Description:" ), grp ); ln_path = new KURLRequester(grp); - connect( ln_path, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotTextChanged() ) ); + connect( ln_path, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotTextChanged() ) ); TQLabel* lb_path = new TQLabel( ln_path, i18n( "Path:" ), grp ); l->addWidget(lb_name, 0, 0); @@ -122,10 +122,10 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) grp->setColumnLayout( 0, TQt::Horizontal ); templates = new TDEIconListBox( grp ); - connect( templates, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( checkSelection( int ) ) ); - connect( templates, TQT_SIGNAL(doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( edit() ) ); + connect( templates, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( checkSelection( int ) ) ); + connect( templates, TQ_SIGNAL(doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( edit() ) ); TQVBoxLayout* ml = new TQVBoxLayout( this ); ml->addWidget( grp ); @@ -139,14 +139,14 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) KButtonBox *bbox = new KButtonBox( grp ); btadd = bbox->addButton( i18n( "&Add..." ) ); - connect( btadd, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); + connect( btadd, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); btedit = bbox->addButton( i18n( "&Edit..." ) ); - connect( btedit, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( btedit, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); btedit->setEnabled( false ); btremove = bbox->addButton( i18n( "&Remove" ) ); - connect( btremove, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( btremove, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); btremove->setEnabled( false ); bbox->addStretch( 1 ); @@ -255,7 +255,7 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent ) TQButtonGroup* btngrp = new TQButtonGroup( grp1 ); btngrp->setExclusive( true ); btngrp->setFrameStyle( TQFrame::NoFrame ); - connect( btngrp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotBackgroundMode( int ) ) ); + connect( btngrp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotBackgroundMode( int ) ) ); grp1Layout->addWidget( btngrp, 0, 0 ); TQVBoxLayout *bgl = new TQVBoxLayout( btngrp, 5 ); @@ -274,11 +274,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent ) grp1Layout->addWidget( bbox, 0, 1 ); btcolor = new KColorButton(props->bgColor(), bbox) ; - connect(btcolor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT( selectColor(const TQColor &))); + connect(btcolor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT( selectColor(const TQColor &))); btpix = new TQPushButton(i18n( "Choose..." ), bbox); - connect( btpix, TQT_SIGNAL( clicked() ), TQT_SLOT( selectPixmap() ) ); + connect( btpix, TQ_SIGNAL( clicked() ), TQ_SLOT( selectPixmap() ) ); TQGroupBox *grp2 = new TQGroupBox( i18n( "Preview" ), this ); mainLayout->addWidget( grp2, 1 ); @@ -382,16 +382,16 @@ KMiscConfig::KMiscConfig(TQWidget *parent) : TQWidget(parent) TQBoxLayout *ml = new TQVBoxLayout( this, 0, 5 ); TQCheckBox *cbp = new TQCheckBox( i18n( "Paste &transparent pixels" ), this ); - connect( cbp, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( pasteMode( bool ) ) ); + connect( cbp, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( pasteMode( bool ) ) ); ml->addWidget(cbp); TQCheckBox *cbr = new TQCheckBox( i18n( "Show &rulers" ), this ); - connect( cbr, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( showRulers( bool ) ) ); + connect( cbr, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( showRulers( bool ) ) ); ml->addWidget(cbr); TQButtonGroup* btngrp = new TQButtonGroup( i18n( "Transparency Display" ), this); btngrp->setExclusive( true ); - connect( btngrp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotTransparencyDisplayType( int ) ) ); + connect( btngrp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotTransparencyDisplayType( int ) ) ); ml->addWidget( btngrp ); TQVBoxLayout *tgl = new TQVBoxLayout( btngrp, KDialog::marginHint(), KDialog::spacingHint() ); @@ -406,8 +406,8 @@ KMiscConfig::KMiscConfig(TQWidget *parent) : TQWidget(parent) m_solidColorButton = new KColorButton(props->transparencySolidColor(), btngrp); btngrp->insert( m_solidColorButton, 2 ); hl->addWidget(m_solidColorButton); - //connect(btcolor, TQT_SIGNAL(changed(const TQColor &)), - // TQT_SLOT( selectColor(const TQColor &))); + //connect(btcolor, TQ_SIGNAL(changed(const TQColor &)), + // TQ_SLOT( selectColor(const TQColor &))); TQRadioButton *checkerboardRButton = new TQRadioButton( i18n( "Checker&board" ), btngrp ); btngrp->insert( checkerboardRButton, 1 ); @@ -535,7 +535,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent) { setHelp(TQString()); //KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); - connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(finis())); + connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(finis())); TQVBox* page = addVBoxPage(i18n("Icon Templates"), TQString(), loadIcon("icons")); temps = new KTemplateConfig(page); diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp index 61a80ec7..b72320ac 100644 --- a/tdeiconedit/tdeiconedit.cpp +++ b/tdeiconedit/tdeiconedit.cpp @@ -74,53 +74,53 @@ void TDEIconEdit::init() createGUI(); - connect(this, TQT_SIGNAL(newname(const TQString &)), - TQT_SLOT( slotUpdateStatusName(const TQString &))); - - connect( icon, TQT_SIGNAL( saved()), TQT_SLOT(slotSaved())); - connect( icon, TQT_SIGNAL( loaded(TQImage *)), grid, TQT_SLOT(load(TQImage *))); - connect( icon, TQT_SIGNAL(opennewwin(const TQString &)), - TQT_SLOT(slotNewWin(const TQString &))); - connect(icon, TQT_SIGNAL(newname(const TQString &)), - TQT_SLOT( slotUpdateStatusName(const TQString &))); - connect(icon, TQT_SIGNAL(newmessage(const TQString &)), - TQT_SLOT( slotUpdateStatusMessage(const TQString &))); - connect(icon, TQT_SIGNAL(addrecent(const TQString &)), - TQT_SLOT( addRecent(const TQString &))); - - connect( m_paletteToolBar, TQT_SIGNAL( newColor(uint)), - grid, TQT_SLOT(setColorSelection(uint))); - - connect( grid, TQT_SIGNAL( changed(const TQPixmap &) ), - m_paletteToolBar, TQT_SLOT( previewChanged(const TQPixmap &) ) ); - connect( grid, TQT_SIGNAL( addingcolor(uint) ), - m_paletteToolBar, TQT_SLOT(addColor(uint))); - connect( grid, TQT_SIGNAL( colorschanged(uint, uint*) ), - m_paletteToolBar, TQT_SLOT(addColors(uint, uint*))); - - connect(grid, TQT_SIGNAL(sizechanged(int, int)), - TQT_SLOT( slotUpdateStatusSize(int, int))); - connect(grid, TQT_SIGNAL(poschanged(int, int)), - TQT_SLOT( slotUpdateStatusPos(int, int))); - connect(grid, TQT_SIGNAL(scalingchanged(int)), - TQT_SLOT( slotUpdateStatusScaling(int))); - connect(grid, TQT_SIGNAL(scalingchanged(int)), - TQT_SLOT( slotUpdateZoom(int))); - connect( grid, TQT_SIGNAL( addingcolor(uint) ), - TQT_SLOT(slotUpdateStatusColors(uint))); - connect(grid, TQT_SIGNAL(colorschanged(uint, uint*)), - TQT_SLOT( slotUpdateStatusColors(uint, uint*))); - connect(grid, TQT_SIGNAL(newmessage(const TQString &)), - TQT_SLOT( slotUpdateStatusMessage(const TQString &))); - connect(grid, TQT_SIGNAL(clipboarddata(bool)), - TQT_SLOT( slotUpdatePaste(bool))); - connect(grid, TQT_SIGNAL(colorSelected(uint)), - m_paletteToolBar, TQT_SLOT(currentColorChanged(uint))); - connect(grid, TQT_SIGNAL(modifiedchanged(bool)), - TQT_SLOT( slotUpdateStatusModified(bool))); + connect(this, TQ_SIGNAL(newname(const TQString &)), + TQ_SLOT( slotUpdateStatusName(const TQString &))); + + connect( icon, TQ_SIGNAL( saved()), TQ_SLOT(slotSaved())); + connect( icon, TQ_SIGNAL( loaded(TQImage *)), grid, TQ_SLOT(load(TQImage *))); + connect( icon, TQ_SIGNAL(opennewwin(const TQString &)), + TQ_SLOT(slotNewWin(const TQString &))); + connect(icon, TQ_SIGNAL(newname(const TQString &)), + TQ_SLOT( slotUpdateStatusName(const TQString &))); + connect(icon, TQ_SIGNAL(newmessage(const TQString &)), + TQ_SLOT( slotUpdateStatusMessage(const TQString &))); + connect(icon, TQ_SIGNAL(addrecent(const TQString &)), + TQ_SLOT( addRecent(const TQString &))); + + connect( m_paletteToolBar, TQ_SIGNAL( newColor(uint)), + grid, TQ_SLOT(setColorSelection(uint))); + + connect( grid, TQ_SIGNAL( changed(const TQPixmap &) ), + m_paletteToolBar, TQ_SLOT( previewChanged(const TQPixmap &) ) ); + connect( grid, TQ_SIGNAL( addingcolor(uint) ), + m_paletteToolBar, TQ_SLOT(addColor(uint))); + connect( grid, TQ_SIGNAL( colorschanged(uint, uint*) ), + m_paletteToolBar, TQ_SLOT(addColors(uint, uint*))); + + connect(grid, TQ_SIGNAL(sizechanged(int, int)), + TQ_SLOT( slotUpdateStatusSize(int, int))); + connect(grid, TQ_SIGNAL(poschanged(int, int)), + TQ_SLOT( slotUpdateStatusPos(int, int))); + connect(grid, TQ_SIGNAL(scalingchanged(int)), + TQ_SLOT( slotUpdateStatusScaling(int))); + connect(grid, TQ_SIGNAL(scalingchanged(int)), + TQ_SLOT( slotUpdateZoom(int))); + connect( grid, TQ_SIGNAL( addingcolor(uint) ), + TQ_SLOT(slotUpdateStatusColors(uint))); + connect(grid, TQ_SIGNAL(colorschanged(uint, uint*)), + TQ_SLOT( slotUpdateStatusColors(uint, uint*))); + connect(grid, TQ_SIGNAL(newmessage(const TQString &)), + TQ_SLOT( slotUpdateStatusMessage(const TQString &))); + connect(grid, TQ_SIGNAL(clipboarddata(bool)), + TQ_SLOT( slotUpdatePaste(bool))); + connect(grid, TQ_SIGNAL(colorSelected(uint)), + m_paletteToolBar, TQ_SLOT(currentColorChanged(uint))); + connect(grid, TQ_SIGNAL(modifiedchanged(bool)), + TQ_SLOT( slotUpdateStatusModified(bool))); gridview->checkClipboard(); //Not very elegant, but fixes a buglet - connect(grid, TQT_SIGNAL(selecteddata(bool)), TQT_SLOT( slotUpdateCopy(bool))); + connect(grid, TQ_SIGNAL(selecteddata(bool)), TQ_SLOT( slotUpdateCopy(bool))); kdDebug(4640) << "Updating statusbar" << endl; slotUpdateStatusSize(grid->cols(), grid->rows()); @@ -240,43 +240,43 @@ void TDEIconEdit::setupActions() // File Menu action = new TDEAction(i18n("New &Window"), "window-new", cut, - this, TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window"); + this, TQ_SLOT(slotNewWin()), actionCollection(), "file_new_window"); action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window.")); - action = KStdAction::openNew(this, TQT_SLOT(slotNew()), actionCollection()); + action = KStdAction::openNew(this, TQ_SLOT(slotNew()), actionCollection()); action->setWhatsThis(i18n("New\n\nCreate a new icon, either from a" " template or by specifying the size")); - action = KStdAction::open(this, TQT_SLOT(slotOpen()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(slotOpen()), actionCollection()); action->setWhatsThis(i18n("Open\n\nOpen an existing icon")); m_actRecent = KStdAction::openRecent(this, - TQT_SLOT(slotOpenRecent(const KURL&)), actionCollection()); + TQ_SLOT(slotOpenRecent(const KURL&)), actionCollection()); m_actRecent->setMaxItems(15); // FIXME should be configurable! m_actRecent->loadEntries(kapp->config()); - action = KStdAction::save(this, TQT_SLOT(slotSave()), actionCollection()); + action = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection()); action->setWhatsThis(i18n("Save\n\nSave the current icon")); - KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), actionCollection()); - action = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); + action = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); action->setWhatsThis(i18n("Print\n\nOpens a print dialog to let you print" " the current icon.")); - KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection()); // Edit Menu - m_actCut = KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); + m_actCut = KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); m_actCut->setWhatsThis(i18n("Cut\n\nCut the current selection out of the" " icon.\n\n(Tip: You can make both rectangular and circular selections)")); - m_actCopy = KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); + m_actCopy = KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); m_actCopy->setWhatsThis(i18n("Copy\n\nCopy the current selection out of the" " icon.\n\n(Tip: You can make both rectangular and circular selections)")); - m_actPaste = KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection()); + m_actPaste = KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection()); m_actPaste->setWhatsThis(i18n("Paste\n\n" "Paste the contents of the clipboard into the current icon.\n\n" "If the contents are larger than the current icon you can paste them" @@ -285,28 +285,28 @@ void TDEIconEdit::setupActions() " if you also want to paste transparency.)")); m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, grid, - TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" ); + TQ_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" ); - KStdAction::clear(this, TQT_SLOT(slotClear()), actionCollection()); - KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); + KStdAction::clear(this, TQ_SLOT(slotClear()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); action = new TDEAction(i18n("Resi&ze..."), "transform", cut, - grid, TQT_SLOT(editResize()), actionCollection(), "edit_resize"); + grid, TQ_SLOT(editResize()), actionCollection(), "edit_resize"); action->setWhatsThis(i18n("Resize\n\nSmoothly resizes the icon while" " trying to preserve the contents")); action = new TDEAction(i18n("&GrayScale"), "grayscale", cut, - grid, TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale"); + grid, TQ_SLOT(grayScale()), actionCollection(), "edit_grayscale"); action->setWhatsThis(i18n("Gray scale\n\nGray scale the current icon.\n" "(Warning: The result is likely to contain colors not in the icon" " palette")); // View Menu - m_actZoomIn = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), + m_actZoomIn = KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection()); m_actZoomIn->setWhatsThis(i18n("Zoom in\n\nZoom in by one.")); - m_actZoomOut = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), + m_actZoomOut = KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection()); m_actZoomOut->setWhatsThis(i18n("Zoom out\n\nZoom out by one.")); @@ -314,26 +314,26 @@ void TDEIconEdit::setupActions() actionCollection(), "view_zoom" ); // xgettext:no-c-format - action = new TDEAction( i18n( "100%" ), cut, this, TQT_SLOT( slotZoom1() ), + action = new TDEAction( i18n( "100%" ), cut, this, TQ_SLOT( slotZoom1() ), actionCollection(), "view_zoom_1" ); actMenu->insert( action ); // xgettext:no-c-format - action = new TDEAction( i18n( "200%" ), cut, this, TQT_SLOT( slotZoom2() ), + action = new TDEAction( i18n( "200%" ), cut, this, TQ_SLOT( slotZoom2() ), actionCollection(), "view_zoom_2" ); actMenu->insert( action ); // xgettext:no-c-format - action = new TDEAction( i18n( "500%" ), cut, this, TQT_SLOT( slotZoom5() ), + action = new TDEAction( i18n( "500%" ), cut, this, TQ_SLOT( slotZoom5() ), actionCollection(), "view_zoom_5" ); actMenu->insert( action ); // xgettext:no-c-format - action = new TDEAction( i18n( "1000%" ), cut, this, TQT_SLOT( slotZoom10() ), + action = new TDEAction( i18n( "1000%" ), cut, this, TQ_SLOT( slotZoom10() ), actionCollection(), "view_zoom_10" ); actMenu->insert( action ); // Settings Menu - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotConfigureSettings()), + KStdAction::preferences(this, TQ_SLOT(slotConfigureSettings()), actionCollection()); createStandardStatusBarAction(); @@ -341,7 +341,7 @@ void TDEIconEdit::setupActions() TDEToggleAction *toggle; toggle = new TDEToggleAction( i18n( "Show &Grid" ), "grid", - cut, this, TQT_SLOT( slotShowGrid() ), actionCollection(), + cut, this, TQ_SLOT( slotShowGrid() ), actionCollection(), "options_show_grid" ); toggle->setCheckedState(i18n("Hide &Grid")); toggle->setWhatsThis( i18n( "Show grid\n\nToggles the grid in the icon" @@ -350,14 +350,14 @@ void TDEIconEdit::setupActions() // Tools Menu toolAction = new TDERadioAction(i18n("Color Picker"), "colorpicker", - cut, this, TQT_SLOT(slotToolPointer()), actionCollection(), + cut, this, TQ_SLOT(slotToolPointer()), actionCollection(), "tool_find_pixel"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Color Picker\n\nThe color of the pixel clicked" " on will be the current draw color")); toolAction = new TDERadioAction(i18n("Freehand"), "paintbrush", - cut, this, TQT_SLOT(slotToolFreehand()), actionCollection(), + cut, this, TQ_SLOT(slotToolFreehand()), actionCollection(), "tool_freehand"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Free hand\n\nDraw non-linear lines")); @@ -366,64 +366,64 @@ void TDEIconEdit::setupActions() grid->setTool(TDEIconEditGrid::Freehand); toolAction = new TDERadioAction(i18n("Rectangle"), "rectangle", - cut, this, TQT_SLOT(slotToolRectangle()), actionCollection(), + cut, this, TQ_SLOT(slotToolRectangle()), actionCollection(), "tool_rectangle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Rectangle\n\nDraw a rectangle")); toolAction = new TDERadioAction(i18n("Filled Rectangle"), "filledrectangle", - cut, this, TQT_SLOT(slotToolFilledRectangle()), actionCollection(), + cut, this, TQ_SLOT(slotToolFilledRectangle()), actionCollection(), "tool_filled_rectangle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Filled rectangle\n\nDraw a filled rectangle")); toolAction = new TDERadioAction(i18n("Circle"), "circle", - cut, this, TQT_SLOT(slotToolCircle()), actionCollection(), + cut, this, TQ_SLOT(slotToolCircle()), actionCollection(), "tool_circle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Circle\n\nDraw a circle")); toolAction = new TDERadioAction(i18n("Filled Circle"), "filledcircle", - cut, this, TQT_SLOT(slotToolFilledCircle()), actionCollection(), + cut, this, TQ_SLOT(slotToolFilledCircle()), actionCollection(), "tool_filled_circle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Filled circle\n\nDraw a filled circle")); toolAction = new TDERadioAction(i18n("Ellipse"), "ellipse", - cut, this, TQT_SLOT(slotToolEllipse()), actionCollection(), + cut, this, TQ_SLOT(slotToolEllipse()), actionCollection(), "tool_ellipse"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Ellipse\n\nDraw an ellipse")); toolAction = new TDERadioAction(i18n("Filled Ellipse"), "filledellipse", - cut, this, TQT_SLOT(slotToolFilledEllipse()), actionCollection(), + cut, this, TQ_SLOT(slotToolFilledEllipse()), actionCollection(), "tool_filled_ellipse"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Filled ellipse\n\nDraw a filled ellipse")); toolAction = new TDERadioAction(i18n("Spray"), "airbrush", - cut, this, TQT_SLOT(slotToolSpray()), actionCollection(), + cut, this, TQ_SLOT(slotToolSpray()), actionCollection(), "tool_spray"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Spray\n\nDraw scattered pixels in the" " current color")); toolAction = new TDERadioAction(i18n("Flood Fill"), "fill", - cut, this, TQT_SLOT(slotToolFlood()), actionCollection(), + cut, this, TQ_SLOT(slotToolFlood()), actionCollection(), "tool_flood_fill"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Flood fill\n\nFill adjoining pixels with" " the same color with the current color")); toolAction = new TDERadioAction(i18n("Line"), "line", - cut, this, TQT_SLOT(slotToolLine()), actionCollection(), + cut, this, TQ_SLOT(slotToolLine()), actionCollection(), "tool_line"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Line\n\nDraw a straight line vertically," " horizontally or at 45 deg. angles")); toolAction = new TDERadioAction(i18n("Eraser (Transparent)"), "eraser", - cut, this, TQT_SLOT(slotToolEraser()), actionCollection(), + cut, this, TQ_SLOT(slotToolEraser()), actionCollection(), "tool_eraser"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Erase\n\nErase pixels. Set the pixels to" @@ -432,14 +432,14 @@ void TDEIconEdit::setupActions() " to use)")); toolAction = new TDERadioAction(i18n("Rectangular Selection"), - "selectrect", cut, this, TQT_SLOT(slotToolSelectRect()), + "selectrect", cut, this, TQ_SLOT(slotToolSelectRect()), actionCollection(), "edit_select_rectangle"); toolAction->setExclusiveGroup( "toolActions" ); toolAction->setWhatsThis(i18n("Select\n\nSelect a rectangular section" " of the icon using the mouse.")); toolAction = new TDERadioAction(i18n("Circular Selection"), - "selectcircle", cut, this, TQT_SLOT(slotToolSelectCircle()), + "selectcircle", cut, this, TQ_SLOT(slotToolSelectCircle()), actionCollection(), "edit_select_circle"); toolAction->setExclusiveGroup( "toolActions" ); toolAction->setWhatsThis(i18n("Select\n\nSelect a circular section of the" diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp index 6d357f08..c4caedc3 100644 --- a/tdeiconedit/tdeicongrid.cpp +++ b/tdeiconedit/tdeicongrid.cpp @@ -127,12 +127,12 @@ KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, TQWhatsThis::add( _hruler, str ); TQWhatsThis::add( _vruler, str ); - connect(_grid, TQT_SIGNAL(scalingchanged(int)), TQT_SLOT(scalingChange(int))); - connect(_grid, TQT_SIGNAL(sizechanged(int, int)), TQT_SLOT(sizeChange(int, int))); - connect(_grid, TQT_SIGNAL(needPainting()), TQT_SLOT(paintGrid())); - connect( _grid, TQT_SIGNAL(xposchanged(int)), _hruler, TQT_SLOT(slotNewValue(int)) ); - connect( _grid, TQT_SIGNAL(yposchanged(int)), _vruler, TQT_SLOT(slotNewValue(int)) ); - connect(viewport, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(moving(int, int))); + connect(_grid, TQ_SIGNAL(scalingchanged(int)), TQ_SLOT(scalingChange(int))); + connect(_grid, TQ_SIGNAL(sizechanged(int, int)), TQ_SLOT(sizeChange(int, int))); + connect(_grid, TQ_SIGNAL(needPainting()), TQ_SLOT(paintGrid())); + connect( _grid, TQ_SIGNAL(xposchanged(int)), _hruler, TQ_SLOT(slotNewValue(int)) ); + connect( _grid, TQ_SIGNAL(yposchanged(int)), _vruler, TQ_SLOT(slotNewValue(int)) ); + connect(viewport, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(moving(int, int))); setSizes(); TQResizeEvent e(size(), size()); @@ -319,8 +319,8 @@ TDEIconEditGrid::TDEIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *p setNumCols(32); fill(TRANSPARENT); - connect( kapp->clipboard(), TQT_SIGNAL(dataChanged()), TQT_SLOT(checkClipboard())); - connect( h, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(updatePreviewPixmap() )); + connect( kapp->clipboard(), TQ_SIGNAL(dataChanged()), TQ_SLOT(checkClipboard())); + connect( h, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(updatePreviewPixmap() )); createCursors(); TDEIconEditProperties *props = TDEIconEditProperties::self(); |