diff options
867 files changed, 4230 insertions, 15747 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index aa98c1fe..c3f87456 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index c45d2b25..bd185441 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -33,11 +38,6 @@ include( CheckSymbolExists ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) @@ -46,12 +46,12 @@ tde_setup_paths( ) ##### optional stuff ############################ -OPTION( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_PAPER "Enable libpaper support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_TIFF "Enable tiff support (tdefile-plugins)" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_OPENEXR "Enable openexr support (tdefile-plugins)" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_PDF "Enable pdf support (tdefile-plugins)" ${WITH_ALL_OPTIONS} ) +option( WITH_TIFF "Enable tiff support (tdefile-plugins)" ${WITH_ALL_OPTIONS} ) +option( WITH_OPENEXR "Enable openexr support (tdefile-plugins)" ${WITH_ALL_OPTIONS} ) +option( WITH_PDF "Enable pdf support (tdefile-plugins)" ${WITH_ALL_OPTIONS} ) ##### options comments ########################## @@ -92,9 +92,6 @@ option( BUILD_KVIEW "Build kview" ${BUILD_ALL} ) option( BUILD_KVIEWSHELL "Build kviewshell" ${BUILD_ALL} ) option( BUILD_LIBKSCAN "Build libkscan" ${BUILD_ALL} ) -# deprecated -option( BUILD_KMRML "Build kmrml" OFF ) - ##### configure checks ########################## @@ -146,9 +143,6 @@ tde_conditional_add_subdirectory( BUILD_LIBKSCAN libkscan ) tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins ) tde_conditional_add_subdirectory( BUILD_TDEICONEDIT tdeiconedit ) -# deprecated -tde_conditional_add_subdirectory( BUILD_KMRML kmrml ) - ##### write configure files ##################### configure_file( config.h.cmake config.h @ONLY ) @@ -41,9 +41,6 @@ tdegraphics is a collection of graphic oriented applications: * tdeiconedit An icon editor. -* kmrml - Connects to a MRML server and find similar images - * kooka A raster image scan program, based on SANE and libkscan. diff --git a/admin b/admin -Subproject 7e4fd6fc5116d84e5dbc48a61fd566556d258cf +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/config.h.cmake b/config.h.cmake index fea46aaf..f02587e8 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,22 +1,7 @@ #cmakedefine VERSION "@VERSION@" // poppler-tqt -#cmakedefine HAVE_POPPLER_2203 -#cmakedefine HAVE_POPPLER_2112 -#cmakedefine HAVE_POPPLER_2111 -#cmakedefine HAVE_POPPLER_2108 -#cmakedefine HAVE_POPPLER_086 -#cmakedefine HAVE_POPPLER_083 -#cmakedefine HAVE_POPPLER_082 -#cmakedefine HAVE_POPPLER_076 -#cmakedefine HAVE_POPPLER_072 -#cmakedefine HAVE_POPPLER_071 -#cmakedefine HAVE_POPPLER_070 -#cmakedefine HAVE_POPPLER_064 -#cmakedefine HAVE_POPPLER_058 -#cmakedefine HAVE_POPPLER_030 -#cmakedefine HAVE_POPPLER_020 -#cmakedefine HAVE_POPPLER_016 +#cmakedefine POPPLER_VERSION_C @POPPLER_VERSION_C@ // kpdf, kdvi #cmakedefine HAVE_FREETYPE 1 @@ -54,10 +39,6 @@ #endif #cmakedefine HAVE_FMIN 1 -// kmrml -#cmakedefine HAVE_STDLIB_H 1 -#cmakedefine HAVE_UNISTD_H 1 - // ksnapshop #cmakedefine HAVE_X11_EXTENSIONS_SHAPE_H 1 diff --git a/doc/ksnapshot/index.docbook b/doc/ksnapshot/index.docbook index 780efe0b..41ee63c5 100644 --- a/doc/ksnapshot/index.docbook +++ b/doc/ksnapshot/index.docbook @@ -318,16 +318,16 @@ the right arguments, as shown in this example: <prompt>$</prompt> <command>dcop `dcopstart ksnapshot` interface</command><computeroutput> QCStringList interfaces() QCStringList functions() -QString url() +TQString url() void slotGrab() void slotPrint() void slotSave() -bool save(QString filename) +bool save(TQString filename) void slotSaveAs() void slotCopy() void setTime(int newTime) int timeout() -void setURL(QString newURL) +void setURL(TQString newURL) void setGrabMode(int grab) int grabMode() void slotMovePointer(int x,int y) diff --git a/doc/man/kcoloredit/CMakeLists.txt b/doc/man/kcoloredit/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kcoloredit/CMakeLists.txt +++ b/doc/man/kcoloredit/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kdvi/CMakeLists.txt b/doc/man/kdvi/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kdvi/CMakeLists.txt +++ b/doc/man/kdvi/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kfax/CMakeLists.txt b/doc/man/kfax/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kfax/CMakeLists.txt +++ b/doc/man/kfax/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kfaxview/CMakeLists.txt b/doc/man/kfaxview/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kfaxview/CMakeLists.txt +++ b/doc/man/kfaxview/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kghostview/CMakeLists.txt b/doc/man/kghostview/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kghostview/CMakeLists.txt +++ b/doc/man/kghostview/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kolourpaint/CMakeLists.txt b/doc/man/kolourpaint/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kolourpaint/CMakeLists.txt +++ b/doc/man/kolourpaint/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kooka/CMakeLists.txt b/doc/man/kooka/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kooka/CMakeLists.txt +++ b/doc/man/kooka/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kpdf/CMakeLists.txt b/doc/man/kpdf/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kpdf/CMakeLists.txt +++ b/doc/man/kpdf/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kpovmodeler/CMakeLists.txt b/doc/man/kpovmodeler/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kpovmodeler/CMakeLists.txt +++ b/doc/man/kpovmodeler/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kruler/CMakeLists.txt b/doc/man/kruler/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kruler/CMakeLists.txt +++ b/doc/man/kruler/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/ksnapshot/CMakeLists.txt b/doc/man/ksnapshot/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/ksnapshot/CMakeLists.txt +++ b/doc/man/ksnapshot/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kuickshow/CMakeLists.txt b/doc/man/kuickshow/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kuickshow/CMakeLists.txt +++ b/doc/man/kuickshow/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kview/CMakeLists.txt b/doc/man/kview/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kview/CMakeLists.txt +++ b/doc/man/kview/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kviewshell/CMakeLists.txt b/doc/man/kviewshell/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kviewshell/CMakeLists.txt +++ b/doc/man/kviewshell/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/tdeiconedit/CMakeLists.txt b/doc/man/tdeiconedit/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/tdeiconedit/CMakeLists.txt +++ b/doc/man/tdeiconedit/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 1fa2639c..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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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/kamera.h b/kamera/kcontrol/kamera.h index 1c4ef7a0..3e92ed1f 100644 --- a/kamera/kcontrol/kamera.h +++ b/kamera/kcontrol/kamera.h @@ -46,7 +46,7 @@ class TDEPopupMenu; class KKameraConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT friend class KameraDeviceSelectDialog; diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp index 9806ff65..6571d7a3 100644 --- a/kamera/kcontrol/kameraconfigdialog.cpp +++ b/kamera/kcontrol/kameraconfigdialog.cpp @@ -104,7 +104,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget) { gp_widget_get_value(widget, &widget_value_string); - TQGrid *grid = new TQGrid(2,Qt::Horizontal, parent); + TQGrid *grid = new TQGrid(2,TQt::Horizontal, parent); grid->setSpacing(spacingHint()); new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid); TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid); @@ -129,7 +129,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget) ( int )widget_high, ( int )widget_increment, ( int )widget_value_float, - Qt::Horizontal, + TQt::Horizontal, groupBox ); m_wmap.insert(widget, slider); diff --git a/kamera/kcontrol/kameraconfigdialog.h b/kamera/kcontrol/kameraconfigdialog.h index 4e4b641d..fe7d4aa7 100644 --- a/kamera/kcontrol/kameraconfigdialog.h +++ b/kamera/kcontrol/kameraconfigdialog.h @@ -33,7 +33,7 @@ extern "C" { class KameraConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KameraConfigDialog(Camera *camera, CameraWidget *widget, 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/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h index 9db8b4c5..699524c1 100644 --- a/kamera/kcontrol/kameradevice.h +++ b/kamera/kcontrol/kameradevice.h @@ -39,7 +39,7 @@ class TQRadioButton; class KCamera : public TQObject { friend class KameraDeviceSelectDialog; - Q_OBJECT + TQ_OBJECT public: KCamera(const TQString &name, const TQString &path); @@ -88,7 +88,7 @@ protected: class KameraDeviceSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KameraDeviceSelectDialog(TQWidget *parent, KCamera *device); diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index 6dfbf08a..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; @@ -73,10 +73,10 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par TQVBoxLayout* colorChangeSliderLayout = new TQVBoxLayout(colorChangeSliderWidget, 1); colorChangeSliderLayout->setMargin(0); TQSlider* colorChangeSlider = new TQSlider(0, MAX_COLOR_CHANGE_VALUE, - MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, Qt::Horizontal, colorChangeSliderWidget); + 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/colorselector.h b/kcoloredit/colorselector.h index 138ba8c3..c0f6f4ee 100644 --- a/kcoloredit/colorselector.h +++ b/kcoloredit/colorselector.h @@ -30,7 +30,7 @@ * @author Artur Rataj */ class ColorSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index df0769d0..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,27 +40,27 @@ 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); xyColorSelectorLayout->addLayout(buttonsLayout); xyColorSelectorLayout->addSpacing(2); topLayout->addLayout(xyColorSelectorLayout, 1, 0); - zColorSelector = new KZColorSelector(Qt::Vertical, this); - connect(zColorSelector, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotZColorSelectorPosChanged(int) )); + zColorSelector = new KZColorSelector(TQt::Vertical, this); + 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/gradientselection.h b/kcoloredit/gradientselection.h index cd47355b..3f98b0cf 100644 --- a/kcoloredit/gradientselection.h +++ b/kcoloredit/gradientselection.h @@ -31,7 +31,7 @@ * @author Artur Rataj */ class GradientSelection : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/imageselection.h b/kcoloredit/imageselection.h index 79a3c3fd..7846ef31 100644 --- a/kcoloredit/imageselection.h +++ b/kcoloredit/imageselection.h @@ -26,7 +26,7 @@ * @author Artur Rataj */ class ImageSelection : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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 f933bea9..16f06b89 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -64,40 +64,40 @@ KColorEditApp::~KColorEditApp() { void KColorEditApp::initActions() { // File actiojns - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ), actionCollection() ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection() ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); - m_actSave = KStdAction::save( TQT_TQOBJECT(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( TQT_TQOBJECT(this), - TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + m_actRecent = KStdAction::openRecent( this, + TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(), + this, TQ_SLOT( slotFileNewWindow() ), actionCollection(), "file_new_window" ); // Edit actions - m_actCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotEditCut() ), + m_actCut = KStdAction::cut( this, TQ_SLOT( slotEditCut() ), actionCollection() ); - m_actCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotEditCopy() ), + m_actCopy = KStdAction::copy( this, TQ_SLOT( slotEditCopy() ), actionCollection() ); - m_actPaste = KStdAction::paste( TQT_TQOBJECT(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(), TQT_TQOBJECT(this), - TQT_SLOT( slotViewColorNames() ), actionCollection(), + m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), this, + TQ_SLOT( slotViewColorNames() ), actionCollection(), "color_view_names" ); m_actNames->setCheckedState(i18n("Hide &Color Names")); - m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( slotColorFromPalette() ), actionCollection(), + m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), this, + TQ_SLOT( slotColorFromPalette() ), actionCollection(), "color_from_palette" ); - ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( slotColorFromScreen() ), actionCollection(), + ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), this, + 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/kcoloredit.h b/kcoloredit/kcoloredit.h index 9da41fc3..75a8b096 100644 --- a/kcoloredit/kcoloredit.h +++ b/kcoloredit/kcoloredit.h @@ -53,7 +53,7 @@ class KColorEditView; */ class KColorEditApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KColorEditView; diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h index abb499bf..e4b672ed 100644 --- a/kcoloredit/kcoloreditdoc.h +++ b/kcoloredit/kcoloreditdoc.h @@ -46,7 +46,7 @@ class KColorEditView; */ class KColorEditDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: 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/kcoloreditview.h b/kcoloredit/kcoloreditview.h index a41b0a47..003a4087 100644 --- a/kcoloredit/kcoloreditview.h +++ b/kcoloredit/kcoloreditview.h @@ -42,7 +42,7 @@ class KColorEditDoc; * @version KDevelop version 0.4 code generation */ class KColorEditView : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h index 276174ff..c785a293 100644 --- a/kcoloredit/kxycolorselector.h +++ b/kcoloredit/kxycolorselector.h @@ -27,7 +27,7 @@ * @author Artur Rataj */ class KXYColorSelector : public KXYSelector { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp index f753649e..6d4aa1cb 100644 --- a/kcoloredit/kzcolorselector.cpp +++ b/kcoloredit/kzcolorselector.cpp @@ -23,7 +23,7 @@ #include "main.h" #include "kzcolorselector.h" -KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) : +KZColorSelector::KZColorSelector(TQt::Orientation o, TQWidget *parent, const char *name) : TDESelector(o, parent, name) { baseColorH = -1; baseColorS = 0; diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h index cae9d1c5..23f1f1d4 100644 --- a/kcoloredit/kzcolorselector.h +++ b/kcoloredit/kzcolorselector.h @@ -28,7 +28,7 @@ * @author Artur Rataj */ class KZColorSelector : public TDESelector { - Q_OBJECT + TQ_OBJECT public: @@ -38,7 +38,7 @@ public: TYPE_V = 2 }; /** Constructs the widget */ - KZColorSelector(Qt::Orientation o, TQWidget *parent=0, const char *name=0); + KZColorSelector(TQt::Orientation o, TQWidget *parent=0, const char *name=0); ~KZColorSelector(); /** Sets the selector type */ void setType(const int type); 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/loadpalettedlg.h b/kcoloredit/loadpalettedlg.h index acb8712c..6f752ee5 100644 --- a/kcoloredit/loadpalettedlg.h +++ b/kcoloredit/loadpalettedlg.h @@ -26,7 +26,7 @@ *@author Artur Rataj */ class LoadPaletteDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp index 52e8b4be..ed8ff1ac 100644 --- a/kcoloredit/paletteview.cpp +++ b/kcoloredit/paletteview.cpp @@ -32,14 +32,14 @@ PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight topLayout->setColStretch(0, 10); topLayout->setColStretch(1, 0); scrollBar = new TQScrollBar(this); - hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, Qt::Horizontal, this); + 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/paletteview.h b/kcoloredit/paletteview.h index 2b0f4a5e..e01cce37 100644 --- a/kcoloredit/paletteview.h +++ b/kcoloredit/paletteview.h @@ -30,7 +30,7 @@ class KColorEditView; * @author Artur Rataj */ class PaletteView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index 3a70aacc..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; @@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) { setCellsSizes(); TQPixmap pixmap(size()); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(&pixmap), this); + painter.begin(&pixmap, this); TQFontMetrics fontMetrics = painter.fontMetrics(); int maxLineWidth; if(viewColorNames) { diff --git a/kcoloredit/paletteviewscrolledarea.h b/kcoloredit/paletteviewscrolledarea.h index abf09fe5..8ee0cd9a 100644 --- a/kcoloredit/paletteviewscrolledarea.h +++ b/kcoloredit/paletteviewscrolledarea.h @@ -32,7 +32,7 @@ class TQScrollBar; * @author Artur Rataj */ class PaletteViewScrolledArea : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index f1da81a1..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); } @@ -61,7 +61,7 @@ TextEditSelection::~TextEditSelection(){ void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString, const int row, const int column, TQGridLayout* layout) { TQLabel* label = new TQLabel(labelString, this); - lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) )); + lineEdit->setValidator(new TQIntValidator( 0, maxValue, lineEdit )); lineEditTable[index] = lineEdit; lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") )); lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") )); diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h index 278463a2..fcee626a 100644 --- a/kcoloredit/texteditselection.h +++ b/kcoloredit/texteditselection.h @@ -29,7 +29,7 @@ * @author Artur Rataj */ class TextEditSelection : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/dviPageCache.h b/kdvi/dviPageCache.h index 5a070422..3aa34695 100644 --- a/kdvi/dviPageCache.h +++ b/kdvi/dviPageCache.h @@ -25,7 +25,7 @@ class DVIPageCache : public DocumentPageCache { - Q_OBJECT + TQ_OBJECT public: 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.h b/kdvi/dviRenderer.h index 75236721..e8ccdb0b 100644 --- a/kdvi/dviRenderer.h +++ b/kdvi/dviRenderer.h @@ -83,7 +83,7 @@ struct drawinf { class dviRenderer : public DocumentRenderer, bigEndianByteReader { - Q_OBJECT + TQ_OBJECT public: 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/dviWidget.cpp b/kdvi/dviWidget.cpp index 8b8545b6..614a2704 100644 --- a/kdvi/dviWidget.cpp +++ b/kdvi/dviWidget.cpp @@ -45,7 +45,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e) // Check if the mouse is pressed on a source-hyperlink // source hyperlinks can be invoked with the Middle Mousebutton or alternatively // with Control+Left Mousebutton - if ((e->button() == Qt::MidButton || (e->button() == Qt::LeftButton && (e->state() & ControlButton))) + if ((e->button() == TQt::MidButton || (e->button() == TQt::LeftButton && (e->state() & ControlButton))) && (pageData->sourceHyperLinkList.size() > 0)) { int minIndex = 0; diff --git a/kdvi/dviWidget.h b/kdvi/dviWidget.h index 1ebe375c..b0890499 100644 --- a/kdvi/dviWidget.h +++ b/kdvi/dviWidget.h @@ -21,7 +21,7 @@ class textSelection; class DVIWidget : public DocumentWidget { - Q_OBJECT + TQ_OBJECT public: 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/fontpool.h b/kdvi/fontpool.h index 9c3425c9..7928fed0 100644 --- a/kdvi/fontpool.h +++ b/kdvi/fontpool.h @@ -36,7 +36,7 @@ class KShellProcess; **/ class fontPool : public TQObject { - Q_OBJECT + TQ_OBJECT public: 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/fontprogress.h b/kdvi/fontprogress.h index 6090968b..ddb34735 100644 --- a/kdvi/fontprogress.h +++ b/kdvi/fontprogress.h @@ -29,7 +29,7 @@ class TQLabel; **/ class fontProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/infodialog.h b/kdvi/infodialog.h index 643911e2..0d0bdc00 100644 --- a/kdvi/infodialog.h +++ b/kdvi/infodialog.h @@ -18,7 +18,7 @@ class TQWidget; class infoDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 2da7abc2..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())); } @@ -365,7 +365,7 @@ void KDVIMultiPage::print() default: break; } - // Qt::Orientation + // Orientation if ( printer->orientation() == KPrinter::Landscape ) dvips_options += "-t landscape "; @@ -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/kdvi_multipage.h b/kdvi/kdvi_multipage.h index 996c33da..099f472f 100644 --- a/kdvi/kdvi_multipage.h +++ b/kdvi/kdvi_multipage.h @@ -10,7 +10,7 @@ class KPrinter; class KDVIMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/optionDialogFontsWidget.h b/kdvi/optionDialogFontsWidget.h index f2462e8e..263409fe 100644 --- a/kdvi/optionDialogFontsWidget.h +++ b/kdvi/optionDialogFontsWidget.h @@ -13,7 +13,7 @@ class optionDialogFontsWidget : public optionDialogFontsWidget_base { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui index bb7e18f4..2a36bb98 100644 --- a/kdvi/optionDialogFontsWidget_base.ui +++ b/kdvi/optionDialogFontsWidget_base.ui @@ -56,9 +56,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonGroup1_clicked(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> 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/kdvi/optionDialogSpecialWidget.h b/kdvi/optionDialogSpecialWidget.h index 2c90ded3..feb09a57 100644 --- a/kdvi/optionDialogSpecialWidget.h +++ b/kdvi/optionDialogSpecialWidget.h @@ -13,7 +13,7 @@ class optionDialogSpecialWidget : public optionDialogSpecialWidget_base { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/psgs.h b/kdvi/psgs.h index 8e5e6ed5..d5750bd2 100644 --- a/kdvi/psgs.h +++ b/kdvi/psgs.h @@ -32,7 +32,7 @@ public: class ghostscript_interface : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/renderedDviPagePixmap.h b/kdvi/renderedDviPagePixmap.h index 166a11e9..cd7da3d7 100644 --- a/kdvi/renderedDviPagePixmap.h +++ b/kdvi/renderedDviPagePixmap.h @@ -28,7 +28,7 @@ class RenderedDviPagePixmap : public RenderedDocumentPagePixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp index b0f7495f..b70dc40f 100644 --- a/kfax/faxinput.cpp +++ b/kfax/faxinput.cpp @@ -215,7 +215,7 @@ notetiff(const char *name) get2(buf, endian) : get4(buf, endian); } break; - case 274: /* Qt::Orientation */ + case 274: /* Orientation */ switch(value) { default: /* row0 at top, col0 at left */ orient = 0; diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 716bcbb6..acdbeab4 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -211,14 +211,14 @@ TopLevel::TopLevel (TQWidget *, const char *name) // Create a Vertical scroll bar - vsb = new TQScrollBar( Qt::Vertical,faxqtwin,"scrollBar" ); + 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( Qt::Horizontal,faxqtwin,"scrollBar" ); - connect( hsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollHorz(int)) ); + hsb = new TQScrollBar( TQt::Horizontal,faxqtwin,"scrollBar" ); + 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( TQT_TQOBJECT(this), TQT_SLOT( faxOpen() ), actionCollection() ); - actRecent = KStdAction::openRecent( TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( faxSave() ), actionCollection() ); - actSaveAs = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( faxSaveAs() ), + actSave = KStdAction::save( this, TQ_SLOT( faxSave() ), actionCollection() ); + actSaveAs = KStdAction::saveAs( this, TQ_SLOT( faxSaveAs() ), actionCollection() ); - actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - actAdd = new TDEAction( i18n( "A&dd..." ), "document-new", TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); + 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, + TQ_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); actRecent->setMaxItems( 5 ); // View Menu - actSize = KStdAction::actualSize( TQT_TQOBJECT(this), TQT_SLOT( actualSize() ), + actSize = KStdAction::actualSize( this, TQ_SLOT( actualSize() ), actionCollection() ); - actZoomIn = KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( zoomin() ), actionCollection() ); - actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(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(), TQT_TQOBJECT(this), - TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" ); - actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" ); - actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( flipPage() ), actionCollection(), "view_flip" ); + actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), this, + TQ_SLOT( rotatePage() ), actionCollection(), "view_rotate" ); + actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), this, + TQ_SLOT( mirrorPage() ), actionCollection(), "view_mirror" ); + actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), this, + TQ_SLOT( flipPage() ), actionCollection(), "view_flip" ); // Go menu - actNext = KStdAction::next( TQT_TQOBJECT(this), TQT_SLOT( nextPage() ), actionCollection() ); - actPrev = KStdAction::prior( TQT_TQOBJECT(this), TQT_SLOT( prevPage() ), actionCollection() ); - actFirst = KStdAction::firstPage( TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( lastPage() ), + actLast = KStdAction::lastPage( this, TQ_SLOT( lastPage() ), actionCollection() ); // Settings menu - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( faxoptions() ), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT( faxoptions() ), actionCollection() ); } void TopLevel::setupStatusBar() diff --git a/kfax/kfax.h b/kfax/kfax.h index 07a6a784..ac2df263 100644 --- a/kfax/kfax.h +++ b/kfax/kfax.h @@ -53,7 +53,7 @@ public: class TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT diff --git a/kfax/kfax_printsettings.h b/kfax/kfax_printsettings.h index c2f0e258..11fc2935 100644 --- a/kfax/kfax_printsettings.h +++ b/kfax/kfax_printsettings.h @@ -30,7 +30,7 @@ class TQCheckBox; class KFAXPrintSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KFAXPrintSettings(TQWidget *parent = 0, const char *name = 0); diff --git a/kfax/options.cpp b/kfax/options.cpp index 756eac62..03a7c44b 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -57,7 +57,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name) TQVBoxLayout *mainLayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); bg = new TQGroupBox(mainWidget,"bg"); - bg->setColumnLayout( 0, Qt::Horizontal ); + bg->setColumnLayout( 0, TQt::Horizontal ); mainLayout->addWidget( bg ); TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout()); @@ -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/kfax/options.h b/kfax/options.h index 8f0c8caf..c539eced 100644 --- a/kfax/options.h +++ b/kfax/options.h @@ -57,7 +57,7 @@ class KIntNumInput; class OptionsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h index d9888d7c..3d84c74e 100644 --- a/kfaxview/faxmultipage.h +++ b/kfaxview/faxmultipage.h @@ -80,7 +80,7 @@ does only the minimal initialization required. class FaxMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfaxview/faxrenderer.h b/kfaxview/faxrenderer.h index fe18c1dd..c4e7fd17 100644 --- a/kfaxview/faxrenderer.h +++ b/kfaxview/faxrenderer.h @@ -38,7 +38,7 @@ implements only the necessary methods setFile() and drawPage(). class FaxRenderer : public DocumentRenderer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp index b107f7a0..6da8486c 100644 --- a/kfaxview/libkfaximage/kfaximage.cpp +++ b/kfaxview/libkfaximage/kfaximage.cpp @@ -293,7 +293,7 @@ KFaxImage::notetiff() get2(buf, endian) : get4(buf, endian); } break; - case 274: /* Qt::Orientation */ + case 274: /* Orientation */ switch(value) { default: /* row0 at top, col0 at left */ orient = 0; @@ -636,7 +636,7 @@ KFaxImage::GetImage(pagenode *pn) } // byte-swapping the image on little endian machines -#if defined(Q_BYTE_ORDER) && (Q_BYTE_ORDER == TQ_LITTLE_ENDIAN) +#if defined(TQ_BYTE_ORDER) && (TQ_BYTE_ORDER == TQ_LITTLE_ENDIAN) for (int y=pn->image.height()-1; y>=0; --y) { TQ_UINT32 *source = (TQ_UINT32 *) pn->image.scanLine(y); TQ_UINT32 *dest = source; diff --git a/kfaxview/libkfaximage/kfaximage.h b/kfaxview/libkfaximage/kfaximage.h index d0ac66ee..f24d47eb 100644 --- a/kfaxview/libkfaximage/kfaximage.h +++ b/kfaxview/libkfaximage/kfaximage.h @@ -52,7 +52,7 @@ class pagenode; class KDE_EXPORT KFaxImage : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kgamma/kcmkgamma/displaynumber.cpp b/kgamma/kcmkgamma/displaynumber.cpp index dd678716..a992a73f 100644 --- a/kgamma/kcmkgamma/displaynumber.cpp +++ b/kgamma/kcmkgamma/displaynumber.cpp @@ -29,7 +29,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \ setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setBackgroundMode(TQt::PaletteBase); setAlignment(TQt::AlignCenter); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); } DisplayNumber::~DisplayNumber(){ diff --git a/kgamma/kcmkgamma/displaynumber.h b/kgamma/kcmkgamma/displaynumber.h index 5590847a..d0ef7e02 100644 --- a/kgamma/kcmkgamma/displaynumber.h +++ b/kgamma/kcmkgamma/displaynumber.h @@ -25,7 +25,7 @@ */ class DisplayNumber : public TQLabel { - Q_OBJECT + TQ_OBJECT public: DisplayNumber(TQWidget *parent=0, int digits=0, int prec=0, const char *name=0); diff --git a/kgamma/kcmkgamma/gammactrl.cpp b/kgamma/kcmkgamma/gammactrl.cpp index 4cb49405..49360c72 100644 --- a/kgamma/kcmkgamma/gammactrl.cpp +++ b/kgamma/kcmkgamma/gammactrl.cpp @@ -47,14 +47,14 @@ GammaCtrl::GammaCtrl(TQWidget *parent, XVidExtWrap *xvid, int channel, \ setSpacing(KDialog::spacingHint()); - slider = new TQSlider(Qt::Horizontal, this); + slider = new TQSlider(TQt::Horizontal, this); slider->setFixedHeight(24); slider->setTickmarks(TQSlider::Below); 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/gammactrl.h b/kgamma/kcmkgamma/gammactrl.h index 1a0888ab..5702d4b8 100644 --- a/kgamma/kcmkgamma/gammactrl.h +++ b/kgamma/kcmkgamma/gammactrl.h @@ -30,7 +30,7 @@ class XVidExtWrap; class GammaCtrl : public TQHBox { - Q_OBJECT + TQ_OBJECT public: /** construktor */ 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/kgamma/kcmkgamma/kgamma.h b/kgamma/kcmkgamma/kgamma.h index 659b608e..ded7f4b4 100644 --- a/kgamma/kcmkgamma/kgamma.h +++ b/kgamma/kcmkgamma/kgamma.h @@ -27,7 +27,7 @@ class TDEProcess; class KGamma: public TDECModule { - Q_OBJECT + TQ_OBJECT public: KGamma(TQWidget *parent, const char *name, const TQStringList&); diff --git a/kghostview/dscparse/dscparse.cpp b/kghostview/dscparse/dscparse.cpp index ba473cc8..e31b9edd 100644 --- a/kghostview/dscparse/dscparse.cpp +++ b/kghostview/dscparse/dscparse.cpp @@ -2026,7 +2026,7 @@ dsc_scan_comments(CDSC *dsc) continued ? 3 : 10)) return CDSC_ERROR; } - else if (IS_DSC(line, "%%Qt::Orientation:")) { + else if (IS_DSC(line, "%%Orientation:")) { dsc->id = CDSC_ORIENTATION; if (dsc_parse_orientation(dsc, &(dsc->page_orientation), continued ? 3 : 14)) @@ -2330,7 +2330,7 @@ dsc_scan_defaults(CDSC *dsc) } else if (IS_DSC(line, "%%PageQt::Orientation:")) { dsc->id = CDSC_PAGEORIENTATION; - /* This can override %%Qt::Orientation: */ + /* This can override %%Orientation: */ if (dsc_parse_orientation(dsc, &(dsc->page_orientation), 18)) return CDSC_ERROR; } @@ -2936,30 +2936,30 @@ dsc_scan_page(CDSC *dsc) * %%DocumentProcessColors: * %%DocumentSuppliedFiles: * %%DocumentSuppliedFonts: - * %%DocumentSuppliedProcSets: - * %%DocumentSuppliedResources: - * %%Qt::Orientation: - * %%Pages: - * %%PageOrder: + * %%DocumentSuppliedProcSets: + * %%DocumentSuppliedResources: + * %%Orientation: + * %%Pages: + * %%PageOrder: * * Our supported subset is * %%Trailer * %%EOF * %%BoundingBox: - * %%Qt::Orientation: - * %%Pages: - * %%PageOrder: + * %%Orientation: + * %%Pages: + * %%PageOrder: * In addition to these, we support * %%DocumentMedia: * * A %%PageTrailer can have the following: - * %%PageBoundingBox: - * %%PageCustomColors: - * %%PageFiles: - * %%PageFonts: - * %%PageQt::Orientation: - * %%PageProcessColors: - * %%PageResources: + * %%PageBoundingBox: + * %%PageCustomColors: + * %%PageFiles: + * %%PageFonts: + * %%PageQt::Orientation: + * %%PageProcessColors: + * %%PageResources: */ dsc_private int @@ -3052,7 +3052,7 @@ dsc_scan_trailer(CDSC *dsc) continued ? 3 : 10)) return CDSC_ERROR; } - else if (IS_DSC(line, "%%Qt::Orientation:")) { + else if (IS_DSC(line, "%%Orientation:")) { dsc->id = CDSC_ORIENTATION; if (dsc_parse_orientation(dsc, &(dsc->page_orientation), continued ? 3 : 14)) return CDSC_ERROR; diff --git a/kghostview/dscparse/dscparse.h b/kghostview/dscparse/dscparse.h index d290c0d4..77b670a0 100644 --- a/kghostview/dscparse/dscparse.h +++ b/kghostview/dscparse/dscparse.h @@ -98,7 +98,7 @@ typedef enum { CDSC_FOR = 207, /* %%For: */ CDSC_LANGUAGELEVEL = 208, /* %%LanguageLevel: */ CDSC_BOUNDINGBOX = 209, /* %%BoundingBox: */ - CDSC_ORIENTATION = 210, /* %%Qt::Orientation: */ + CDSC_ORIENTATION = 210, /* %%Orientation: */ CDSC_PAGEORDER = 211, /* %%PageOrder: */ CDSC_DOCUMENTMEDIA = 212, /* %%DocumentMedia: */ CDSC_DOCUMENTPAPERSIZES = 213, /* %%DocumentPaperSizes: */ @@ -159,7 +159,7 @@ typedef enum { /* Trailer section */ CDSC_TRAILER = 800, /* %%Trailer */ -/* also %%Pages, %%BoundingBox, %%Qt::Orientation, %%PageOrder, %%DocumentMedia */ +/* also %%Pages, %%BoundingBox, %%Orientation, %%PageOrder, %%DocumentMedia */ /* %%Page is recognised as an error */ /* also %%DocumentNeededFonts, %%DocumentSuppliedFonts */ diff --git a/kghostview/fullscreenfilter.cpp b/kghostview/fullscreenfilter.cpp index b42a6277..4c269028 100644 --- a/kghostview/fullscreenfilter.cpp +++ b/kghostview/fullscreenfilter.cpp @@ -37,7 +37,7 @@ bool FullScreenFilter::eventFilter( TQObject* /*object*/, TQEvent* ev) { } } if ( TQMouseEvent* mouseevent = dynamic_cast<TQMouseEvent*>( ev ) ) { - if ( mouseevent->stateAfter() & mouseevent->button() & Qt::LeftButton ) { + if ( mouseevent->stateAfter() & mouseevent->button() & TQt::LeftButton ) { // if ( The whole image is visible at once ) if ( parent.m_gvpart->pageView()->contentsHeight() <= parent.m_gvpart->widget()->height() && parent.m_gvpart->pageView()->contentsWidth() <= parent.m_gvpart->widget()->width() ) { diff --git a/kghostview/fullscreenfilter.h b/kghostview/fullscreenfilter.h index a9d18366..7125e506 100644 --- a/kghostview/fullscreenfilter.h +++ b/kghostview/fullscreenfilter.h @@ -27,7 +27,7 @@ class KGVShell; * key/mouse handling related to full-screen mode without bloating further KGVPart */ class FullScreenFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: FullScreenFilter( KGVShell& parent ); diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui index c2c18d05..f8ddc0ad 100644 --- a/kghostview/gssettingswidget.ui +++ b/kghostview/gssettingswidget.ui @@ -142,12 +142,12 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>configClicked()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot specifier="non virtual">setDetectedVersion( TQString v )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kghostview/infodialog.h b/kghostview/infodialog.h index 65d973f3..4f01dca6 100644 --- a/kghostview/infodialog.h +++ b/kghostview/infodialog.h @@ -26,7 +26,7 @@ class TQLabel; class InfoDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/kdscerrordialog.h b/kghostview/kdscerrordialog.h index 97d311e5..a753f9d8 100644 --- a/kghostview/kdscerrordialog.h +++ b/kghostview/kdscerrordialog.h @@ -41,7 +41,7 @@ private: class KDSCErrorDialog : public KDialog, public KDSCErrorHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 5d6ca3df..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() @@ -384,7 +384,7 @@ void KGVMiniWidget::showPage( int pagenumber ) kdDebug(4500) << "KGVMiniWidget::showPage( " << pagenumber << " )" << endl; - TQT_TQWIDGET( _psWidget->parent() )->show(); + static_cast<TQWidget*>( _psWidget->parent() )->show(); _psWidget->setFileName(_document->fileName(), dsc()->isStructured() ); _psWidget->clear(); @@ -452,8 +452,8 @@ void KGVMiniWidget::showPage( int pagenumber ) } } // Do this after ajusting pagenumber above - _thumbnailService->cancelRequests( -1 , TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ) ); - _thumbnailService->delayedGetThumbnail( pagenumber, TQT_TQOBJECT(_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_miniwidget.h b/kghostview/kgv_miniwidget.h index 2e370153..dcbcb305 100644 --- a/kghostview/kgv_miniwidget.h +++ b/kghostview/kgv_miniwidget.h @@ -37,7 +37,7 @@ class MarkList; class KGVMiniWidget : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 0701c659..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( TQ_StrongFocus ); + _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( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ), - this, TQT_SLOT( showPopup( int, int, const TQPoint& ) ) ); - - - connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( selected( int ) ), - _docManager, TQT_SLOT( goToPage( int ) ) ); - connect( _docManager, TQT_SIGNAL( newPageShown( int ) ), - TQT_TQOBJECT(_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, - TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ), + _markList, TQ_SLOT( markCurrent() ), actionCollection(), "mark_current" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &All Pages" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ), + _markList, TQ_SLOT( markAll() ), actionCollection(), "mark_all" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &Even Pages" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ), + _markList, TQ_SLOT( markEven() ), actionCollection(), "mark_even" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &Odd Pages" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ), + _markList, TQ_SLOT( markOdd() ), actionCollection(), "mark_odd" ); act->plug( _popup ); act = new TDEAction( i18n( "&Toggle Page Marks" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ), + _markList, TQ_SLOT( toggleMarks() ), actionCollection(), "toggle" ); act->plug( _popup ); act = new TDEAction( i18n("&Remove Page Marks"), 0, - TQT_TQOBJECT(_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/kgv_view.h b/kghostview/kgv_view.h index 04365ad4..3859b675 100644 --- a/kghostview/kgv_view.h +++ b/kghostview/kgv_view.h @@ -54,7 +54,7 @@ class ScrollBox; class KGVPart: public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KGVPart( TQWidget* parentWidget, const char* widgetName, @@ -230,7 +230,7 @@ private: class KGVBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class KGVPart; // emits our signals public: @@ -244,7 +244,7 @@ public slots: class KGVRun : public KRun { - Q_OBJECT + TQ_OBJECT public: 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 ae0742da..8a1a6776 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -17,6 +17,7 @@ */ #include <algorithm> +#include <functional> #include <memory> #include <tqfileinfo.h> @@ -63,8 +64,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 +88,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() @@ -565,9 +566,7 @@ void KGVDocument::saveAs() TQString(), _part->widget(), TQString() ); - if( !TDEIO::NetAccess::upload( _fileName, - saveURL, - static_cast<TQWidget*>( 0 ) ) ) { + if( !TDEIO::NetAccess::upload( _fileName, saveURL, 0 ) ) { // TODO: Proper error dialog } } @@ -620,7 +619,7 @@ bool KGVDocument::savePages( const TQString& saveFileName, PageList normedPageList; transform( pageList.begin(), pageList.end(), back_inserter( normedPageList ), - bind2nd( minus<int>(), minPage - 1 ) ); + bind( minus<int>(), std::placeholders::_1, minPage - 1 ) ); // Finally select the desired pages from the converted file. psCopyDoc( psSaveFile.name(), saveFileName, normedPageList ); @@ -786,8 +785,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 ); @@ -832,8 +831,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/kgvdocument.h b/kghostview/kgvdocument.h index 5076b78b..2de2fc69 100644 --- a/kghostview/kgvdocument.h +++ b/kghostview/kgvdocument.h @@ -33,7 +33,7 @@ class Pdf2dsc; class KGVDocument : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -159,7 +159,7 @@ private: class Pdf2dsc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/kgvmainwidget.h b/kghostview/kgvmainwidget.h index f18856b1..78965728 100644 --- a/kghostview/kgvmainwidget.h +++ b/kghostview/kgvmainwidget.h @@ -25,7 +25,7 @@ class KURL; class KGVMainWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/kgvpageview.cpp b/kghostview/kgvpageview.cpp index 336bad6d..10651383 100644 --- a/kghostview/kgvpageview.cpp +++ b/kghostview/kgvpageview.cpp @@ -27,8 +27,8 @@ KGVPageView::KGVPageView( TQWidget* parent, const char* name ) { _page = 0; - setFocusPolicy( TQ_StrongFocus ); - viewport()->setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::StrongFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); } void KGVPageView::setPage( TQWidget* page ) @@ -52,7 +52,7 @@ bool KGVPageView::atBottom() const bool KGVPageView::eventFilter( TQObject* o, TQEvent* e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_page) && e->type() == TQEvent::Resize ) { + if ( o == _page && e->type() == TQEvent::Resize ) { // We need to call TQScrollView::eventFilter before centerContents, // otherwise a loop will be introduced. bool result = TQScrollView::eventFilter( o, e ); @@ -88,16 +88,16 @@ void KGVPageView::wheelEvent( TQWheelEvent *e ) } void KGVPageView::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() & Qt::LeftButton ) + if ( e->button() & TQt::LeftButton ) { _dragGrabPos = e -> globalPos(); setCursor( sizeAllCursor ); } - else if ( e->button() & Qt::MidButton ) + else if ( e->button() & TQt::MidButton ) { emit ReadDown(); } - else if ( e -> button() & Qt::RightButton ) + else if ( e -> button() & TQt::RightButton ) { emit rightClick(); } @@ -105,7 +105,7 @@ void KGVPageView::mousePressEvent( TQMouseEvent * e ) void KGVPageView::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e -> button() & Qt::LeftButton ) + if ( e -> button() & TQt::LeftButton ) { setCursor( arrowCursor ); } @@ -113,7 +113,7 @@ void KGVPageView::mouseReleaseEvent( TQMouseEvent *e ) void KGVPageView::mouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() & Qt::LeftButton ) + if ( e->state() & TQt::LeftButton ) { TQPoint delta = _dragGrabPos - e->globalPos(); scrollBy( delta.x(), delta.y() ); diff --git a/kghostview/kgvpageview.h b/kghostview/kgvpageview.h index b7c4cd09..dadbbfe2 100644 --- a/kghostview/kgvpageview.h +++ b/kghostview/kgvpageview.h @@ -29,7 +29,7 @@ */ class KGVPageView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 0835efb3..8217ce47 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -60,29 +60,29 @@ KGVShell::KGVShell() : _tmpFile( 0 ) { m_gvpart = KParts::ComponentFactory::createPartInstanceFromLibrary< KGVPart >( "libkghostviewpart", this, "kgvpart", - TQT_TQOBJECT(this), "kgvpart" ); + this, "kgvpart" ); /*---- File -----------------------------------------------------------*/ openact = - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); recent = - KStdAction::openRecent( TQT_TQOBJECT(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( TQT_TQOBJECT(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, TQT_TQOBJECT(this), - TQT_SLOT( slotMaximize() ), actionCollection(), + new TDEAction( i18n( "&Maximize" ), Key_M, this, + TQ_SLOT( slotMaximize() ), actionCollection(), "maximize"); - _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(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( TQT_TQOBJECT(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( TQT_TQOBJECT(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/kgvshell.h b/kghostview/kgvshell.h index 70879a4f..98915ec6 100644 --- a/kghostview/kgvshell.h +++ b/kghostview/kgvshell.h @@ -37,7 +37,7 @@ class FullScreenFilter; class KDE_EXPORT KGVShell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index cdce1dbb..7dd9f1be 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -279,8 +279,8 @@ void KPSWidget::setupWidget() Q_ASSERT( orientation() != CDSC_ORIENT_UNKNOWN ); - const float dpiX = _magnification * TQT_TQPAINTDEVICE(this)->x11AppDpiX(); - const float dpiY = _magnification * TQT_TQPAINTDEVICE(this)->x11AppDpiY(); + const float dpiX = _magnification * this->x11AppDpiX(); + const float dpiY = _magnification * this->x11AppDpiY(); int newWidth = 0, newHeight = 0; if( orientation() == CDSC_PORTRAIT || orientation() == CDSC_UPSIDEDOWN ) @@ -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/kpswidget.h b/kghostview/kpswidget.h index 0dd556fa..d1c41c25 100644 --- a/kghostview/kpswidget.h +++ b/kghostview/kpswidget.h @@ -45,7 +45,7 @@ class MessagesDialog; class KPSWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/logwindow.h b/kghostview/logwindow.h index 8f3b2f11..daa9f03d 100644 --- a/kghostview/logwindow.h +++ b/kghostview/logwindow.h @@ -27,7 +27,7 @@ class KURLLabel; class LogWindow : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp index b84924eb..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, TQT_TQOBJECT(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/marklist.h b/kghostview/marklist.h index 6ccc5800..e8b4f54c 100644 --- a/kghostview/marklist.h +++ b/kghostview/marklist.h @@ -26,7 +26,7 @@ class KGVMiniWidget; class MarkListItem : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MarkListItem( TQWidget *parent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget*, int ); @@ -54,7 +54,7 @@ private: class MarkList: public TQTable { - Q_OBJECT + TQ_OBJECT public: diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp index e50f353a..10b1a6eb 100644 --- a/kghostview/scrollbox.cpp +++ b/kghostview/scrollbox.cpp @@ -31,15 +31,15 @@ ScrollBox::ScrollBox( TQWidget* parent, const char* name ) void ScrollBox::mousePressEvent( TQMouseEvent* e ) { mouse = e->pos(); - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) emit button3Pressed(); - if( e->button() == Qt::MidButton ) + if( e->button() == TQt::MidButton ) emit button2Pressed(); } void ScrollBox::mouseMoveEvent( TQMouseEvent* e ) { - if( e->state() != Qt::LeftButton ) + if( e->state() != TQt::LeftButton ) return; int dx = ( e->pos().x() - mouse.x() ) * pagesize.width() / width(); diff --git a/kghostview/scrollbox.h b/kghostview/scrollbox.h index 5cdd96b0..fa0a4441 100644 --- a/kghostview/scrollbox.h +++ b/kghostview/scrollbox.h @@ -24,7 +24,7 @@ class ScrollBox: public TQFrame { - Q_OBJECT + TQ_OBJECT public: 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/thumbnailservice.h b/kghostview/thumbnailservice.h index 6c861e77..edc33d4a 100644 --- a/kghostview/thumbnailservice.h +++ b/kghostview/thumbnailservice.h @@ -29,7 +29,7 @@ class KGVMiniWidget; class TQTimer; class ThumbnailService : public TQObject { - Q_OBJECT + TQ_OBJECT public: ThumbnailService( KGVMiniWidget* parent, const char* name = 0 ); diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index aa46048b..7073fa69 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -28,7 +28,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) : TQDialog( parent, name ) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQBoxLayout *topLayout = new TQVBoxLayout( this, 10 ); @@ -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/kghostview/viewcontrol.h b/kghostview/viewcontrol.h index 3e4a24b9..93db268f 100644 --- a/kghostview/viewcontrol.h +++ b/kghostview/viewcontrol.h @@ -8,7 +8,7 @@ class TQPushButton; class ViewControl : public TQDialog { - Q_OBJECT + TQ_OBJECT public: ViewControl( TQWidget *parent, const char *name ); diff --git a/kmrml/AUTHORS b/kmrml/AUTHORS deleted file mode 100644 index 9e0745fb..00000000 --- a/kmrml/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Carsten Pfeiffer <pfeiffer@kde.org> diff --git a/kmrml/CMakeL10n.txt b/kmrml/CMakeL10n.txt deleted file mode 100644 index b585ce4a..00000000 --- a/kmrml/CMakeL10n.txt +++ /dev/null @@ -1,3 +0,0 @@ -##### create translation templates ############## - -tde_l10n_auto_add_subdirectories( ) diff --git a/kmrml/CMakeLists.txt b/kmrml/CMakeLists.txt deleted file mode 100644 index c7eadab2..00000000 --- a/kmrml/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -################################################# -# -# (C) 2010-2011 Calvin Morrison -# mutantturkey@gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -message( AUTHOR_WARNING - " \n" - " ---------------------------------------------------------- \n" - " *** NOTE *** \n" - " Building kmrml is deprecated and should not be done. \n" - " kmrml will be dropped starting from R14.2.0. \n" - " Please contact the TDE development team on ML \n" - " if you wish kmrml to be continued. \n" - " ---------------------------------------------------------- \n") - -include( ConfigureChecks.cmake ) - -add_subdirectory ( kmrml ) diff --git a/kmrml/ChangeLog b/kmrml/ChangeLog deleted file mode 100644 index 9dbd3ea3..00000000 --- a/kmrml/ChangeLog +++ /dev/null @@ -1,28 +0,0 @@ -Uh er, looks like I didn't add all the other changes lately :} Sorry... - -Sun May 6 04:40:52 2001 Carsten Pfeiffer <pfeiffer@kde.org> - - * UI is a bit nicer now (arrangement of thumbnail items) - - * it's possible to search by example, i.e. by right-clicking - on one or more images and selecting "search for similar images" - - * tiny bit of code cleanup - -Sat May 5 02:30:21 2001 Carsten Pfeiffer <pfeiffer@kde.org> - - * argh, fixed the bug that files couldn't get downloaded by - clicking on them and that the statusbar isn't updated. - casts suck :} That took me a lot of time to find out :( - - * added middle-button -> create new window - - * scroll to top when loading a new page - - * show standard popupmenu on right-click on image - - * schedule the slaves instead of creating all at once - -Sam Apr 28 00:09:17 CEST 2001 - Carsten Pfeiffer <pfeiffer@kde.org> - o Initial Creation - didn't do any entries until something is actually working :) diff --git a/kmrml/ConfigureChecks.cmake b/kmrml/ConfigureChecks.cmake deleted file mode 100644 index 51a3c9fb..00000000 --- a/kmrml/ConfigureChecks.cmake +++ /dev/null @@ -1,13 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -check_include_file( stdlib.h HAVE_STDLIB_H ) -check_include_file( unistd.h HAVE_UNISTD_H ) diff --git a/kmrml/Makefile.am b/kmrml/Makefile.am deleted file mode 100644 index c48d9eb6..00000000 --- a/kmrml/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = kmrml diff --git a/kmrml/README b/kmrml/README deleted file mode 100644 index d17322df..00000000 --- a/kmrml/README +++ /dev/null @@ -1,95 +0,0 @@ -tdeio_mrml and mrml_part - -Carsten Pfeiffer <pfeiffer@kde.org> 2001/05/03 ----------------------------------------------------------------------- -These are the sources for an mrml tdeioslave and an accompanying KPart. - - -How does it work in Konqueror? -============================== -For now, the MrmlPart is rather a proof of concept, than a full blown -MRML client. - -You can start the MrmlPart by entering an appropriate URL into Konqueror, -e.g. mrml://user:pass@host.domain:port -user, pass and domain are optional, so if you're running a server locally -yourself, you can enter mrml://localhost to make Konqueror show the -MrmlPart. If you don't have a running GIFT-server, you can try out -mrml://viper.unige.ch:12790 as an example. Then, Konqueror will try to -connect the server at the given URL and show you a list of -image-collections the server has available. You can specify the number -of images a query should return and you can hit the Search-button -to actually start the query. If you don't give an image as example for -the query, it will return random images from the collection. - -Shortly after hitting the Search-button, you will see a list of images -as thumbnails. Below every image is a small rectangle showing the -similarity of the image with the example image(s). The longer the -rectangle, the better the match. - -Even easier than entering the mrml URL is right-clicking on an image -in Konqueror and selecting "Search for similar images..." in the context -menu. This will open up a new Konqueror window where the query will start -automatically. By default, this will try to contact a local server, i.e -mrml://localhost. You can configure different servers in the KControl -Module (System -> Advanced Search). The last chosen server will be used -for those queries. - -Note that a remote server surely can't access an image from your home -direcory though. I have to think a little bit about the usability of -this :) The greatest use of this is when you've indexed your files -and running an own GIFT server anyway. Ideally, the server could be -started on demand, when a query comes up. - - -MrmlPart: -========= - This KPart makes use of the mrml ioslave to provide a full MRML -client. MRML, Multimedia Retrieval Markup Language (see -http://www.mrml.net) is a means to query CBIR (Content Based Image -Retrieval) servers. An OpenSource server is the GIFT (GNU Image -Finding Tool), see www.mrml.net for downloading the GIFT. - -You can query for images by choosing one or more "example" images. -The server will search for images that have similarities to the -example(s) you gave. Queries can be refined by specifying relevance, -i.e. by including and excluding parts of the previous search result. - - -mrml ioslave: -============= - Basically this is not much more than a slave for asynchronous -transport of "data". With the URL, you can specify the user, password -and port, as well as the url of the server to connect to. - -The data exchange of client <-> slave is done via metaData, with an -"mrml_data" key. The data that the slave sends to the client is sent -in one big chunk, after all the data has arrived at the slave. This -could be made configurable later. - -With a little tuning, one could turn this into a generic slave -which can transport any kind of data. - -[mrmlsearch] -This little baby is called from Konqueror's popupmenu, when you hit -"Search for similar images...". This program simply gets the URLs -from Konqueror and creates a query of the form -mrml://host.com/?relevant=url1;url2;url3;url4.... -It will use the currently selected host in the KControl module -System -> Advanced Search to perform the query. - -mrmlsearch will then invoke "kfmclient openURL query" to start open -a new Konqueror window and perform the query. - - -Thanks go to Wolfgang Mller <Wolfgang.Mueller@cui.unige.ch> for his -work on the GIFT and for making me write this frontend :) I really -had a WOW-effect about the GIFT, when MrmlPart returned the first -query results. - -New versions of this package can be found at -http://devel-home.kde.org/~pfeiffer/kmrml/ -See http://www.mrml.net for downloading the GIFT and more information. - -Have fun, - Carsten Pfeiffer diff --git a/kmrml/README.DEVELOPMENT b/kmrml/README.DEVELOPMENT deleted file mode 100644 index 54664c99..00000000 --- a/kmrml/README.DEVELOPMENT +++ /dev/null @@ -1,41 +0,0 @@ -This file gives an overview of the structure of the kmrml package. - -kmrml consists of the following: - -- tdeio_mrml: an ioslave that is able to contact an mrml daemon (i.e. the GIFT) - and transports the data from the daemon to its master (i.e. the - MrmlPart) as XML (MRML, Multimedia Retrieval Markup Language) - -- MrmlPart: the konqueror-embeddable controller and view - -- mrmlsearch: a small tool that is e.g. called from Konqueror's ContextMenu - "Search for similar images" to start an image query. - -- kcontrol/: a Trinity Control Center module for configuring parts of the GIFT, - i.e. indexing directories, specifying GIFT hosts, etc. - -- server/: a kded module, i.e. a tiny little daemon, that can be told via - DCOP to start, restart upon failure and automatically/manually - stop services. It is completely independent of GIFT/kmrml. - It is used to have one centralized place where the gift server - is started (ensuring this happens only once, restarting it upon - failure and stopping the gift after all tdeio_mrml instances - have been killed. - -lib/: common stuff used by more than one module - - -Useful URLs: - -The MRML DTD: -http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/gift/gift/dtd/mrml.dtd?rev=HEAD&content-type=text/plain - -The GIFT Homepage: -http://www.gnu.org/software/gift - -The fer-de-lance project homepage, under which the GIFT and kmrml are living -http://www.fer-de-lance.org - - -2002/08/08 -Carsten Pfeiffer <pfeiffer@kde.org> diff --git a/kmrml/TODO b/kmrml/TODO deleted file mode 100644 index 85a9aa7f..00000000 --- a/kmrml/TODO +++ /dev/null @@ -1,15 +0,0 @@ -- Konqueror Properties dialog for indexing directory? Or just a context menu entry? -- make use of BrowserExtension, provide the actions -- contextmenu -- better layouting? -- better keyboard support -- progress report from slave -- transfer mrml in chunks as data arrives? -- finish algorithm configuration -- integrate with KPaint so you can paint an example image -- integrate with kamera, so that images from your digicam will be indexed automatically -- create Konq ContextMenu plugin instead of the ServiceMenu thing (mrmlsearch binary) -- proper browserextension (restorestate/savestate, history, implement actions) -- a panel applet or tray app KDirWatching indexable dirs and re-indexing on demand - -lots more probably diff --git a/kmrml/example-session.mrml b/kmrml/example-session.mrml deleted file mode 100644 index 27b5c009..00000000 --- a/kmrml/example-session.mrml +++ /dev/null @@ -1,142 +0,0 @@ - <algorithm-list> - <algorithm - algorithm-name="Classical IDF" - algorithm-id="a-cidf" - algorithm-type="a-cidf" > - cui-block-texture-histogram="no" - collection-id="c-0-40-20-27-3-101-5-116-0" - cui-pr-percentage-of-features="70" - cui-block-texture-blocks="no" - cui-weighting-function="ClassicalIDF" - cui-base-type="inverted_file" - cui-block-color-histogram="no" - cui-block-color-blocks="no" - <query-paradigm-list> - <query-paradigm/> - </query-paradigm-list> - - - <property-sheet - send-type="none" - maxsubsetsize="1" - property-sheet-id="cui-p-1" - minsubsetsize="0" - property-sheet-type="subset" > - <property-sheet - caption="Modify default configuration" - send-type="none" - property-sheet-id="cui-p0" - property-sheet-type="set-element" > - - <property-sheet - send-name="cui-pr-percentage-of-features" - send-value="70" - caption="Prune at % of features" - send-type="attribute" - from="20" - to="100" - step="5" - property-sheet-id="cui-p15" - property-sheet-type="numeric" /> - - <property-sheet - send-type="none" - maxsubsetsize="4" - property-sheet-id="cui-p1" - minsubsetsize="1" - property-sheet-type="subset" > - <property-sheet - send-name="cui-block-color-blocks" - send-value="yes" - caption="Colour blocks" - send-type="attribute" - property-sheet-id="cui-p12" - send-boolean-inverted="yes" - property-sheet-type="set-element" /> - <property-sheet - send-name="cui-block-texture-blocks" - send-value="yes" - caption="Gabor blocks" - send-type="attribute" - property-sheet-id="cui-p14" - send-boolean-inverted="yes" - property-sheet-type="set-element" /> - <property-sheet - send-name="cui-block-texture-histogram" - send-value="yes" - caption="Gabor histogram" - send-type="attribute" - property-sheet-id="cui-p13" - send-boolean-inverted="yes" - property-sheet-type="set-element" /> - <property-sheet - send-name="cui-block-color-histogram" - send-value="yes" - caption="Colour histogram" - send-type="attribute" - property-sheet-id="cui-p11" - send-boolean-inverted="yes" - property-sheet-type="set-element" /> - </property-sheet> - </property-sheet> - </property-sheet> - - - </algorithm> - - - <!-- --> - - - <algorithm cui-perl-query-function="processGIFTQueryCall" algorithm-id="a-perl" cui-perl-script-file="/home/gis/gift-embed-perl-modules.pl" cui-perl-package="CGIFTLink" collection-id="c-0-40-20-27-3-101-5-116-0" cui-perl-random-function="processGIFTRandomQueryCall" cui-weighting-function="ClassicalIDF" algorithm-name="Perl link" cui-base-type="perl" algorithm-type="a-perl" > - <query-paradigm-list> - <query-paradigm type="inverted-file" /> - <query-paradigm type="perl-demo" /> - </query-paradigm-list> - - - <property-sheet send-type="none" maxsubsetsize="1" property-sheet-id="cui-p-1" minsubsetsize="0" property-sheet-type="subset" > - <property-sheet caption="Modify default configuration" send-type="none" property-sheet-id="cui-p0" property-sheet-type="set-element" /> - </property-sheet> - </algorithm> - <algorithm cui-block-texture-histogram="no" algorithm-id="adefault" collection-id="c-0-40-20-27-3-101-5-116-0" cui-pr-percentage-of-features="70" cui-block-texture-blocks="no" cui-weighting-function="ClassicalIDF" algorithm-name="Separate Normalisation" cui-base-type="multiple" cui-block-color-histogram="no" cui-block-color-blocks="no" algorithm-type="adefault" > - <algorithm cui-block-texture-histogram="yes" algorithm-id="sub1" cui-pr-percentage-of-features="100" cui-block-texture-blocks="yes" algorithm-name="sub1" cui-base-type="inverted_file" cui-block-color-blocks="yes" algorithm-type="sub1" /> - <algorithm cui-block-texture-histogram="yes" algorithm-id="sub2" cui-block-texture-blocks="yes" algorithm-name="sub2" cui-base-type="inverted_file" cui-block-color-histogram="yes" algorithm-type="sub2" /> - <algorithm algorithm-id="sub3" cui-pr-percentage-of-features="100" cui-block-texture-blocks="yes" algorithm-name="sub3" cui-base-type="inverted_file" cui-block-color-histogram="yes" cui-block-color-blocks="yes" algorithm-type="sub3" /> - <algorithm cui-block-texture-histogram="yes" algorithm-id="sub4" algorithm-name="sub4" cui-base-type="inverted_file" cui-block-color-histogram="yes" cui-block-color-blocks="yes" algorithm-type="sub4" /> - <query-paradigm-list> - <query-paradigm/> - </query-paradigm-list> - <property-sheet send-type="none" maxsubsetsize="1" property-sheet-id="cui-p-1" minsubsetsize="0" property-sheet-type="subset" > - <property-sheet caption="Modify default configuration" send-type="none" property-sheet-id="cui-p0" property-sheet-type="set-element" > - <property-sheet send-name="cui-pr-percentage-of-features" send-value="70" caption="Prune at % of features" send-type="attribute" from="20" to="100" step="5" property-sheet-id="cui-p15" property-sheet-type="numeric" /> - <property-sheet send-type="none" maxsubsetsize="4" property-sheet-id="cui-p1" minsubsetsize="1" property-sheet-type="subset" > - <property-sheet send-name="cui-block-color-blocks" send-value="yes" caption="Colour blocks" send-type="attribute" property-sheet-id="cui-p12" send-boolean-inverted="yes" property-sheet-type="set-element" /> - <property-sheet send-name="cui-block-texture-blocks" send-value="yes" caption="Gabor blocks" send-type="attribute" property-sheet-id="cui-p14" send-boolean-inverted="yes" property-sheet-type="set-element" /> - <property-sheet send-name="cui-block-texture-histogram" send-value="yes" caption="Gabor histogram" send-type="attribute" property-sheet-id="cui-p13" send-boolean-inverted="yes" property-sheet-type="set-element" /> - <property-sheet send-name="cui-block-color-histogram" send-value="yes" caption="Colour histogram" send-type="attribute" property-sheet-id="cui-p11" send-boolean-inverted="yes" property-sheet-type="set-element" /> - </property-sheet> - </property-sheet> - </property-sheet> - </algorithm> - </algorithm-list> - - - - <collection-list> - <collection - collection-name="images" - collection-id="c-0-40-20-27-3-101-5-116-0" - cui-inverted-file-location="InvertedFile.db" - cui-offset-file-location="InvertedFileOffset.db" - cui-algorithm-id-list-id="ail-inverted-file" - cui-feature-file-location="url2fts.xml" - cui-feature-description-location="InvertedFileFeatureDescription.db" - cui-base-dir="/home/gis/gift-indexing-data/images//" - cui-number-of-images="372" > - <query-paradigm-list> - <query-paradigm type="inverted-file" /> - <query-paradigm type="perl-demo" /> - </query-paradigm-list> - </collection> - </collection-list> diff --git a/kmrml/kmrml.spec b/kmrml/kmrml.spec deleted file mode 100644 index 76c8be05..00000000 --- a/kmrml/kmrml.spec +++ /dev/null @@ -1,62 +0,0 @@ -%define version 0.3 -%define release 1 -%define serial 1 -%define prefix /opt/trinity - -Name: kmrml -Summary: MRML for KDE -- Content based image retrieval -Version: %{version} -Release: %{release} -Serial: %{serial} -Source: http://devel-home.kde.org/~pfeiffer/kmrml/kmrml-%{version}.tgz -URL: http://devel-home.kde.org/~pfeiffer/kmrml/ -Copyright: GPL -Packager: Carsten Pfeiffer <pfeiffer@kde.org> -Group: X11/KDE/Utilities -BuildRoot: /tmp/kmrml-%{version}-root -Prefix: %{prefix} - -%description -MRML is short for Multimedia Retrieval Markup Language, -which defines a protocol for querying a server for images -based on their content. See http://www.mrml.net about MRML -and the GNU Image Finding Tool (GIFT), an MRML server. - -This package consists of an mrml tdeio-slave that handles -the communication with the MRML server and a KPart to -be embedded e.g. into Konqueror. - -With those, you can search for images by giving an example -image and let the server look up similar images. The query -result can be refined by giving positive/negative feedback. - -Install with '--prefix $TDEDIR' unless you have KDE in /opt/trinity - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -n kmrml-%{version} - -%build -export TDEDIR=%{prefix} -CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -malign-functions=2 -malign-jumps=2 -malign-loops=2 -pipe" LDFLAGS=-s ./configure --prefix=%{prefix} --enable-final --disable-debug -mkdir -p $RPM_BUILD_ROOT -make - -%install -make install DESTDIR=$RPM_BUILD_ROOT - -cd $RPM_BUILD_ROOT - -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name} - -find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name} - -find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name} - -%clean -rm -rf $RPM_BUILD_ROOT -rm -f $RPM_BUILD_DIR/file.list.%{name} - -%files -f ../file.list.%{name} - diff --git a/kmrml/kmrml/CMakeL10n.txt b/kmrml/kmrml/CMakeL10n.txt deleted file mode 100644 index 7a6286e3..00000000 --- a/kmrml/kmrml/CMakeL10n.txt +++ /dev/null @@ -1,9 +0,0 @@ -##### create translation templates ############## - -tde_l10n_create_template( "kmrml" ) - -tde_l10n_create_template( - CATALOG "desktop_files/kmrml-desktops/" - SOURCES *.desktop - DESTINATION "${CMAKE_SOURCE_DIR}/translations" -) diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt deleted file mode 100644 index 90f7e3ce..00000000 --- a/kmrml/kmrml/CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ -################################################# -# -# (C) 2010-2011 Calvin Morrison -# mutantturkey@gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( lib ) -add_subdirectory( kcontrol ) -add_subdirectory( server ) - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/lib - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -#### other data ################################# - -install( FILES mrml.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) - -tde_create_translated_desktop( - SOURCE mrml_part.desktop - DESTINATION ${SERVICES_INSTALL_DIR} - PO_DIR kmrml-desktops -) - -tde_create_translated_desktop( - SOURCE mrml.desktop - DESTINATION ${MIME_INSTALL_DIR}/text - PO_DIR kmrml-desktops -) - -tde_create_translated_desktop( - SOURCE mrml-servicemenu.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus - PO_DIR kmrml-desktops -) - - -#### tdeio_mrml (module) ########################## - -tde_add_kpart( tdeio_mrml AUTOMOC - SOURCES mrml.cpp - LINK kmrmlstuff-static tdeio-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) - - -##### libkmrmlpart (module) ####################### - -tde_add_kpart( libkmrmlpart AUTOMOC - SOURCES - mrml_part.cpp mrml_view.cpp loader.cpp mrml_elements.cpp - mrml_creator.cpp browser.cpp algorithmdialog.cpp collectioncombo.cpp - algorithmcombo.cpp propertysheet.cpp - LINK kmrmlstuff-static tdeparts-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) - - -##### mrmlsearch (tdeinit) ###################### - -tde_add_tdeinit_executable( mrmlsearch AUTOMOC - SOURCES mrmlsearch.cpp - LINK kmrmlstuff-static tdecore-shared -) diff --git a/kmrml/kmrml/Makefile.am b/kmrml/kmrml/Makefile.am deleted file mode 100644 index 58af2513..00000000 --- a/kmrml/kmrml/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -SUBDIRS = server lib kcontrol -INCLUDES= -I$(top_srcdir)/kmrml/kmrml/lib $(all_includes) -METASOURCES = AUTO - -LIB_KMRMLSTUFF = $(top_builddir)/kmrml/kmrml/lib/libkmrmlstuff.la - -####### Files - -kde_module_LTLIBRARIES = tdeio_mrml.la libkmrmlpart.la - -tdeio_mrml_la_SOURCES = mrml.cpp -tdeio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEIO) -tdeio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module - -libkmrmlpart_la_SOURCES = mrml_part.cpp mrml_view.cpp loader.cpp \ - mrml_elements.cpp mrml_creator.cpp browser.cpp algorithmdialog.cpp \ - collectioncombo.cpp algorithmcombo.cpp propertysheet.cpp -libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEPARTS) -libkmrmlpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - -services_DATA = mrml.protocol mrml_part.desktop -servicesdir = $(kde_servicesdir) - -mimetypes_DATA = mrml.desktop -mimetypesdir = $(kde_mimedir)/text - -servicemenu_DATA = mrml-servicemenu.desktop -servicemenudir = $(kde_datadir)/konqueror/servicemenus - -############################################# -bin_PROGRAMS = -lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = mrmlsearch.la - -mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDECORE) -mrmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -mrmlsearch_la_SOURCES = mrmlsearch.cpp - -messages: - $(EXTRACTRC) */*.ui > rc.cpp - $(XGETTEXT) *.h *.cpp */*.cpp */*.h -o $(podir)/kmrml.pot diff --git a/kmrml/kmrml/algorithmcombo.cpp b/kmrml/kmrml/algorithmcombo.cpp deleted file mode 100644 index a2db81d4..00000000 --- a/kmrml/kmrml/algorithmcombo.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "algorithmcombo.h" - -#include <kdatastream.h> - -using namespace KMrml; - -// ### copycat of CollectionCombo... moc can't handle templates unfortunately.. -// could use base-class MrmlElement.... - -AlgorithmCombo::AlgorithmCombo( TQWidget *parent, const char *name ) - : KComboBox( false, parent, name ), - m_algorithms( 0L ) -{ - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotActivated( const TQString& ) )); -} - -AlgorithmCombo::~AlgorithmCombo() -{ -} - -void AlgorithmCombo::setAlgorithms( const AlgorithmList *algorithms ) -{ - assert( algorithms != 0L ); - - clear(); - m_algorithms = algorithms; - insertStringList( algorithms->itemNames() ); - // #### block signals here? -} - -void AlgorithmCombo::setCurrent( const Algorithm& coll ) -{ - setCurrentItem( coll.name() ); -} - -Algorithm AlgorithmCombo::current() const -{ - return m_algorithms->findByName( currentText() ); -} - -void AlgorithmCombo::slotActivated( const TQString& name ) -{ - Algorithm coll = m_algorithms->findByName( name ); - emit selected( coll ); -} - -#include "algorithmcombo.moc" diff --git a/kmrml/kmrml/algorithmcombo.h b/kmrml/kmrml/algorithmcombo.h deleted file mode 100644 index 0868708f..00000000 --- a/kmrml/kmrml/algorithmcombo.h +++ /dev/null @@ -1,55 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef ALGORITHMCOMBO_H -#define ALGORITHMCOMBO_H - -#include <kcombobox.h> - -#include "mrml_elements.h" - -namespace KMrml -{ - - class AlgorithmCombo : public KComboBox - { - Q_OBJECT - - - public: - AlgorithmCombo( TQWidget *parent, const char *name = 0 ); - ~AlgorithmCombo(); - - void setAlgorithms( const AlgorithmList * algorithms ); - void setCurrent( const Algorithm& coll ); - - Algorithm current() const; - - signals: - void selected( const Algorithm& ); - - private slots: - void slotActivated( const TQString& ); - - private: - const AlgorithmList *m_algorithms; - }; - -} - -#endif // ALGORITHMCOMBO_H diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp deleted file mode 100644 index f2a0a089..00000000 --- a/kmrml/kmrml/algorithmdialog.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "algorithmdialog.h" -#include "algorithmcombo.h" -#include "collectioncombo.h" - -#include <tqhbox.h> -#include <tqlabel.h> -#include <tqlayout.h> -#include <tqscrollview.h> -#include <tqvbox.h> -#include <tqvgroupbox.h> - -#include <tdelocale.h> - -using namespace KMrml; - -class ScrollView : public TQScrollView -{ -public: - ScrollView(TQWidget* parent = 0, const char* name = 0) - : TQScrollView(parent, name) - { - setFrameStyle(TQFrame::NoFrame); - m_frame = new TQFrame(viewport(), "ScrollView::m_frame"); - m_frame->setFrameStyle(TQFrame::NoFrame); - addChild(m_frame, 0, 0); - }; - - TQFrame* frame() {return m_frame;}; - -protected: - virtual void viewportResizeEvent(TQResizeEvent* ev) - { - TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), - kMax(m_frame->sizeHint().height(), ev->size().height())); - }; - -private: - TQFrame* m_frame; -}; - -AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms, - const CollectionList& collections, - const Collection& currentColl, - TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n("Configure Query Algorithms"), - Ok | Cancel, Ok, false ), - m_allAlgorithms( algorithms ), - m_collections( collections ) -{ - TQWidget *box = makeMainWidget(); - - TQVBoxLayout *mainLayout = new TQVBoxLayout( box, 0, KDialog::spacingHint(), - "mainLayout"); - - TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout"); - collectionLayout->addWidget( new TQLabel( i18n("Collection: "), box )); - - m_collectionCombo = new CollectionCombo( box, "collection combo" ); - m_collectionCombo->setCollections( &m_collections ); - collectionLayout->addWidget( m_collectionCombo ); - - mainLayout->addLayout( collectionLayout ); - mainLayout->addSpacing( 14 ); - - TQHBox *algoHLayout = new TQHBox( box ); - (void) new TQLabel( i18n("Algorithm: "), algoHLayout); - m_algoCombo = new AlgorithmCombo( algoHLayout, "algo combo" ); - - TQVGroupBox *groupBox = new TQVGroupBox( box, "groupBox" ); - mainLayout->addWidget( groupBox ); - algoHLayout->raise(); - - ScrollView *scrollView = new ScrollView( groupBox, "scroll view" ); - m_view = scrollView->frame(); - TQVBoxLayout *viewLayout = new TQVBoxLayout( scrollView ); - viewLayout->setSpacing( KDialog::spacingHint() ); - - - collectionChanged( currentColl ); - - connect( m_algoCombo, TQT_SIGNAL( selected( const Algorithm& ) ), - TQT_SLOT( initGUI( const Algorithm& ) )); - connect( m_collectionCombo, TQT_SIGNAL( selected( const Collection& ) ), - TQT_SLOT( collectionChanged( const Collection& ) )); - - algoHLayout->adjustSize(); - mainLayout->activate(); - algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 ); - - box->setMinimumWidth( algoHLayout->sizeHint().width() + - 4 * KDialog::spacingHint() ); -} - -AlgorithmDialog::~AlgorithmDialog() -{ -} - -void AlgorithmDialog::collectionChanged( const Collection& coll ) -{ - m_algosForCollection = m_allAlgorithms.algorithmsForCollection( coll ); - m_algoCombo->setAlgorithms( &m_algosForCollection ); - - initGUI( m_algoCombo->current() ); -} - -void AlgorithmDialog::initGUI( const Algorithm& algo ) -{ - m_algo = algo; - - -} - -#include "algorithmdialog.moc" diff --git a/kmrml/kmrml/algorithmdialog.h b/kmrml/kmrml/algorithmdialog.h deleted file mode 100644 index 72f08e7d..00000000 --- a/kmrml/kmrml/algorithmdialog.h +++ /dev/null @@ -1,61 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef ALGORITHMDIALOG_H -#define ALGORITHMDIALOG_H - -#include <kdialogbase.h> - -#include "mrml_elements.h" - -namespace KMrml -{ - class AlgorithmCombo; - class CollectionCombo; - - class AlgorithmDialog : public KDialogBase - { - Q_OBJECT - - - public: - AlgorithmDialog( const AlgorithmList&, const CollectionList&, - const Collection& currentColl, - TQWidget *parent = 0, const char *name = 0 ); - ~AlgorithmDialog(); - - private slots: - void collectionChanged( const Collection& ); - void initGUI( const Algorithm& algo ); - - private: - Algorithm m_algo; - AlgorithmList m_allAlgorithms; - AlgorithmList m_algosForCollection; - CollectionList m_collections; - - CollectionCombo *m_collectionCombo; - AlgorithmCombo *m_algoCombo; - - TQFrame *m_view; - }; - -} - -#endif // ALGORITHMDIALOG_H diff --git a/kmrml/kmrml/browser.cpp b/kmrml/kmrml/browser.cpp deleted file mode 100644 index 57ac0085..00000000 --- a/kmrml/kmrml/browser.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "browser.h" -#include "mrml_part.h" - -#include <tqscrollview.h> - -using namespace KMrml; - -Browser::Browser( MrmlPart *parent, const char *name ) - : KParts::BrowserExtension( parent, name ), - m_part( parent ) -{ - -} - -Browser::~Browser() -{ - -} - -void Browser::saveState( TQDataStream& stream ) -{ -// BrowserExtension::saveState( stream ); - - m_part->saveState( stream ); -} - -void Browser::restoreState( TQDataStream& stream ) -{ -// BrowserExtension::restoreState( stream ); - // ### BrowserExtension::restoreState() calls openURL() at the end (arghh). - - m_part->restoreState( stream ); -} - -int Browser::xOffset() -{ - return static_cast<TQScrollView*>( m_part->widget())->contentsX(); -} - -int Browser::yOffset() -{ - return static_cast<TQScrollView*>( m_part->widget())->contentsY(); -} - -#include "browser.moc" diff --git a/kmrml/kmrml/browser.h b/kmrml/kmrml/browser.h deleted file mode 100644 index d19d1543..00000000 --- a/kmrml/kmrml/browser.h +++ /dev/null @@ -1,49 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef BROWSER_H -#define BROWSER_H - -#include <tdeparts/browserextension.h> - -namespace KMrml -{ - class MrmlPart; - - class Browser : public KParts::BrowserExtension - { - Q_OBJECT - - - public: - Browser( MrmlPart *parent, const char *name ); - ~Browser(); - - virtual void saveState( TQDataStream& stream ); - virtual void restoreState( TQDataStream& stream ); - - virtual int xOffset(); - virtual int yOffset(); - - private: - MrmlPart *m_part; - }; - -} - -#endif // BROWSER_H diff --git a/kmrml/kmrml/collectioncombo.cpp b/kmrml/kmrml/collectioncombo.cpp deleted file mode 100644 index 7238305e..00000000 --- a/kmrml/kmrml/collectioncombo.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "collectioncombo.h" - -#include <kdatastream.h> - -using namespace KMrml; - -CollectionCombo::CollectionCombo( TQWidget *parent, const char *name ) - : KComboBox( false, parent, name ), - m_collections( 0L ) -{ - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotActivated( const TQString& ) )); -} - -CollectionCombo::~CollectionCombo() -{ -} - -void CollectionCombo::setCollections( const CollectionList *collections ) -{ - assert( collections != 0L ); - - clear(); - m_collections = collections; - insertStringList( collections->itemNames() ); - // #### block signals here? -} - -void CollectionCombo::setCurrent( const Collection& coll ) -{ - setCurrentItem( coll.name() ); -} - -Collection CollectionCombo::current() const -{ - return m_collections->findByName( currentText() ); -} - -void CollectionCombo::slotActivated( const TQString& name ) -{ - Collection coll = m_collections->findByName( name ); - emit selected( coll ); -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, - const CollectionCombo& combo ) -{ - int count = combo.count(); - stream << count; - for ( int i = 0; i < count; i++ ) - stream << combo.text( i ); - - stream << combo.currentItem(); - return stream; -} - -TQDataStream& KMrml::operator>>( TQDataStream& stream, CollectionCombo& combo ) -{ - combo.clear(); - - int count; - stream >> count; - TQString text; - for ( int i = 0; i < count; i++ ) - { - stream >> text; - combo.insertItem( text ); - } - - int current; - stream >> current; - combo.setCurrentItem( current ); - - return stream; -} - -#include "collectioncombo.moc" diff --git a/kmrml/kmrml/collectioncombo.h b/kmrml/kmrml/collectioncombo.h deleted file mode 100644 index e0125ae4..00000000 --- a/kmrml/kmrml/collectioncombo.h +++ /dev/null @@ -1,58 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef COLLECTIONCOMBO_H -#define COLLECTIONCOMBO_H - -#include <kcombobox.h> - -#include "mrml_elements.h" - -namespace KMrml -{ - - class CollectionCombo : public KComboBox - { - Q_OBJECT - - - public: - CollectionCombo( TQWidget *parent, const char *name = 0 ); - ~CollectionCombo(); - - void setCollections( const CollectionList * collections ); - void setCurrent( const Collection& coll ); - - Collection current() const; - - signals: - void selected( const Collection& ); - - private slots: - void slotActivated( const TQString& ); - - private: - const CollectionList *m_collections; - }; - - TQDataStream& operator<<( TQDataStream& stream, const CollectionCombo& ); - TQDataStream& operator>>( TQDataStream& stream, CollectionCombo& ); - -} - -#endif // COLLECTIONCOMBO_H diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt deleted file mode 100644 index 7c259547..00000000 --- a/kmrml/kmrml/kcontrol/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -################################################# -# -# (C) 2010-2011 Calvin Morrison -# mutantturkey@gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../lib - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - -#### other data ################################# - -tde_create_translated_desktop( - SOURCE kcmkmrml.desktop - PO_DIR kmrml-desktops -) - - -#### kcm_kmrml (module) ########################### - -tde_add_kpart( kcm_kmrml AUTOMOC - SOURCES - kcmkmrml.cpp mainpage.cpp indexer.cpp - serverconfigwidget.ui indexcleaner.cpp - LINK - kmrmlstuff-static tdeparts-shared tdeio-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kmrml/kmrml/kcontrol/Makefile.am b/kmrml/kmrml/kcontrol/Makefile.am deleted file mode 100644 index 60637449..00000000 --- a/kmrml/kmrml/kcontrol/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -LIB_KMRMLSTUFF = $(top_builddir)/kmrml/kmrml/lib/libkmrmlstuff.la - -kde_module_LTLIBRARIES = kcm_kmrml.la - -kcm_kmrml_la_SOURCES = kcmkmrml.cpp mainpage.cpp indexer.cpp serverconfigwidget.ui indexcleaner.cpp -kcm_kmrml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEIO) -INCLUDES= -I$(top_srcdir)/kmrml/kmrml/lib $(all_includes) - -kcm_kmrml_la_METASOURCES = AUTO - -noinst_HEADERS = kcmkmrml.h mainpage.h serverconfigwidget.h indexer.h indexcleaner.h - -xdg_apps_DATA = kcmkmrml.desktop - -#check_PROGRAMS = indextest -#indextest_SOURCES = indextest.cpp indexer.cpp -#indextest_LDADD = $(LIB_KMRMLSTUFF) $(LIB_TDECORE) -#indextest_LDFLAGS = $(all_libraries) - - - -#pics_DATA = play.png -#picsdir = $(kde_datadir)/kcontrol/pics - diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp deleted file mode 100644 index be2fbc29..00000000 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include <kdebug.h> -#include <kprocess.h> - -#include <kmrml_config.h> -#include "indexcleaner.h" - -#include <tdeversion.h> -#if TDE_VERSION < 306 - #define QUOTE( x ) x -#else - #define QUOTE( x ) TDEProcess::quote( x ) -#endif - -using namespace KMrmlConfig; - -IndexCleaner::IndexCleaner( const TQStringList& dirs, - const KMrml::Config *config, - TQObject *parent, const char *name ) - : TQObject( parent, name ), - m_dirs( dirs ), - m_config( config ), - m_process( 0L ) -{ - m_stepSize = 100 / dirs.count(); -} - -IndexCleaner::~IndexCleaner() -{ - if ( m_process ) - { - m_process->kill(); - delete m_process; - m_process = 0L; - } -} - -void IndexCleaner::start() -{ - startNext(); -} - -void IndexCleaner::slotExited( TDEProcess *proc ) -{ - emit advance( m_stepSize ); - - if ( !proc->normalExit() ) - kdWarning() << "Error removing old indexed directory" << endl; - - m_process = 0L; - - startNext(); -} - -void IndexCleaner::startNext() -{ - if ( m_dirs.isEmpty() ) - { - emit advance( 100 ); - emit finished(); - return; - } - -#if TDE_VERSION < 306 - m_process = new KShellProcess(); -#else - m_process = new TDEProcess(); - m_process->setUseShell( true ); -#endif - connect( m_process, TQT_SIGNAL( processExited( TDEProcess * )), - TQT_SLOT( slotExited( TDEProcess * ) )); - - TQString cmd = m_config->removeCollectionCommandLine(); - - TQString dir = m_dirs.first(); - m_dirs.pop_front(); - - int index = cmd.find( "%d" ); - if ( index != -1 ) - cmd.replace( index, 2, QUOTE( dir ) ); - else // no %d? What else can we do? - cmd.append( TQString::fromLatin1(" ") + QUOTE( dir ) ); - - *m_process << cmd; - - if ( !m_process->start() ) - { - kdWarning() << "Error starting: " << cmd << endl; - - delete m_process; - m_process = 0L; - - startNext(); - } -} - -#include "indexcleaner.moc" diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h deleted file mode 100644 index 05396870..00000000 --- a/kmrml/kmrml/kcontrol/indexcleaner.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** $Id$ -** -** Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> -** -****************************************************************************/ - -#ifndef INDEXCLEANER_H -#define INDEXCLEANER_H - -#include <tqobject.h> -#include <tqstringlist.h> - -class TDEProcess; - -namespace KMrml -{ - class Config; -} - -namespace KMrmlConfig -{ - class IndexCleaner : public TQObject - { - Q_OBJECT - - - public: - IndexCleaner( const TQStringList& dirs, const KMrml::Config *config, - TQObject *parent = 0, const char *name = 0 ); - ~IndexCleaner(); - - void start(); - - signals: - void advance( int value ); - void finished(); - - private slots: - void slotExited( TDEProcess * ); - - private: - int m_stepSize; - void startNext(); - - TQStringList m_dirs; - const KMrml::Config *m_config; - TDEProcess *m_process; - }; - -} - - -#endif // INDEXCLEANER_H diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp deleted file mode 100644 index 2392cfd5..00000000 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqfile.h> -#include <tqregexp.h> - -#include <kdebug.h> -#include <tdelocale.h> -#include <tdeglobal.h> -#include <kprocio.h> - -#include "indexer.h" - -#include <tdeversion.h> -#if TDE_VERSION < 306 - #define QUOTE( x ) x -#else - #define QUOTE( x ) TDEProcess::quote( x ) -#endif - -using namespace KMrmlConfig; - -Indexer::Indexer( const KMrml::Config* config, - TQObject *parent, const char *name ) - : TQObject( parent, name ), - m_config( config ), - m_dirCount( 0 ) -{ - m_process = new KProcIO(); -#if TDE_VERSION >= 306 - m_process->setUseShell( true ); -#endif - m_process->setEnvironment( "LC_ALL", "C" ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess * )), - TQT_SLOT( processFinished( TDEProcess * ))); - connect( m_process, TQT_SIGNAL( readReady( KProcIO * )), - TQT_SLOT( slotCanRead( KProcIO * )) ); -} - -Indexer::~Indexer() -{ - delete m_process; -} - -void Indexer::startIndexing( const TQStringList& dirs ) -{ - if ( m_process->isRunning() ) - return; - - m_dirs = dirs; - m_dirCount = dirs.count(); - processNext(); -} - -void Indexer::processFinished( TDEProcess *proc ) -{ - // still more directories to index? - if ( !m_dirs.isEmpty() ) - processNext(); - else - { - if ( proc->normalExit() ) - emit finished( proc->exitStatus() ); - else - emit finished( -1000 ); - } -} - - -void Indexer::processNext() -{ - m_currentDir = m_dirs.first(); - m_dirs.pop_front(); - while ( m_currentDir.endsWith( "/" ) ) - m_currentDir.remove( m_currentDir.length() -1, 1 ); - - m_process->resetAll(); - - TQString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace(); - - // in the commandline, replace %d with the directory to process and - // %t with the thumbnail dir - int index = cmd.find( "%d" ); // ### TQFile::encodeName()? - if ( index != -1 ) - cmd.replace( index, 2, QUOTE( m_currentDir ) ); - index = cmd.find( "%t" ); - if ( index != -1 ) - cmd.replace( index, 2, QUOTE(m_currentDir + "_thumbnails") ); - -// tqDebug("****** command: %s", cmd.latin1()); -#if TDE_VERSION >= 306 - *m_process << cmd; -#else - TQStringList params = TQStringList::split( ' ', cmd ); - TQStringList::Iterator it = params.begin(); - for ( ; it != params.end(); ++it ) - *m_process << *it; -#endif - - emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir )); - m_process->start(); -} - -void Indexer::slotCanRead( KProcIO *proc ) -{ - static const TQString& sprogress = TDEGlobal::staticQString("PROGRESS: "); - static const TQString& r1 = /* PROGRESS: 1 of 6 done (15%) */ - TDEGlobal::staticQString( "(\\d+) of (\\d+) done \\((\\d+)%\\)" ); - - TQString line; - int bytes = -1; - while ( (bytes = proc->readln( line )) != -1 ) - { - // examine the output. - // We're looking for lines like: - // PROGRESS: 1 of 6 done (15%) - // PROGRESS: 99% - // PROGRESS: 100% - - if ( !line.startsWith( sprogress ) ) // uninteresting debug output - continue; - else // parse output - { - // cut off "PROGRESS: " - line = line.mid( sprogress.length() ); - line = line.simplifyWhiteSpace().stripWhiteSpace(); -// tqDebug("*** START LINE ***"); -// tqDebug("%s", line.latin1()); -// tqDebug("*** END LINE ***"); - - // case 1: image processing, below 99% - if ( line.at( line.length() -1 ) == ')' ) - { - TQRegExp regxp( r1 ); - int pos = regxp.search( line ); - if ( pos > -1 ) - { - TQString currentFile = regxp.cap( 1 ); - TQString numFiles = regxp.cap( 2 ); - TQString percent = regxp.cap( 3 ); - -// tqDebug( "current: %s, number: %s, percent: %s", currentFile.latin1(), numFiles.latin1(), percent.latin1()); - bool ok = false; - int perc = percent.toInt( &ok ); - if ( ok ) - { - uint dirsLeft = m_dirs.count(); - TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles ); - emit progress( perc, message ); - } - } - } - - - // case 2: file writing, 99% or done, 100% - else - { - TQString percent = line.left( line.length() - 1 ); - - bool ok = false; - int number = percent.toInt( &ok ); - if ( ok ) - { - TQString message = (number == 100) ? - i18n("Finished.") : i18n("Writing data..."); - emit progress( number, message ); - } - else - kdDebug() << "Error while parsing gift-add-collection.pl output" << endl; - } - } - } -} - -#include "indexer.moc" diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h deleted file mode 100644 index 72755081..00000000 --- a/kmrml/kmrml/kcontrol/indexer.h +++ /dev/null @@ -1,69 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef INDEXER_H -#define INDEXER_H - -#include <tqobject.h> - -#include <kmrml_config.h> - -class TDEProcess; -class KProcIO; - -namespace KMrmlConfig -{ - class Indexer : public TQObject - { - Q_OBJECT - - - public: - Indexer( const KMrml::Config *config, - TQObject *parent = 0L, const char *name = 0 ); - ~Indexer(); - - void startIndexing( const TQStringList& dirs ); - void stop(); - - signals: - void progress( int percent, const TQString& text ); - void finished( int returnCode ); - - - private slots: - void slotCanRead( KProcIO * ); - void processFinished( TDEProcess * ); - - private: - void processNext(); - - KProcIO *m_process; - const KMrml::Config *m_config; - - uint m_dirCount; - TQStringList m_dirs; - TQString m_currentDir; - - }; - - -} - - -#endif // INDEXER_H diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp deleted file mode 100644 index cc816c0b..00000000 --- a/kmrml/kmrml/kcontrol/indextest.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "indexer.h" -#include <kmrml_config.h> -#include "indextest.moc" - -#include <tdeapplication.h> -#include <tdeconfig.h> -#include <tdeglobal.h> - -using namespace KMrmlConfig; - -IndexTest::IndexTest() -{ - KMrml::Config *config = new KMrml::Config( TDEGlobal::config() ); - Indexer *indexer = new Indexer( *config, this ); - connect( indexer, TQT_SIGNAL( finished( bool )), TQT_SLOT( slotFinished( bool ))); - connect( indexer, TQT_SIGNAL( progress( int, const TQString& )), - TQT_SLOT( slotProgress( int, const TQString& ))); - - indexer->startIndexing( "/home/gis/testcoll" ); -} - -IndexTest::~IndexTest() -{ - -} - -void IndexTest::slotFinished( bool success ) -{ - tqDebug("##### FINISHED: %i", success ); -} - -void IndexTest::slotProgress( int percent, const TQString& message ) -{ - tqDebug("--- progress: %i: %s", percent, message.latin1()); -} - -int main( int argc, char **argv ) -{ - TDEApplication app( argc, argv, "indextest" ); - IndexTest *test = new IndexTest(); - - return app.exec(); -} diff --git a/kmrml/kmrml/kcontrol/indextest.h b/kmrml/kmrml/kcontrol/indextest.h deleted file mode 100644 index 1071cdbd..00000000 --- a/kmrml/kmrml/kcontrol/indextest.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** -** $Id$ -** -** Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> -** -****************************************************************************/ - -#ifndef INDEXTEST_H -#define INDEXTEST_H - -class IndexTest : public TQObject -{ - Q_OBJECT - - -public: - IndexTest(); - ~IndexTest(); - -private slots: - void slotFinished( bool success ); - void slotProgress( int percent, const TQString& message ); - -}; - - -#endif // INDEXTEST_H diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp deleted file mode 100644 index e055a8bf..00000000 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqlabel.h> -#include <tqlayout.h> - -#include <tdeaboutdata.h> -#include <tdeapplication.h> -#include <kdebug.h> -#include <kdialog.h> -#include <tdeglobal.h> -#include <tdelocale.h> -#include <tdemessagebox.h> -#include <kgenericfactory.h> -#include <kstandarddirs.h> -#include <kurllabel.h> - -#include "kcmkmrml.h" -#include <dcopclient.h> - -#include "mainpage.h" -#include <version.h> - -using namespace KMrmlConfig; - -static const int COL_FILENAME = 1; - -typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") ) - -KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): - TDECModule(MrmlFactory::instance(), parent, name) -{ - TDEAboutData* ab = new TDEAboutData( - "kcmkmrml", - I18N_NOOP("KCMKMrml"), - KMRML_VERSION, - I18N_NOOP("Advanced Search Control Module"), - TDEAboutData::License_GPL, - I18N_NOOP( "Copyright 2002, Carsten Pfeiffer" ), - 0, - "http://devel-home.kde.org/~pfeiffer/kmrml/" ); - ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" ); - setAboutData( ab ); - - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); - m_mainPage = new MainPage( this, "main page" ); - - layout->addWidget( m_mainPage ); - - connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ))); - - checkGiftInstallation(); -} - -KCMKMrml::~KCMKMrml() -{ -} - -void KCMKMrml::checkGiftInstallation() -{ - TQString giftExe = TDEGlobal::dirs()->findExe( "gift" ); - TQString giftAddCollectionExe = TDEGlobal::dirs()->findExe( "gift-add-collection.pl" ); - - if ( giftExe.isEmpty() || giftAddCollectionExe.isEmpty() ) - { - TQString errorMessage = - i18n("Cannot find executables \"gift\" and/or \"gift-add-collection.pl\" in the PATH.\n" - "Please install the \"GNU Image Finding Tool\"."); - KMessageBox::error( this, errorMessage ); - m_mainPage->hide(); - TQLabel *errorLabel = new TQLabel( errorMessage, this ); - errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); - KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); - urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) ); - TQLayout *l = layout(); - l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - l->add( errorLabel ); - l->add( urlLabel ); - l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - errorLabel->show(); - } - else - load(); -} - -void KCMKMrml::defaults() -{ - if (KMessageBox::warningContinueCancel(this, - i18n("Do you really want the configuration to be reset " - "to the defaults?"), i18n("Reset Configuration"), KStdGuiItem::cont()) - != KMessageBox::Continue) - return; - - m_mainPage->resetDefaults(); - - emit changed( true ); -} - -void KCMKMrml::load() -{ - m_mainPage->load(); - - emit changed( true ); -} - -void KCMKMrml::save() -{ - m_mainPage->save(); - - emit changed( false ); -} - -TQString KCMKMrml::quickHelp() const -{ - return i18n("<h1>Image Index</h1>" - "TDE can make use of the GNU Image Finding Tool (GIFT) to " - "perform queries based not just on filenames, but on " - "file content." - "<p>For example, you can search for an image by giving an example " - "image that looks similar to the one you are looking for.</p>" - "<p>For this to work, your image directories need to be " - "indexed by, for example, the GIFT server.</p>" - "<p>Here you can configure the servers (you can also query " - "remote servers) and the directories to index.</p>" - ); -} - -#include "kcmkmrml.moc" diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.desktop b/kmrml/kmrml/kcontrol/kcmkmrml.desktop deleted file mode 100644 index 1e90be30..00000000 --- a/kmrml/kmrml/kcontrol/kcmkmrml.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Exec=tdecmshell kcmkmrml -Icon=folder_image -Type=Application - -X-TDE-ModuleType=Library -X-TDE-Library=kmrml - -Name=Image Index - -Comment=Configuration for using the GNU Image Finding Tool - -Keywords=Images;Search;Query;Find;Gift;kmrml;mrml;CBIR; - -Categories=Qt;TDE;Settings;X-TDE-settings-system; diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h deleted file mode 100644 index 02778d0a..00000000 --- a/kmrml/kmrml/kcontrol/kcmkmrml.h +++ /dev/null @@ -1,53 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KCMKMRML_H -#define KCMKMRML_H - -#include <tdecmodule.h> - -class TDEAboutData; -class KURLRequester; - -namespace KMrmlConfig -{ - class MainPage; - - class KCMKMrml : public TDECModule - { - Q_OBJECT - - - public: - KCMKMrml(TQWidget *parent, const char *name, const TQStringList &); - virtual ~KCMKMrml(); - - virtual void defaults(); - virtual void load(); - virtual void save(); - virtual TQString quickHelp() const; - - private: - void checkGiftInstallation(); - - MainPage *m_mainPage; - }; - -} - -#endif diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp deleted file mode 100644 index 9ddd6bf9..00000000 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ /dev/null @@ -1,501 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqcheckbox.h> -#include <tqlabel.h> -#include <tqsizepolicy.h> -#include <tqtooltip.h> -#include <tqwidget.h> -#include <tqvgroupbox.h> - -#include <kcombobox.h> -#include <kdialog.h> -#include <keditlistbox.h> -#include <tdeglobalsettings.h> -#include <klineedit.h> -#include <tdelocale.h> -#include <tdemessagebox.h> -#include <knuminput.h> -#include <kprogress.h> -#include <kurlrequester.h> - -#include <tdeversion.h> -#include <kdebug.h> -#include <tdeio/slaveconfig.h> -#include <tdeio/ioslave_defaults.h> // MAX_PORT_VALUE - -#include "serverconfigwidget.h" -#include "mainpage.h" -#include "indexer.h" -#include "indexcleaner.h" - -#include <limits.h> -#include <string.h> - -using namespace KMrmlConfig; - - -MainPage::MainPage( TQWidget *parent, const char *name ) - : TQVBox( parent, name ), - m_indexer( 0L ), - m_indexCleaner( 0L ), - m_progressDialog( 0L ), - m_performIndexing( false ), - m_locked( false ) -{ - m_config = new KMrml::Config(); - setSpacing( KDialog::spacingHint() ); - - TQVGroupBox *gBox = new TQVGroupBox( i18n("Indexing Server Configuration"), - this ); - m_serverWidget = new ServerConfigWidget( gBox, "server config widget" ); - TQString tip = i18n("Hostname of the Indexing Server"); - TQToolTip::add( m_serverWidget->m_hostLabel, tip ); - TQToolTip::add( m_serverWidget->m_hostCombo, tip ); - - m_serverWidget->m_portInput->setRange( 0, MAX_PORT_VALUE ); - -#if TDE_VERSION >= 306 - KURLRequester *requester = new KURLRequester( this, "dir requester" ); - requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - requester->setURL( TDEGlobalSettings::documentPath() ); - connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( slotRequesterClicked( KURLRequester * ))); - - m_listBox = new KEditListBox( i18n("Folders to Be Indexed" ), - requester->customEditor(), this, "listbox", - false, - KEditListBox::Add | KEditListBox::Remove ); -#else - m_listBox = new KEditListBox( i18n("Folders to Be Indexed" ), - this, "listbox", false, - KEditListBox::Add | KEditListBox::Remove ); -#endif - - connect( m_listBox, TQT_SIGNAL( changed() ), TQT_SLOT( slotDirectoriesChanged() )); - connect( m_serverWidget->m_hostCombo, TQT_SIGNAL( textChanged(const TQString&)), - TQT_SLOT( slotHostChanged() )); - connect( m_serverWidget->m_portInput, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotPortChanged( int ) )); - connect ( m_serverWidget->m_useAuth, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotUseAuthChanged( bool ) )); - connect( m_serverWidget->m_userEdit, TQT_SIGNAL( textChanged( const TQString&)), - TQT_SLOT( slotUserChanged( const TQString& ) )); - connect( m_serverWidget->m_passEdit, TQT_SIGNAL( textChanged( const TQString&)), - TQT_SLOT( slotPassChanged( const TQString& ) )); - - connect( m_serverWidget->m_addButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddClicked() )); - connect( m_serverWidget->m_removeButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotRemoveClicked() )); - - connect( m_serverWidget->m_hostCombo, TQT_SIGNAL( activated( const TQString& )), - TQT_SLOT( slotHostActivated( const TQString& ))); - connect( m_serverWidget->m_hostCombo, TQT_SIGNAL( returnPressed() ), - TQT_SLOT( slotAddClicked() )); - - connect( m_serverWidget->m_autoPort, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotAutoPortChanged( bool ) )); - - m_serverWidget->m_hostCombo->setTrapReturnKey( true ); - m_serverWidget->m_hostCombo->setFocus(); -} - -MainPage::~MainPage() -{ - delete m_config; -} - -void MainPage::resetDefaults() -{ - blockSignals( true ); - - initFromSettings( KMrml::ServerSettings::defaults() ); - - m_serverWidget->m_hostCombo->clear(); - m_serverWidget->m_hostCombo->insertItem( m_settings.host ); - - m_listBox->clear(); - - // slotHostChanged(); not necessary, will be called by TQt signals - slotUseAuthChanged( m_serverWidget->m_useAuth->isChecked() ); - - blockSignals( false ); -} - -void MainPage::load() -{ - blockSignals( true ); - - initFromSettings( m_config->defaultSettings() ); - - m_serverWidget->m_hostCombo->clear(); - m_serverWidget->m_hostCombo->insertStringList( m_config->hosts() ); - m_serverWidget->m_hostCombo->setCurrentItem( m_settings.host ); - - m_listBox->clear(); - m_listBox->insertStringList( m_config->indexableDirectories() ); - - // slotHostChanged(); not necessary, will be called by TQt signals - slotUseAuthChanged( m_serverWidget->m_useAuth->isChecked() ); - - blockSignals( false ); -} - -void MainPage::save() -{ - m_config->addSettings( m_settings ); - m_config->setDefaultHost( m_settings.host ); - - TQStringList indexDirs = m_listBox->items(); - TQStringList oldIndexDirs = m_config->indexableDirectories(); - TQStringList removedDirs = difference( oldIndexDirs, indexDirs ); - - m_config->setIndexableDirectories( indexDirs ); - if ( indexDirs.isEmpty() ) - KMessageBox::information( this, - i18n("You did not specify any folders to " - "be indexed. This means you will be " - "unable to perform queries on your " - "computer."), - "kcmkmrml_no_directories_specified" ); - - if ( m_config->sync() ) - TDEIO::SlaveConfig::self()->reset(); - - processIndexDirs( removedDirs ); -} - -TQStringList MainPage::difference( const TQStringList& oldIndexDirs, - const TQStringList& newIndexDirs ) const -{ - TQStringList result; - - TQString slash = TQString::fromLatin1("/"); - TQStringList::ConstIterator oldIt = oldIndexDirs.begin(); - TQString oldDir, newDir; - - for ( ; oldIt != oldIndexDirs.end(); oldIt++ ) - { - bool removed = true; - oldDir = *oldIt; - - while ( oldDir.endsWith( slash ) ) // remove slashes - oldDir.remove( oldDir.length() - 1, 1 ); - - TQStringList::ConstIterator newIt = newIndexDirs.begin(); - for ( ; newIt != newIndexDirs.end(); newIt++ ) - { - newDir = *newIt; - while ( newDir.endsWith( slash ) ) // remove slashes - newDir.remove( newDir.length() - 1, 1 ); - - if ( oldDir == newDir ) - { - removed = false; - break; - } - } - - if ( removed ) - result.append( *oldIt ); // not oldDir -- maybe gift needs slashes - } - - return result; -} - -void MainPage::initFromSettings( const KMrml::ServerSettings& settings ) -{ - m_settings = settings; - - m_locked = true; - - m_serverWidget->m_portInput->setValue( settings.configuredPort ); - m_serverWidget->m_autoPort->setChecked( settings.autoPort ); - m_serverWidget->m_useAuth->setChecked( settings.useAuth ); - m_serverWidget->m_userEdit->setText( settings.user ); - m_serverWidget->m_passEdit->setText( settings.pass ); - - m_locked = false; -} - -void MainPage::slotHostActivated( const TQString& host ) -{ - // implicitly save the current settings when another host was chosen - m_config->addSettings( m_settings ); - - initFromSettings( m_config->settingsForHost( host ) ); -} - -void MainPage::slotHostChanged() -{ - TQString host = m_serverWidget->m_hostCombo->currentText(); - m_listBox->setEnabled( (host == "localhost") ); - - KMrml::ServerSettings settings = m_config->settingsForHost( host ); - enableWidgetsFor( settings ); -} - -void MainPage::slotUseAuthChanged( bool enable ) -{ - m_settings.useAuth = enable; - m_serverWidget->m_userEdit->setEnabled( enable ); - m_serverWidget->m_passEdit->setEnabled( enable ); - - if ( enable ) - m_serverWidget->m_userEdit->setFocus(); - - if ( !m_locked ) - changed(); -} - -void MainPage::slotUserChanged( const TQString& user ) -{ - if ( m_locked ) - return; - - m_settings.user = user; - changed(); -} - -void MainPage::slotPassChanged( const TQString& pass ) -{ - if ( m_locked ) - return; - - m_settings.pass = pass; - changed(); -} - -void MainPage::slotPortChanged( int port ) -{ - if ( m_locked ) - return; - - m_settings.configuredPort = (unsigned short int) port; - changed(); -} - -void MainPage::slotAutoPortChanged( bool on ) -{ - if ( m_locked ) - return; - - m_settings.autoPort = on; - m_serverWidget->m_portInput->setEnabled( !on ); - changed(); -} - -void MainPage::slotRequesterClicked( KURLRequester *requester ) -{ - static bool init = true; - if ( !init ) - return; - - init = false; - - requester->setCaption(i18n("Select Folder You Want to Index")); -} - -void MainPage::slotAddClicked() -{ - TQString host = m_serverWidget->m_hostCombo->currentText(); - m_settings.host = host; - - m_config->addSettings( m_settings ); - m_serverWidget->m_hostCombo->insertItem( host ); - m_serverWidget->m_hostCombo->setCurrentItem( host ); - - enableWidgetsFor( m_settings ); -} - -void MainPage::slotRemoveClicked() -{ - TQString host = m_serverWidget->m_hostCombo->currentText(); - if ( host.isEmpty() ) // should never happen - return; - - m_config->removeSettings( host ); - m_serverWidget->m_hostCombo->removeItem( m_serverWidget->m_hostCombo->currentItem() ); - m_serverWidget->m_hostCombo->setCurrentItem( 0 ); - - host = m_serverWidget->m_hostCombo->currentText(); - initFromSettings( m_config->settingsForHost( host ) ); -} - -void MainPage::enableWidgetsFor( const KMrml::ServerSettings& settings ) -{ - TQString host = settings.host; - bool enableWidgets = (m_config->hosts().findIndex( host ) > -1); - m_serverWidget->m_addButton->setEnabled(!enableWidgets && !host.isEmpty()); - m_serverWidget->m_removeButton->setEnabled( enableWidgets && - !host.isEmpty() && - host != "localhost" ); - - m_serverWidget->m_autoPort->setEnabled( host == "localhost" ); - bool portEnable = enableWidgets && (settings.autoPort || - !m_serverWidget->m_autoPort->isEnabled()); - m_serverWidget->m_portLabel->setEnabled( portEnable && !m_serverWidget->m_autoPort->isChecked()); - m_serverWidget->m_portInput->setEnabled( portEnable && !m_serverWidget->m_autoPort->isChecked()); - - m_serverWidget->m_useAuth->setEnabled( enableWidgets ); - m_serverWidget->m_userLabel->setEnabled( enableWidgets ); - m_serverWidget->m_passLabel->setEnabled( enableWidgets ); - m_serverWidget->m_userEdit->setEnabled( enableWidgets ); - m_serverWidget->m_passEdit->setEnabled( enableWidgets ); - - bool useAuth = m_serverWidget->m_useAuth->isChecked(); - m_serverWidget->m_userEdit->setEnabled( useAuth ); - m_serverWidget->m_passEdit->setEnabled( useAuth ); -} - -void MainPage::slotDirectoriesChanged() -{ - m_performIndexing = true; - changed(); -} - -void MainPage::processIndexDirs( const TQStringList& removeDirs ) -{ - // ### how to remove indexed directories? - if ( !m_performIndexing || - (removeDirs.isEmpty() && m_config->indexableDirectories().isEmpty()) ) - return; - - delete m_progressDialog; - delete m_indexCleaner; - m_indexCleaner = 0L; - delete m_indexer; - m_indexer = 0L; - - m_progressDialog = new KProgressDialog( this, "indexing dialog", - i18n("Removing old Index Files"), - i18n("Processing..."), - true ); - m_progressDialog->setAutoClose( false ); - m_progressDialog->setMinimumWidth( 300 ); - connect( m_progressDialog, TQT_SIGNAL( cancelClicked() ), - TQT_SLOT( slotCancelIndexing() )); - - // argh -- don't automatically show the dialog - m_progressDialog->setMinimumDuration( INT_MAX ); - - if ( !removeDirs.isEmpty() ) - { - m_indexCleaner = new IndexCleaner( removeDirs, m_config, TQT_TQOBJECT(this) ); - connect( m_indexCleaner, TQT_SIGNAL( advance( int ) ), - m_progressDialog->progressBar(), TQT_SLOT( advance( int ) )); - connect( m_indexCleaner, TQT_SIGNAL( finished() ), - TQT_SLOT( slotMaybeIndex() ) ); - m_indexCleaner->start(); - } - else - { - slotMaybeIndex(); - } - if ( m_progressDialog ) - m_progressDialog->exec(); -} - -void MainPage::slotMaybeIndex() -{ - delete m_indexCleaner; // Stop in the name of the law! - m_indexCleaner = 0L; - - m_progressDialog->setLabel( i18n("Finished.") ); - - if ( m_config->indexableDirectories().isEmpty() ) - return; - - if ( KMessageBox::questionYesNo( this, - i18n("The settings have been saved. Now, " - "the configured directories need to " - "be indexed. This may take a while. " - "Do you want to do this now?"), - i18n("Start Indexing Now?"), - i18n("Index"), i18n("Do Not Index"), - "ask_startIndexing" - ) != KMessageBox::Yes ) - return; - m_progressDialog->setCaption( i18n("Indexing Folders") ); - m_progressDialog->setLabel( i18n("Processing...") ); - m_progressDialog->progressBar()->setProgress( 0 ); - - // do the indexing - m_indexer = new Indexer( m_config, TQT_TQOBJECT(this), "Indexer" ); - connect( m_indexer, TQT_SIGNAL( progress( int, const TQString& )), - TQT_SLOT( slotIndexingProgress( int, const TQString& ) )); - connect( m_indexer, TQT_SIGNAL( finished( int )), - TQT_SLOT( slotIndexingFinished( int ) )); - m_indexer->startIndexing( m_config->indexableDirectories() ); -} - - -void MainPage::slotIndexingProgress( int percent, const TQString& message ) -{ - m_progressDialog->progressBar()->setValue( percent ); - m_progressDialog->setLabel( message ); -} - -void MainPage::slotIndexingFinished( int returnCode ) -{ - if ( returnCode != 0 ) - { - TQString syserr; - if ( returnCode == 127 ) - syserr = i18n("Is the \"GNU Image Finding Tool\" properly installed?"); - else - { - char *err = strerror( returnCode ); - if ( err ) - syserr = TQString::fromLocal8Bit( err ); - else - syserr = i18n("Unknown error: %1").arg( returnCode ); - } - - KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."), - syserr, i18n("Indexing Aborted") ); - } - else - m_performIndexing = false; - - delete m_indexer; - m_indexer = 0L; - if ( m_progressDialog ) - { - m_progressDialog->deleteLater(); - m_progressDialog = 0L; - } -} - -void MainPage::slotCancelIndexing() -{ - delete m_indexCleaner; - m_indexCleaner = 0L; - - delete m_indexer; - m_indexer = 0L; - if ( m_progressDialog ) - { - m_progressDialog->deleteLater(); - m_progressDialog = 0L; - } -} - - -#include "mainpage.moc" diff --git a/kmrml/kmrml/kcontrol/mainpage.h b/kmrml/kmrml/kcontrol/mainpage.h deleted file mode 100644 index 3b79da6d..00000000 --- a/kmrml/kmrml/kcontrol/mainpage.h +++ /dev/null @@ -1,110 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef MAINPAGE_H -#define MAINPAGE_H - -#include <tqvbox.h> - -#include <kmrml_config.h> - -class TQCheckBox; -class KComboBox; -class KEditListBox; -class KIntNumInput; -class KLineEdit; -class KProgressDialog; -class KURLRequester; - -namespace KMrml -{ - class Config; -} - -class ServerConfigWidget; - -namespace KMrmlConfig -{ - class Indexer; - class IndexCleaner; - - class MainPage : public TQVBox - { - Q_OBJECT - - - public: - MainPage( TQWidget *parent, const char *name ); - ~MainPage(); - - void resetDefaults(); - void load(); - void save(); - - signals: - void changed( bool ); - - private slots: - void changed() { emit changed( true ); } - void slotRequesterClicked( KURLRequester * ); - void slotHostChanged(); - void slotUseAuthChanged( bool ); - void slotUserChanged( const TQString& ); - void slotPassChanged( const TQString& ); - void slotPortChanged( int ); - void slotAutoPortChanged( bool ); - - void slotAddClicked(); - void slotRemoveClicked(); - - void slotHostActivated( const TQString& ); - - void slotDirectoriesChanged(); - - void slotMaybeIndex(); - void slotIndexingProgress( int percent, const TQString& message ); - void slotIndexingFinished( int returnCode ); - void slotCancelIndexing(); - - - private: - void enableWidgetsFor( const KMrml::ServerSettings& settings ); - void initFromSettings( const KMrml::ServerSettings& settings ); - - void processIndexDirs( const TQStringList& removedDirs ); - - TQStringList difference( const TQStringList& oldIndexDirs, - const TQStringList& newIndexDirs ) const; - - ServerConfigWidget *m_serverWidget; - KEditListBox *m_listBox; - KMrml::Config *m_config; - KMrmlConfig::Indexer *m_indexer; - KMrmlConfig::IndexCleaner *m_indexCleaner; - KProgressDialog *m_progressDialog; - - KMrml::ServerSettings m_settings; - bool m_performIndexing; - bool m_locked; - }; - -} - - - -#endif // MAINPAGE_H diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui deleted file mode 100644 index e9b76309..00000000 --- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui +++ /dev/null @@ -1,277 +0,0 @@ -<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> -<class>ServerConfigWidget</class> -<widget class="TQWidget"> - <property name="name"> - <cstring>ServerConfigWidget</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>455</width> - <height>321</height> - </rect> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="TQLayoutWidget"> - <property name="name"> - <cstring>Layout7</cstring> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="TQLayoutWidget" row="0" column="1"> - <property name="name"> - <cstring>Layout4</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="KComboBox"> - <property name="name"> - <cstring>m_hostCombo</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - <widget class="TQPushButton"> - <property name="name"> - <cstring>m_addButton</cstring> - </property> - <property name="text"> - <string>&Add</string> - </property> - </widget> - <widget class="TQPushButton"> - <property name="name"> - <cstring>m_removeButton</cstring> - </property> - <property name="text"> - <string>&Remove</string> - </property> - </widget> - </hbox> - </widget> - <widget class="TQLayoutWidget" row="1" column="1"> - <property name="name"> - <cstring>Layout6</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="KIntSpinBox"> - <property name="name"> - <cstring>m_portInput</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" stdset="0"> - <string>TCP/IP Port Number of the Indexing Server</string> - </property> - </widget> - <widget class="TQCheckBox"> - <property name="name"> - <cstring>m_autoPort</cstring> - </property> - <property name="text"> - <string>Au&to</string> - </property> - <property name="toolTip" stdset="0"> - <string>Tries to automatically determine the port. This works only for local servers.</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>Spacer3</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <widget class="TQLabel" row="0" column="0"> - <property name="name"> - <cstring>m_hostLabel</cstring> - </property> - <property name="text"> - <string>Ho&stname:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>m_hostCombo</cstring> - </property> - </widget> - <widget class="TQLabel" row="1" column="0"> - <property name="name"> - <cstring>m_portLabel</cstring> - </property> - <property name="text"> - <string>P&ort:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>m_portInput</cstring> - </property> - </widget> - </grid> - </widget> - <widget class="TQCheckBox"> - <property name="name"> - <cstring>m_useAuth</cstring> - </property> - <property name="text"> - <string>Per&form authentication</string> - </property> - </widget> - <widget class="TQLayoutWidget"> - <property name="name"> - <cstring>Layout12</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <spacer> - <property name="name"> - <cstring>Spacer1</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Fixed</enum> - </property> - <property name="sizeHint"> - <size> - <width>16</width> - <height>16</height> - </size> - </property> - </spacer> - <widget class="TQLayoutWidget"> - <property name="name"> - <cstring>Layout6</cstring> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="TQLabel" row="0" column="0"> - <property name="name"> - <cstring>m_userLabel</cstring> - </property> - <property name="text"> - <string>&Username:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>m_userEdit</cstring> - </property> - </widget> - <widget class="KLineEdit" row="1" column="1"> - <property name="name"> - <cstring>m_passEdit</cstring> - </property> - </widget> - <widget class="TQLabel" row="1" column="0"> - <property name="name"> - <cstring>m_passLabel</cstring> - </property> - <property name="text"> - <string>&Password:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>m_passEdit</cstring> - </property> - </widget> - <widget class="KLineEdit" row="0" column="1"> - <property name="name"> - <cstring>m_userEdit</cstring> - </property> - </widget> - </grid> - </widget> - </hbox> - </widget> - </vbox> -</widget> -<tabstops> - <tabstop>m_hostCombo</tabstop> - <tabstop>m_addButton</tabstop> - <tabstop>m_removeButton</tabstop> - <tabstop>m_portInput</tabstop> - <tabstop>m_useAuth</tabstop> - <tabstop>m_userEdit</tabstop> - <tabstop>m_passEdit</tabstop> -</tabstops> -<layoutdefaults spacing="6" margin="11"/> -<includes> - <include location="global" impldecl="in implementation">kcombobox.h</include> - <include location="global" impldecl="in implementation">klineedit.h</include> - <include location="global" impldecl="in implementation">knuminput.h</include> -</includes> -</UI> diff --git a/kmrml/kmrml/lib/CMakeLists.txt b/kmrml/kmrml/lib/CMakeLists.txt deleted file mode 100644 index fb51a3ac..00000000 --- a/kmrml/kmrml/lib/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -################################################# -# -# (C) 2010-2011 Calvin Morrison -# mutantturkey@gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - - -#### kcmkgamma (static) ######################### - -tde_add_library( kmrmlstuff STATIC_PIC AUTOMOC - SOURCES - kmrml_config.cpp mrml_shared.cpp - mrml_utils.cpp watcher_stub.cpp -) diff --git a/kmrml/kmrml/lib/Makefile.am b/kmrml/kmrml/lib/Makefile.am deleted file mode 100644 index 1f6ec6ac..00000000 --- a/kmrml/kmrml/lib/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -noinst_LTLIBRARIES = libkmrmlstuff.la -libkmrmlstuff_la_SOURCES = kmrml_config.cpp mrml_shared.cpp mrml_utils.cpp\ -watcher_stub.cpp -noinst_HEADERS = kmrml_config.h mrml_shared.h mrml_utils.h watcher_stub.h - -METASOURCES = AUTO - -libkmrmlstuff_la_LDFLAGS = $(all_libraries) -no-undefined -libkmrmlstuff_la_LIBADD = $(LIB_TDECORE) - -INCLUDES = -I$(top_srcdir) $(all_includes) diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp deleted file mode 100644 index 9f5872b9..00000000 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ /dev/null @@ -1,339 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqdir.h> -#include <tqfile.h> -#include <tqtextcodec.h> - -#include <tdeconfig.h> -#include <kdebug.h> -#include <tdeglobal.h> -#include <kprocess.h> -#include <kstandarddirs.h> - -#include "kmrml_config.h" - -#include <tdeversion.h> -#if TDE_VERSION < 307 - #define QUOTE( x ) x -#else - #define QUOTE( x ) TDEProcess::quote( x ) -#endif - -using namespace KMrml; - -// #define DEFAULT_ADDCOLLECTION_CMD "gift-add-collection.pl --thumbnail-dir=%t --local-encoding %d" -#define DEFAULT_ADDCOLLECTION_CMD "gift-add-collection.pl --gift-home=%h --thumbnail-dir=%t --local-encoding=%e %d" -#define DEFAULT_REMOVECOLLECTION_CMD "gift-add-collection.pl --gift-home=%h --local-encoding=%e --remove-collection %d" - -#define DEFAULT_MRMLD_CMD "gift --port %p --datadir %d" -#define DEFAULT_MRMLD_CMD_AUTOPORT "gift --datadir %d" - -#define CONFIG_GROUP "MRML Settings" -#define DEFAULT_HOST "localhost" -#define DEFAULT_USER "kmrml" -#define DEFAULT_PASS "none" -#define DEFAULT_AUTH false -#define DEFAULT_AUTOPORT true -const int DEFAULT_PORT = 12789; - -Config::Config() -{ - m_ownConfig = new TDEConfig( "tdeio_mrmlrc", false, false ); - m_config = m_ownConfig; - - init(); -} - -Config::Config( TDEConfig *config ) - : m_config( config ), - m_ownConfig( 0L ) -{ - init(); -} - -Config::~Config() -{ - delete m_ownConfig; -} - -void Config::init() -{ - m_config->setGroup( CONFIG_GROUP ); - m_defaultHost = m_config->readEntry( "Default Host" ); - if ( m_defaultHost.isEmpty() ) - m_defaultHost = DEFAULT_HOST; - - m_hostList = m_config->readListEntry( "Host List" ); - if ( m_hostList.isEmpty() ) - m_hostList.append( DEFAULT_HOST ); - - m_serverStartedIndividually = - m_config->readBoolEntry( "ServerStartedIndividually", false ); -} - -bool Config::sync() -{ - bool notifySlaves = m_config->isDirty(); - m_config->sync(); - return notifySlaves; - - // This moved to kcontrol/MainPage::save() so we don't have to link against - // TDEIO and need a full TDEApplication instance to work (so that the tiny - // mrmlsearch binary can also use this class) - // tell the ioslaves about the new configuration -// if ( notifySlaves ) -// TDEIO::SlaveConfig::self()->reset(); -} - -void Config::setDefaultHost( const TQString& host ) -{ - m_defaultHost = host.isEmpty() ? - TQString::fromLatin1(DEFAULT_HOST) : host; - - m_config->setGroup( CONFIG_GROUP ); - m_config->writeEntry( "Default Host", m_defaultHost ); -} - -ServerSettings Config::settingsForLocalHost() const -{ - return settingsForHost( "localhost" ); -} - -ServerSettings Config::settingsForHost( const TQString& host ) const -{ - TDEConfigGroup config( m_config, settingsGroup( host ) ); - ServerSettings settings; - - settings.host = host; - settings.configuredPort = config.readUnsignedNumEntry( "Port", - DEFAULT_PORT ); - settings.autoPort = (host == "localhost") && - config.readBoolEntry("Automatically determine Port", - DEFAULT_AUTOPORT ); - settings.user = config.readEntry( "Username", DEFAULT_USER ); - settings.pass = config.readEntry( "Password", DEFAULT_PASS ); - settings.useAuth = config.readBoolEntry( "Perform Authentication", - DEFAULT_AUTH ); - - return settings; -} - -void Config::addSettings( const ServerSettings& settings ) -{ - TQString host = settings.host; - if ( m_hostList.find( host ) == m_hostList.end() ) - m_hostList.append( host ); - - m_config->setGroup( CONFIG_GROUP ); - m_config->writeEntry( "Host List", m_hostList ); - - m_config->setGroup( settingsGroup( host ) ); - m_config->writeEntry( "Host", host ); - m_config->writeEntry( "Port", settings.configuredPort ); - m_config->writeEntry( "Automatically determine Port", settings.autoPort ); - m_config->writeEntry( "Username", settings.user ); - m_config->writeEntry( "Password", settings.pass ); - m_config->writeEntry( "Perform Authentication", settings.useAuth ); -} - -bool Config::removeSettings( const TQString& host ) -{ - bool success = m_config->deleteGroup( settingsGroup( host ) ); - if ( success ) - { - m_hostList.remove( host ); - m_config->setGroup( CONFIG_GROUP ); - } - - return success; -} - -TQStringList Config::indexableDirectories() const -{ - m_config->setGroup( CONFIG_GROUP ); - return m_config->readListEntry( "Indexable Directories" ); -} - -void Config::setIndexableDirectories( const TQStringList& dirs ) -{ - m_config->setGroup( CONFIG_GROUP ); - m_config->writeEntry( "Indexable Directories", dirs ); -} - -TQString Config::addCollectionCommandLine() const -{ - m_config->setGroup( CONFIG_GROUP ); - TQString cmd = m_config->readEntry( "AddCollection Commandline", - DEFAULT_ADDCOLLECTION_CMD ); - int index = cmd.find( "%h" ); - if ( index != -1 ) - cmd.replace( index, 2, QUOTE( mrmldDataDir() ) ); - - index = cmd.find( "%e" ); - if ( index != -1 ) - cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() ); - - return cmd; -} - -void Config::setAddCollectionCommandLine( const TQString& cmd ) -{ - m_config->setGroup( CONFIG_GROUP ); - m_config->writeEntry( "AddCollection Commandline", cmd ); -} - -TQString Config::removeCollectionCommandLine() const -{ - m_config->setGroup( CONFIG_GROUP ); - TQString cmd = m_config->readEntry( "RemoveCollection Commandline", - DEFAULT_REMOVECOLLECTION_CMD ); - int index = cmd.find( "%h" ); - if ( index != -1 ) - cmd.replace( index, 2, QUOTE( mrmldDataDir() ) ); - - index = cmd.find( "%e" ); - if ( index != -1 ) - cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() ); - - return cmd; -} - -void Config::setRemoveCollectionCommandLine( const TQString& cmd ) -{ - m_config->setGroup( CONFIG_GROUP ); - m_config->writeEntry( "RemoveCollection Commandline", cmd ); -} - -TQString Config::mrmldCommandline() const -{ - ServerSettings settings = settingsForLocalHost(); - - m_config->setGroup( CONFIG_GROUP ); - TQString cmd = m_config->readEntry( "MrmmlDaemon Commandline", - settings.autoPort ? - DEFAULT_MRMLD_CMD_AUTOPORT : - DEFAULT_MRMLD_CMD ); - - // add data directory and port to the commandline - int index = cmd.find( "%p" ); - if ( index != -1 ) - { - TQString port = settings.autoPort ? - TQString() : TQString::number( settings.configuredPort ); - cmd.replace( index, 2, port ); - } - index = cmd.find( "%d" ); - if ( index != -1 ) - { - cmd.replace( index, 2, QUOTE( mrmldDataDir() ) ); - } - - tqDebug("***** commandline: %s", cmd.latin1()); - - return cmd; -} - -TQString Config::mrmldDataDir() -{ - TQString dir = TDEGlobal::dirs()->saveLocation( "data", - "kmrml/mrmld-data/" ); - if ( dir.isEmpty() ) // fallback - dir = TQDir::homeDirPath() + "/"; - - return dir; -} - -void Config::setMrmldCommandLine( const TQString& cmd ) -{ - m_config->setGroup( CONFIG_GROUP ); - m_config->writeEntry( "MrmmlDaemon Commandline", cmd ); -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -ServerSettings::ServerSettings() - : configuredPort( 0 ), - autoPort( true ), - useAuth( false ) -{ -} - -ServerSettings::ServerSettings( const TQString& host, unsigned short int port, - bool autoPort, bool useAuth, - const TQString& user, const TQString& pass ) -{ - this->host = host; - this->configuredPort = port; - this->autoPort = autoPort; - this->useAuth = useAuth; - this->user = user; - this->pass = pass; -} - -// static -ServerSettings ServerSettings::defaults() -{ - return ServerSettings( DEFAULT_HOST, DEFAULT_PORT, - (!strcmp(DEFAULT_HOST, "localhost") && DEFAULT_PORT), - DEFAULT_AUTH, DEFAULT_USER, DEFAULT_PASS ); -} - -KURL ServerSettings::getUrl() const -{ - KURL url; - url.setProtocol( "mrml" ); - url.setHost( host ); - if ( !autoPort ) - url.setPort( configuredPort ); - - if ( useAuth && user.isEmpty() ) - { - url.setUser( user ); - url.setPass( pass ); - } - - return url; -} - -unsigned short int ServerSettings::port() const -{ - if ( autoPort ) - { - TQString portsFile = Config::mrmldDataDir() + "gift-port.txt"; - TQFile file( portsFile ); - if ( file.open( IO_ReadOnly ) ) - { - TQString line; - (void) file.readLine( line, 6 ); -// tqDebug("**** read: %s", line.latin1()); - - file.close(); - - bool ok; - unsigned short int p = line.toUShort( &ok ); - if ( ok ) - return p; - } - else - kdWarning() << "Can't open \"" << portsFile << "\" to automatically determine the gift port" << endl; - } - - return configuredPort; -} diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h deleted file mode 100644 index 9bb435cf..00000000 --- a/kmrml/kmrml/lib/kmrml_config.h +++ /dev/null @@ -1,123 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KMRML_CONFIG_H -#define KMRML_CONFIG_H - -class TDEConfig; - -#include <tqstringlist.h> -#include <kurl.h> - -namespace KMrml -{ - class ServerSettings - { - public: - ServerSettings(); - ServerSettings(const TQString& host, unsigned short int port, - bool autoPort, bool useAuth, const - TQString& user, const TQString& pass); - - // does NOT set the port in the KURL object, if autoPort is selected - // tdeio_mrml is going to determine itself (via ServerSettings::port()). - // This deuglifies the mrml:/ url a bit (no port is shown) - KURL getUrl() const; - - TQString host; - TQString user; - TQString pass; - unsigned short int configuredPort; - bool autoPort :1; // only possible with host == localhost - bool useAuth :1; - - static ServerSettings defaults(); - - // returns configuredPort or the automatically determined port, - // depending on the value of autoPort - unsigned short int port() const; - }; - - class Config - { - public: - Config(); - Config( TDEConfig *config ); // does not take ownership of TDEConfig - ~Config(); - - bool sync(); - - ServerSettings defaultSettings() const - { - return settingsForHost( m_defaultHost ); - } - - ServerSettings settingsForLocalHost() const; - ServerSettings settingsForHost( const TQString& host ) const; - - void setDefaultHost( const TQString& host ); - - /** - * Indexed by the hostname -- ensures there are no dupes - */ - void addSettings( const ServerSettings& settings ); - - bool removeSettings( const TQString& host ); - - TQStringList hosts() const { return m_hostList; } - - /** - * The list of indexable directories -- only applicable to "localhost" - */ - TQStringList indexableDirectories() const; - void setIndexableDirectories( const TQStringList& dirs ); - - TQString addCollectionCommandLine() const; - void setAddCollectionCommandLine( const TQString& cmd ); - - TQString removeCollectionCommandLine() const; - void setRemoveCollectionCommandLine( const TQString& cmd ); - - void setMrmldCommandLine( const TQString& cmd ); - TQString mrmldCommandline() const; - - // e.g. Wolfgang needs this :) - bool serverStartedIndividually() const { - return m_serverStartedIndividually; - } - - static TQString mrmldDataDir(); - - private: - void init(); - - TQString settingsGroup( const TQString& host ) const - { - return TQString::fromLatin1( "SettingsFor: " ).append( host ); - } - - bool m_serverStartedIndividually; - TQString m_defaultHost; - TQStringList m_hostList; - - TDEConfig *m_config; - TDEConfig *m_ownConfig; - }; -} - -#endif // KMRML_CONFIG_H diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp deleted file mode 100644 index be653f58..00000000 --- a/kmrml/kmrml/lib/mrml_shared.cpp +++ /dev/null @@ -1,235 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "mrml_shared.h" - -// mrml stuff -const TQString * MrmlShared::m_sessionId = 0L; -const TQString * MrmlShared::m_transactionId = 0L; -const TQString * MrmlShared::m_algorithm = 0L; -const TQString * MrmlShared::m_algorithmId = 0L; -const TQString * MrmlShared::m_algorithmName = 0L; -const TQString * MrmlShared::m_algorithmList = 0L; -const TQString * MrmlShared::m_algorithmType = 0L; -const TQString * MrmlShared::m_collectionId = 0L; -const TQString * MrmlShared::m_collectionList = 0L; -const TQString * MrmlShared::m_collection = 0L; -const TQString * MrmlShared::m_collectionName = 0L; -const TQString * MrmlShared::m_queryParadigm = 0L; -const TQString * MrmlShared::m_queryParadigmList = 0L; -const TQString * MrmlShared::m_configureSession = 0L; - -const TQString * MrmlShared::m_propertySheet = 0L; -const TQString * MrmlShared::m_propertySheetId = 0L; -const TQString * MrmlShared::m_propertySheetType = 0L; -const TQString * MrmlShared::m_sendName = 0L; -const TQString * MrmlShared::m_sendType = 0L; -const TQString * MrmlShared::m_sendValue = 0L; -const TQString * MrmlShared::m_maxSubsetSize = 0L; -const TQString * MrmlShared::m_minSubsetSize = 0L; -const TQString * MrmlShared::m_caption = 0L; -const TQString * MrmlShared::m_from = 0L; -const TQString * MrmlShared::m_to = 0L; -const TQString * MrmlShared::m_step = 0L; -const TQString * MrmlShared::m_sendBooleanInverted = 0L; - -const TQString * MrmlShared::m_element = 0L; -const TQString * MrmlShared::m_attribute = 0L; -const TQString * MrmlShared::m_attributeName = 0L; -const TQString * MrmlShared::m_attributeValue = 0L; -const TQString * MrmlShared::m_children = 0L; -const TQString * MrmlShared::m_none = 0L; - -const TQString * MrmlShared::m_multiSet = 0L; -const TQString * MrmlShared::m_subset = 0L; -const TQString * MrmlShared::m_setElement = 0L; -const TQString * MrmlShared::m_boolean = 0L; -const TQString * MrmlShared::m_numeric = 0L; -const TQString * MrmlShared::m_textual = 0L; -const TQString * MrmlShared::m_panel = 0L; -const TQString * MrmlShared::m_clone = 0L; -const TQString * MrmlShared::m_reference = 0L; - -const TQString * MrmlShared::m_visibility = 0L; -const TQString * MrmlShared::m_visible = 0L; -const TQString * MrmlShared::m_invisible = 0L; -const TQString * MrmlShared::m_popup = 0L; -// const TQString * MrmlShared::m_ = 0L; - -// meta-data -const TQString * MrmlShared::m_mrml_data = 0L; - -// tdeio_mrml tasks -const TQString * MrmlShared::m_tdeio_task = 0L; -const TQString * MrmlShared::m_tdeio_initialize = 0L; -const TQString * MrmlShared::m_tdeio_startQuery = 0L; - - -int MrmlShared::s_references = 0; - -void MrmlShared::ref() -{ - if ( s_references == 0 ) - init(); - - s_references++; -} - -bool MrmlShared::deref() -{ - if ( s_references > 0 ) - s_references--; - - if ( s_references == 0 ) - { - // ### delete all strings here... - - return true; - } - - return false; -} - -void MrmlShared::init() -{ - m_sessionId = new TQString ( "session-id" ) ; - m_transactionId = new TQString ( "transaction-id" ) ; - m_algorithm = new TQString ( "algorithm" ) ; - m_algorithmId = new TQString ( "algorithm-id" ) ; - m_algorithmName = new TQString ( "algorithm-name" ) ; - m_algorithmList = new TQString ( "algorithm-list" ) ; - m_algorithmType = new TQString ( "algorithm-type" ) ; - m_collectionId = new TQString ( "collection-id" ) ; - m_collectionList = new TQString ( "collection-list" ) ; - m_collection = new TQString ( "collection" ) ; - m_collectionName = new TQString ( "collection-name" ) ; - m_queryParadigm = new TQString ( "query-paradigm" ) ; - m_queryParadigmList = new TQString ( "query-paradigm-list" ) ; - m_configureSession = new TQString ( "configure-session" ) ; - - m_propertySheet = new TQString ( "property-sheet" ) ; - m_propertySheetId = new TQString ( "property-sheet-id" ) ; - m_propertySheetType = new TQString ( "property-sheet-type" ) ; - m_sendName = new TQString ( "send-name" ) ; - m_sendType = new TQString ( "send-type" ) ; - m_sendValue = new TQString ( "send-value" ) ; - m_maxSubsetSize = new TQString ( "maxsubsetsize" ) ; - m_minSubsetSize = new TQString ( "minsubsetsize" ) ; - m_caption = new TQString ( "caption" ) ; - m_from = new TQString ( "from" ) ; - m_to = new TQString ( "to" ) ; - m_step = new TQString ( "step" ) ; - m_sendBooleanInverted = new TQString ( "send-boolean-inverted" ) ; - - m_element = new TQString ( "element" ) ; - m_attribute = new TQString ( "attribute" ) ; - m_attributeName = new TQString ( "attribute-name" ) ; - m_attributeValue = new TQString ( "attribute-value" ) ; - m_children = new TQString ( "children" ) ; - m_none = new TQString ( "none" ) ; - - m_multiSet = new TQString ( "multi-set" ) ; - m_subset = new TQString ( "subset" ) ; - m_setElement = new TQString ( "set-element" ) ; - m_boolean = new TQString ( "boolean" ) ; - m_numeric = new TQString ( "numeric" ) ; - m_textual = new TQString ( "textual" ) ; - m_panel = new TQString ( "panel" ) ; - m_clone = new TQString ( "clone" ) ; - m_reference = new TQString ( "reference" ) ; - - m_visibility = new TQString ( "visibility" ) ; - m_visible = new TQString ( "visible" ) ; - m_invisible = new TQString ( "invisible" ) ; - m_popup = new TQString ( "popup" ) ; -// m_ = new TQString ( "" ) ; - -// meta-data - m_mrml_data = new TQString ( "mrml_data" ) ; - -// tdeio_mrml tasks - m_tdeio_task = new TQString ( "tdeio_task" ) ; - m_tdeio_initialize = new TQString ( "tdeio_initialize" ) ; - m_tdeio_startQuery = new TQString ( "tdeio_startQuery" ) ; -} - -void MrmlShared::cleanup() -{ - delete m_sessionId; - delete m_transactionId; - delete m_algorithm; - delete m_algorithmId; - delete m_algorithmName; - delete m_algorithmList; - delete m_algorithmType; - delete m_collectionId; - delete m_collectionList; - delete m_collection; - delete m_collectionName; - delete m_queryParadigm; - delete m_queryParadigmList; - delete m_configureSession; - - // property sheet stuff - delete m_propertySheet; - delete m_propertySheetId; - delete m_propertySheetType; - delete m_sendName; - delete m_sendType; - delete m_sendValue; - delete m_maxSubsetSize; - delete m_minSubsetSize; - delete m_caption; - delete m_from; - delete m_to; - delete m_step; - delete m_sendBooleanInverted; - - delete m_multiSet; - delete m_subset; - delete m_setElement; - delete m_boolean; - delete m_numeric; - delete m_textual; - delete m_panel; - delete m_clone; - delete m_reference; - - delete m_element; - delete m_attribute; - delete m_attributeName; - delete m_attributeValue; - delete m_children; - delete m_none; - - delete m_visibility; - delete m_visible; - delete m_invisible; - delete m_popup; -// delete m_; - - // meta-data - delete m_mrml_data; - - // tdeio_mrml tasks - delete m_tdeio_task; - delete m_tdeio_initialize; - delete m_tdeio_startQuery; - -} diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h deleted file mode 100644 index 7f523bc0..00000000 --- a/kmrml/kmrml/lib/mrml_shared.h +++ /dev/null @@ -1,166 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef SHARED_H -#define SHARED_H - -// maybe use mrml_const.h from libMRML, unfortunately not installed -// by gift 0.1.6pre2 - -#include <tqshared.h> -#include <tqstring.h> - -class MrmlShared -{ -public: -// attribute/element names for mrml - static void ref(); - static bool deref(); - - static const TQString& sessionId() { return *m_sessionId; } - static const TQString& transactionId() { return *m_transactionId; } - static const TQString& algorithm() { return *m_algorithm; } - static const TQString& algorithmId() { return *m_algorithmId; } - static const TQString& algorithmName() { return *m_algorithmName; } - static const TQString& algorithmList() { return *m_algorithmList; } - static const TQString& algorithmType() { return *m_algorithmType; } - static const TQString& collectionId() { return *m_collectionId; } - static const TQString& collectionList() { return *m_collectionList; } - static const TQString& collection() { return *m_collection; } - static const TQString& collectionName() { return *m_collectionName; } - static const TQString& queryParadigm() { return *m_queryParadigm; } - static const TQString& queryParadigmList() { return *m_queryParadigmList; } - static const TQString& configureSession() { return *m_configureSession; } - - // property sheet stuff - static const TQString& propertySheet() { return *m_propertySheet; } - static const TQString& propertySheetId() { return *m_propertySheetId; } - static const TQString& propertySheetType() { return *m_propertySheetType; } - static const TQString& sendName() { return *m_sendName; } - static const TQString& sendType() { return *m_sendType; } - static const TQString& sendValue() { return *m_sendValue; } - static const TQString& maxSubsetSize() { return *m_maxSubsetSize; } - static const TQString& minSubsetSize() { return *m_minSubsetSize; } - static const TQString& caption() { return *m_caption; } - static const TQString& from() { return *m_from; } - static const TQString& to() { return *m_to; } - static const TQString& step() { return *m_step; } - static const TQString& sendBooleanInverted() { return *m_sendBooleanInverted; } - - static const TQString& multiSet() { return *m_multiSet; } - static const TQString& subset() { return *m_subset; } - static const TQString& setElement() { return *m_setElement; } - static const TQString& boolean() { return *m_boolean; } - static const TQString& numeric() { return *m_numeric; } - static const TQString& textual() { return *m_textual; } - static const TQString& panel() { return *m_panel; } - static const TQString& clone() { return *m_clone; } - static const TQString& reference() { return *m_reference; } - - static const TQString& element() { return *m_element; } - static const TQString& attribute() { return *m_attribute; } - static const TQString& attributeName() { return *m_attributeName; } - static const TQString& attributeValue() { return *m_attributeValue; } - static const TQString& children() { return *m_children; } - static const TQString& none() { return *m_none; } - - static const TQString& visibility() { return *m_visibility; } - static const TQString& visible() { return *m_visible; } - static const TQString& invisible() { return *m_invisible; } - static const TQString& popup() { return *m_popup; } -// static const TQString& () { return *m_; } - - // meta-data - static const TQString& mrml_data() { return *m_mrml_data; } - - // tdeio_mrml tasks - static const TQString& tdeio_task() { return *m_tdeio_task; } - static const TQString& tdeio_initialize() { return *m_tdeio_initialize; } - static const TQString& tdeio_startQuery() { return *m_tdeio_startQuery; } - - -private: - static const TQString * m_sessionId; - static const TQString * m_transactionId; - static const TQString * m_algorithm; - static const TQString * m_algorithmId; - static const TQString * m_algorithmName; - static const TQString * m_algorithmList; - static const TQString * m_algorithmType; - static const TQString * m_collectionId; - static const TQString * m_collectionList; - static const TQString * m_collection; - static const TQString * m_collectionName; - static const TQString * m_queryParadigm; - static const TQString * m_queryParadigmList; - static const TQString * m_configureSession; - - // property sheet stuff - static const TQString * m_propertySheet; - static const TQString * m_propertySheetId; - static const TQString * m_propertySheetType; - static const TQString * m_sendName; - static const TQString * m_sendType; - static const TQString * m_sendValue; - static const TQString * m_maxSubsetSize; - static const TQString * m_minSubsetSize; - static const TQString * m_caption; - static const TQString * m_from; - static const TQString * m_to; - static const TQString * m_step; - static const TQString * m_sendBooleanInverted; - - static const TQString * m_multiSet; - static const TQString * m_subset; - static const TQString * m_setElement; - static const TQString * m_boolean; - static const TQString * m_numeric; - static const TQString * m_textual; - static const TQString * m_panel; - static const TQString * m_clone; - static const TQString * m_reference; - - static const TQString * m_element; - static const TQString * m_attribute; - static const TQString * m_attributeName; - static const TQString * m_attributeValue; - static const TQString * m_children; - static const TQString * m_none; - - static const TQString * m_visibility; - static const TQString * m_visible; - static const TQString * m_invisible; - static const TQString * m_popup; -// static const TQString * m_; - - // meta-data - static const TQString * m_mrml_data; - - // tdeio_mrml tasks - static const TQString * m_tdeio_task; - static const TQString * m_tdeio_initialize; - static const TQString * m_tdeio_startQuery; - -private: - static void cleanup(); - static void init(); - - static int s_references; -}; - -#endif // SHARED_H diff --git a/kmrml/kmrml/lib/mrml_utils.cpp b/kmrml/kmrml/lib/mrml_utils.cpp deleted file mode 100644 index 314bbc7b..00000000 --- a/kmrml/kmrml/lib/mrml_utils.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <dcopclient.h> -#include <tdeapplication.h> -#include <kprocess.h> -#include <kstaticdeleter.h> - -#include "watcher_stub.h" - -#include "mrml_utils.h" - -// after 100 of no use, terminate the mrmld -#define TIMEOUT 100 -// how often to restart the mrmld in case of failure -#define NUM_RESTARTS 5 - -using namespace KMrml; - -KStaticDeleter<Util> utils_sd; - -Util *Util::s_self = 0L; - -Util::Util() -{ - // we need our own dcopclient, when used in tdeio_mrml - if ( !DCOPClient::mainClient() ) - { - DCOPClient::setMainClient( new DCOPClient() ); - if ( !DCOPClient::mainClient()->attach() ) - tqWarning( "tdeio_mrml: Can't attach to DCOP Server."); - } -} - -Util::~Util() -{ - if ( this == s_self ) - s_self = 0L; -} - -Util *Util::self() -{ - if ( !s_self ) - s_self = utils_sd.setObject( new Util() ); - return s_self; -} - -bool Util::requiresLocalServerFor( const KURL& url ) -{ - return url.host().isEmpty() || url.host() == "localhost"; -} - -bool Util::startLocalServer( const Config& config ) -{ - if ( config.serverStartedIndividually() ) - return true; - - DCOPClient *client = DCOPClient::mainClient(); - - // ### check if it's already running (add dcop method to Watcher) - Watcher_stub watcher( client, "kded", "daemonwatcher"); - return ( watcher.requireDaemon( client->appId(), - "mrmld", config.mrmldCommandline(), - TIMEOUT, NUM_RESTARTS ) - && watcher.ok() ); -} - -void Util::unrequireLocalServer() -{ - DCOPClient *client = DCOPClient::mainClient(); - - Watcher_stub watcher( client, "kded", "daemonwatcher"); - watcher.unrequireDaemon( client->appId(), "mrmld" ); -} diff --git a/kmrml/kmrml/lib/mrml_utils.h b/kmrml/kmrml/lib/mrml_utils.h deleted file mode 100644 index 5707b177..00000000 --- a/kmrml/kmrml/lib/mrml_utils.h +++ /dev/null @@ -1,50 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -#ifndef MRML_UTILS_H -#define MRML_UTILS_H - -#include <tqobject.h> - -#include <kurl.h> - -#include "kmrml_config.h" - -namespace KMrml -{ - class Util : public TQObject - { - public: - static Util * self(); - ~Util(); - - bool requiresLocalServerFor( const KURL& url ); - bool startLocalServer( const Config& config ); - void unrequireLocalServer(); -// bool isLocalServerRunning(); - - private: - static Util *s_self; - Util(); - }; - - -} - -#endif // MRML_UTILS_H diff --git a/kmrml/kmrml/lib/version.h b/kmrml/kmrml/lib/version.h deleted file mode 100644 index 5cf8e270..00000000 --- a/kmrml/kmrml/lib/version.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef VERSION_H -#define VERSION_H - -#define KMRML_VERSION "0.3.2" - -#endif // VERSION_H diff --git a/kmrml/kmrml/lib/watcher_stub.cpp b/kmrml/kmrml/lib/watcher_stub.cpp deleted file mode 100644 index d10dcbc7..00000000 --- a/kmrml/kmrml/lib/watcher_stub.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// -// Generated in ../server/ via dcopidl -- needs to be in the lib tho. -// Regenerate when necessary by uncommenting the watcher.stub in -// ../server/Makefile.am -// - -#include "watcher_stub.h" -#include <dcopclient.h> - -#include <kdatastream.h> - -namespace KMrml { - -Watcher_stub::Watcher_stub( const TQCString& app, const TQCString& obj ) - : DCOPStub( app, obj ) -{ -} - -Watcher_stub::Watcher_stub( DCOPClient* client, const TQCString& app, const TQCString& obj ) - : DCOPStub( client, app, obj ) -{ -} - -bool Watcher_stub::requireDaemon( const TQCString& arg0, const TQString& arg1, const TQString& arg2, uint arg3, int arg4 ) -{ - bool result; - if ( !dcopClient() ) { - setStatus( CallFailed ); - return false; - } - TQByteArray data, replyData; - TQCString replyType; - TQDataStream arg( data, IO_WriteOnly ); - arg << arg0; - arg << arg1; - arg << arg2; - arg << arg3; - arg << arg4; - if ( dcopClient()->call( app(), obj(), "requireDaemon(TQCString,TQString,TQString,uint,int)", data, replyType, replyData ) ) { - if ( replyType == "bool" ) { - TQDataStream _reply_stream( replyData, IO_ReadOnly ); - _reply_stream >> result; - setStatus( CallSucceeded ); - } else { - callFailed(); - } - } else { - callFailed(); - } - return result; -} - -void Watcher_stub::unrequireDaemon( const TQCString& arg0, const TQString& arg1 ) -{ - if ( !dcopClient() ) { - setStatus( CallFailed ); - return; - } - TQByteArray data, replyData; - TQCString replyType; - TQDataStream arg( data, IO_WriteOnly ); - arg << arg0; - arg << arg1; - if ( dcopClient()->call( app(), obj(), "unrequireDaemon(TQCString,TQString)", data, replyType, replyData ) ) { - setStatus( CallSucceeded ); - } else { - callFailed(); - } -} - -TQStringList Watcher_stub::runningDaemons() -{ - TQStringList result; - if ( !dcopClient() ) { - setStatus( CallFailed ); - return result; - } - TQByteArray data, replyData; - TQCString replyType; - if ( dcopClient()->call( app(), obj(), "runningDaemons()", data, replyType, replyData ) ) { - if ( replyType == TQSTRINGLIST_OBJECT_NAME_STRING ) { - TQDataStream _reply_stream( replyData, IO_ReadOnly ); - _reply_stream >> result; - setStatus( CallSucceeded ); - } else { - callFailed(); - } - } else { - callFailed(); - } - return result; -} - -} // namespace - diff --git a/kmrml/kmrml/lib/watcher_stub.h b/kmrml/kmrml/lib/watcher_stub.h deleted file mode 100644 index ce570908..00000000 --- a/kmrml/kmrml/lib/watcher_stub.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// Generated in ../server/ via dcopidl -- needs to be in the lib tho. -// Regenerate when necessary by uncommenting the watcher.stub in -// ../server/Makefile.am -// - -#ifndef __WATCHER_STUB__ -#define __WATCHER_STUB__ - -#include <dcopstub.h> -#include <tqdict.h> -#include <tqptrlist.h> -#include <tqmap.h> -#include <tqstrlist.h> -#include <tqstringlist.h> -#include <tqtimer.h> -#include <kdedmodule.h> -#include <kprocess.h> - -namespace KMrml { - -class Watcher_stub : public DCOPStub -{ -public: - Watcher_stub( const TQCString& app, const TQCString& id ); - Watcher_stub( DCOPClient* client, const TQCString& app, const TQCString& id ); - virtual bool requireDaemon( const TQCString& clientAppId, const TQString& daemonKey, const TQString& commandline, uint timeout, int numRestarts ); - virtual void unrequireDaemon( const TQCString& clientAppId, const TQString& daemonKey ); - virtual TQStringList runningDaemons(); -protected: - Watcher_stub() : DCOPStub( never_use ) {}; -}; - -} // namespace - -#endif diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp deleted file mode 100644 index 576513ed..00000000 --- a/kmrml/kmrml/loader.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <kstaticdeleter.h> -#include <tdeio/scheduler.h> - -#include "loader.h" - -Loader *Loader::s_self = 0L; - -KStaticDeleter<Loader> sd; - -Loader * Loader::self() -{ - if ( !s_self ) - s_self = sd.setObject( new Loader() ); - - return s_self; -} - -Loader::Loader() : TQObject() -{ -} - -Loader::~Loader() -{ - disconnect( this, TQT_SIGNAL( finished( const KURL&, const TQByteArray& ))); - - DownloadIterator it = m_downloads.begin(); - for ( ; it != m_downloads.end(); ++it ) { - it.key()->kill(); - delete it.data(); - } - - s_self = 0L; -} - -void Loader::requestDownload( const KURL& url ) -{ - DownloadIterator it = m_downloads.begin(); - for ( ; it != m_downloads.end(); ++it ) { - if ( it.key()->url() == url ) - return; - } - - TDEIO::TransferJob *job = TDEIO::get( url, false, false ); - TDEIO::Scheduler::scheduleJob(job); - - 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( slotResult( TDEIO::Job * ))); - - Download *d = new Download(); - m_downloads.insert( job, d ); -} - -void Loader::slotData( TDEIO::Job *job, const TQByteArray& data ) -{ - DownloadIterator it = m_downloads.find( static_cast<TDEIO::TransferJob*>(job) ); - if ( it != m_downloads.end() ) { - TQBuffer& buffer = it.data()->m_buffer; - if ( !buffer.isOpen() ) - buffer.open( IO_ReadWrite ); - if ( !buffer.isOpen() ) { - tqDebug("********* EEK, can't open buffer for thumbnail download!"); - return; - } - - buffer.writeBlock( data.data(), data.size() ); - } -} - -void Loader::slotResult( TDEIO::Job *job ) -{ - TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>( job ); - - DownloadIterator it = m_downloads.find( tjob ); - if ( it != m_downloads.end() ) { - Download *d = it.data(); - - if ( job->error() != 0 ) - emit finished( tjob->url(), TQByteArray() ); - else - emit finished( tjob->url(), d->m_buffer.buffer() ); - - delete d; - m_downloads.remove( it ); - } -} - - -// ### simultaneous downloads with multiple views? reference count downloads! -void Loader::removeDownload( const KURL& url ) -{ - DownloadIterator it = m_downloads.begin(); - for ( ; it != m_downloads.end(); ++it ) { - if ( it.key()->url() == url ) { - it.key()->kill(); - delete it.data(); - return; - } - } -} - -#include "loader.moc" diff --git a/kmrml/kmrml/loader.h b/kmrml/kmrml/loader.h deleted file mode 100644 index 4c8b8b21..00000000 --- a/kmrml/kmrml/loader.h +++ /dev/null @@ -1,73 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef LOADER_H -#define LOADER_H - -#include <tqbuffer.h> -#include <tqcstring.h> -#include <tqmap.h> -#include <tqobject.h> - -#include <tdeio/job.h> -#include <kurl.h> - -class Download -{ -public: - ~Download() { - if ( m_buffer.isOpen() ) - m_buffer.close(); - } - TQBuffer m_buffer; - // add context of MrmlPart for progress? -}; - - -class Loader : public TQObject -{ - friend class gcc_sucks; - Q_OBJECT - - -public: - static Loader *self(); - ~Loader(); - - void requestDownload( const KURL& url ); - - void removeDownload( const KURL& url ); - -signals: - void finished( const KURL& url, const TQByteArray& ); - -private slots: - void slotData( TDEIO::Job *, const TQByteArray& ); - void slotResult( TDEIO::Job * ); - -private: - Loader(); - - TQMap<TDEIO::TransferJob*,Download*> m_downloads; - typedef TQMapIterator<TDEIO::TransferJob*,Download*> DownloadIterator; - - static Loader *s_self; - -}; - -#endif // LOADER_H diff --git a/kmrml/kmrml/mrml-servicemenu.desktop b/kmrml/kmrml/mrml-servicemenu.desktop deleted file mode 100644 index 6a3fe7ff..00000000 --- a/kmrml/kmrml/mrml-servicemenu.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -X-TDE-ServiceTypes=image/png,image/jpeg,image/gif,image/tiff,image/bmp,image/x-xpm,image/x-xbm,image/x-png -Actions=search; - -[Desktop Action search] -Name=Search for Similar Images... -Icon=image-x-generic -Exec=mrmlsearch %U diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp deleted file mode 100644 index 8c49f009..00000000 --- a/kmrml/kmrml/mrml.cpp +++ /dev/null @@ -1,267 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" - -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <tdeconfig.h> -#include <kdebug.h> -#include <tdeglobal.h> -#include <kinstance.h> -#include <tdelocale.h> - -#include <mrml_utils.h> - -#include "mrml.h" - -extern "C" { - KDE_EXPORT int kdemain( int argc, char **argv ) - { - TDELocale::setMainCatalogue("tdelibs"); - TDEInstance instance( "tdeio_mrml" ); - TDEGlobal::locale()->insertCatalogue( "kmrml" ); - - kdDebug() << "Starting MRML " << getpid() << endl; - - if (argc != 4) - { - fprintf(stderr, "Usage: tdeio_mrml protocol domain-socket1 domain-socket2\n"); - exit(-1); - } - - Mrml slave(argv[2], argv[3]); - slave.dispatchLoop(); - - kdDebug() << "Done" << endl; - return 0; - } -} - -const int Mrml::bufsize = 8192; - -Mrml::Mrml( const TQCString& pool_socket, const TQCString& app_socket ) - : TCPSlaveBase( 12789, "mrml", pool_socket, app_socket ), - m_config( TDEGlobal::config() ) -{ - MrmlShared::ref(); -} - -Mrml::~Mrml() -{ - KMrml::Util::self()->unrequireLocalServer(); - - closeDescriptor(); - MrmlShared::deref(); -} - -bool Mrml::checkLocalServer( const KURL& url ) -{ - if ( KMrml::Util::self()->requiresLocalServerFor( url ) ) - { - if ( !KMrml::Util::self()->startLocalServer( m_config ) ) - return false; - } - - return true; -} - -void Mrml::get( const KURL& url ) -{ -// tqDebug("******* getting: %s (user: %s)", url.url().latin1(), url.user().latin1()); - - if ( !checkLocalServer( url ) ) - { - error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. " - "Aborting the query.") ); - return; - } - - int retriesLeft = 5; -tryConnect: - - TQCString utf8; - bool sendError = (retriesLeft <= 0); - - if ( connectToHost( url.host(), port(url), sendError ) ) - { -// tqDebug(" connected!"); - - TQString task = metaData( MrmlShared::tdeio_task() ); - - if ( task == MrmlShared::tdeio_initialize() ) { - startSession( url ); - } - - else if ( task == MrmlShared::tdeio_startQuery() ) { - TQString meta = metaData( MrmlShared::mrml_data() ); - if ( meta.isEmpty() ) { - closeDescriptor(); - error( TDEIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") ); - return; - } - - utf8 = meta.utf8(); - write( utf8, utf8.length() ); - - emitData( readAll() ); - } - - // no task metadata available, we're called from KonqRun or something - // like that. Emitting the mimetype seems to suffice for now. After - // that, MrmlPart is going to start and start the get() again. - else - { - mimeType( "text/mrml" ); - finished(); - } - - } - else - { - if ( retriesLeft-- >= 0 ) - { -#ifdef HAVE_USLEEP - usleep( 500 ); // wait a while for gift to start up -#endif - goto tryConnect; - return; - } - - error( TDEIO::ERR_COULD_NOT_CONNECT, - i18n("Could not connect to GIFT server.") ); - return; - } - - closeDescriptor(); - //data( TQByteArray() ); // send an empty TQByteArray to signal end of data. - finished(); -} - -// make sure we're connected when you call this! -TQCString Mrml::readAll() -{ - TQCString data; - - char buf[bufsize]; - ssize_t bytes = 0; - - while ( (bytes = read( buf, bufsize-1 )) > 0 ) { - buf[bytes] = '\0'; - data.append( buf ); - } - -// tqDebug("*** readAll()::: %i, %s", data.length(), data.data()); - return data; -} - -TQCString Mrml::loginString() -{ - return "<mrml><get-server-properties/></mrml>"; -} - -TQCString Mrml::getConfigurationString() -{ - return "<mrml><get-configuration/></mrml>"; -} - -// ### needed? -TQCString Mrml::getSessionsString( const TQString& username, - const TQString& password ) -{ - TQCString data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><mrml><get-sessions "; - if ( !username.isEmpty() ) { // ### pop up auth-dialog??? - data.append( "user-name=\""); - data.append( username.utf8() ); - data.append( "\""); - - if ( !password.isEmpty() ) { - data.append( " password=\""); - data.append( password.utf8() ); - data.append( "\"" ); - } - - } - data.append( "/></mrml>" ); - - return data; -} - - -bool Mrml::startSession( const KURL& url ) -{ - // might first ask for collections, and then for algorithms for the - // desired collection-id - - // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95 - // apparently makes problems in exception handling somehow. So we simply - // accept the server's session-id. - TQString msg = mrmlString( TQString() ).arg( - "<open-session user-name=\"%1\" session-name=\"tdeio_mrml session\" /> \ - <get-algorithms /> \ - <get-collections /> \ - </mrml>" ).arg( user( url )); - - TQCString utf8 = msg.utf8(); -// tqDebug(":::Writing: %s", utf8.data()); - write( utf8, utf8.length() ); - - emitData( readAll() ); - - return true; -} - -TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactionId ) -{ - TQString msg = - "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?> \ - <!DOCTYPE mrml SYSTEM \"http://isrpc85.epfl.ch/Charmer/code/mrml.dtd\"> \ - %1 \ - </mrml>"; - - if ( sessionId.isEmpty() ) // when we don't have one yet - return msg.arg( "<mrml>%1" ); - - if ( transactionId.isNull() ) - return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId ); - else - return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1") - .arg( sessionId ).arg( transactionId ); -} - -void Mrml::emitData( const TQCString& msg ) -{ - mimeType( "text/mrml" ); - data( msg ); - processedSize( msg.count() ); -} - -void Mrml::mimetype( const KURL& url ) -{ - if ( url.protocol() == "mrml" ) { - mimeType( "text/mrml" ); - finished(); - } - else - TDEIO::TCPSlaveBase::mimetype( url ); -} diff --git a/kmrml/kmrml/mrml.desktop b/kmrml/kmrml/mrml.desktop deleted file mode 100644 index 9a5dc67c..00000000 --- a/kmrml/kmrml/mrml.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Comment=Multimedia Retrieval Markup Language Document -Icon=text-html -Type=MimeType -MimeType=text/mrml -Patterns=*.mrml;*.MRML; -X-TDE-AutoEmbed=true diff --git a/kmrml/kmrml/mrml.h b/kmrml/kmrml/mrml.h deleted file mode 100644 index 2a39466f..00000000 --- a/kmrml/kmrml/mrml.h +++ /dev/null @@ -1,84 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef MRML_H -#define MRML_H - - -#include <tdeio/tcpslavebase.h> -#include <kurl.h> - -#include <kmrml_config.h> -#include "mrml_shared.h" - -class Mrml : public TDEIO::TCPSlaveBase -{ -public: - Mrml( const TQCString&, const TQCString& ); - ~Mrml(); - - virtual void get( const KURL& url ); - - virtual void mimetype( const KURL& url ); - -private: - TQCString readAll(); - void emitData( const TQCString& ); - - bool startSession( const KURL& url ); - - // helpers - inline TQString sessionId() { - return metaData( MrmlShared::sessionId() ); - } - - // misc - short int port( const KURL& url ) - { - return (url.port() != 0) ? - url.port() : - m_config.settingsForHost( url.host() ).port(); - } - - static TQString mrmlString( const TQString& sessionId, - const TQString& transactionId = TQString() ); - - static TQCString loginString(); - static TQCString getConfigurationString(); - static TQCString getSessionsString( const TQString& username, - const TQString& password ); - TQString user( const KURL& url ) { - return url.hasUser() ? - url.user() : m_config.defaultSettings().user; - } - TQString pass( const KURL& url ) { - return url.hasPass() ? - url.pass() : m_config.defaultSettings().pass; - } - - bool checkLocalServer( const KURL& url ); - - static const int bufsize; - TQString defaultUser; - TQString defaultPass; - - KMrml::Config m_config; - -}; - -#endif // MRML_H diff --git a/kmrml/kmrml/mrml.protocol b/kmrml/kmrml/mrml.protocol deleted file mode 100644 index 42412eb6..00000000 --- a/kmrml/kmrml/mrml.protocol +++ /dev/null @@ -1,10 +0,0 @@ -[Protocol] -exec=tdeio_mrml -protocol=mrml -input=none -output=filesystem -reading=true -defaultMimetype=text/mrml -determineMimetypeFromExtension=false -Icon=image-x-generic -X-DocPath=tdeioslave/mrml/index.html diff --git a/kmrml/kmrml/mrml_creator.cpp b/kmrml/kmrml/mrml_creator.cpp deleted file mode 100644 index fe4a14c6..00000000 --- a/kmrml/kmrml/mrml_creator.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "mrml_creator.h" - -TQDomElement MrmlCreator::createMrml( TQDomDocument& doc, - const TQString& sessionId, - const TQString& transactionId ) -{ - TQDomElement mrml = doc.createElement( "mrml" ); - doc.appendChild( mrml ); - mrml.setAttribute( MrmlShared::sessionId(), sessionId ); - if ( !transactionId.isNull() ) - mrml.setAttribute( MrmlShared::transactionId(), transactionId ); - - return mrml; -} - -TQDomElement MrmlCreator::configureSession( TQDomElement& mrml, - const KMrml::Algorithm& algo, - const TQString& sessionId ) -{ - TQDomDocument doc = mrml.ownerDocument(); - TQDomElement config = doc.createElement( MrmlShared::configureSession() ); - mrml.appendChild( config ); - config.setAttribute( MrmlShared::sessionId(), sessionId ); - algo.toElement( config ); - - return config; -} - -TQDomElement MrmlCreator::addQuery( TQDomElement& mrml, int resultSize ) -{ - TQDomElement query = mrml.ownerDocument().createElement("query-step"); - mrml.appendChild( query ); - // query.setAttribute( "query-step-id", "5" ); // ### - query.setAttribute( "result-size", TQString::number( resultSize )); - return query; -} - -TQDomElement MrmlCreator::addRelevanceList( TQDomElement& query ) -{ - TQDomElement elem = - query.ownerDocument().createElement("user-relevance-element-list"); - query.appendChild( elem ); - return elem; -} - -/** - * Creates a <user-relevance-element> with the given attributes set. - */ -void MrmlCreator::createRelevanceElement( TQDomDocument& doc, - TQDomElement& parent, - const TQString& url, - Relevance relevance ) -{ - TQDomElement element = doc.createElement( "user-relevance-element" ); - element.setAttribute( "image-location", url ); - element.setAttribute( "user-relevance", TQString::number( relevance ) ); - parent.appendChild( element ); -} diff --git a/kmrml/kmrml/mrml_creator.h b/kmrml/kmrml/mrml_creator.h deleted file mode 100644 index b1037558..00000000 --- a/kmrml/kmrml/mrml_creator.h +++ /dev/null @@ -1,49 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef MRML_CREATOR_H -#define MRML_CREATOR_H - -#include <tqdom.h> - -#include <kurl.h> - -#include "mrml_elements.h" -#include "mrml_shared.h" - -namespace MrmlCreator -{ - enum Relevance { Relevant = 1, Irrelevant = -1 }; - - TQDomElement createMrml( TQDomDocument& doc, - const TQString& sessionId, - const TQString& transactionId = TQString() ); - TQDomElement configureSession( TQDomElement& mrml, - const KMrml::Algorithm& algo, - const TQString& sessionId ); - TQDomElement addQuery( TQDomElement& mrml, int resultSize ); - TQDomElement addRelevanceList( TQDomElement& query ); - /** - * Creates a <user-relevance-element> with the given attributes set. - */ - void createRelevanceElement( TQDomDocument& doc, TQDomElement& parent, - const TQString& url, Relevance relevance ); - -} - -#endif // MRML_CREATOR_H diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp deleted file mode 100644 index 73bb5316..00000000 --- a/kmrml/kmrml/mrml_elements.cpp +++ /dev/null @@ -1,358 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "mrml_elements.h" -#include "mrml_shared.h" - -#include <kdatastream.h> - -#include <tqdom.h> - -using namespace KMrml; - -// -// MrmlElement is currently the baseclass for Algorithm and Collection. Both -// may have a single child-element <query-paradigm-list>, with a number of -// <query-paradigm> elements as children. -// - -MrmlElement::MrmlElement( const TQDomElement& elem ) -{ - TQValueList<TQDomElement> list = - KMrml::directChildElements( elem, MrmlShared::queryParadigmList() ); - - Q_ASSERT( list.count() < 2 ); // There can be only one. - - if ( list.count() ) - m_paradigms.initFromDOM( list.first() ); -} - - -void MrmlElement::setOtherAttributes( TQDomElement& elem ) const -{ - TQMapConstIterator<TQString,TQString> it = m_attributes.begin(); - for ( ; it != m_attributes.end(); ++it ) - { - elem.setAttribute( it.key(), it.data() ); - } -} - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -AlgorithmList AlgorithmList::algorithmsForCollection( const Collection& coll ) const -{ - AlgorithmList list; - - AlgorithmList::ConstIterator it = begin(); - for ( ; it != end(); ++it ) - { - Algorithm algo = *it; - if ( algo.paradigms().matches( coll.paradigms() ) ) - { - algo.setCollectionId( coll.id() ); - list.append( algo ); - } - } - - return list; -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -Collection::Collection( const TQDomElement& elem ) - : MrmlElement( elem ) -{ - TQDomNamedNodeMap attrs = elem.attributes(); - for ( uint i = 0; i < attrs.length(); i++ ) - { - TQDomAttr attribute = attrs.item( i ).toAttr(); - TQString name = attribute.name(); - - if ( name == MrmlShared::collectionName() ) - m_name = attribute.value(); - else if ( name == MrmlShared::collectionId() ) - m_id = attribute.value(); - - else // custom attributes - m_attributes.insert( name, attribute.value() ); - } -} - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -Algorithm::Algorithm( const TQDomElement& elem ) - : MrmlElement( elem ) -{ - TQDomNamedNodeMap attrs = elem.attributes(); - - for ( uint i = 0; i < attrs.length(); i++ ) - { - TQDomAttr attribute = attrs.item( i ).toAttr(); - TQString name = attribute.name(); - - if ( name == MrmlShared::algorithmName() ) - m_name = attribute.value(); - else if ( name == MrmlShared::algorithmId() ) - m_id = attribute.value(); - else if ( name == MrmlShared::algorithmType() ) - m_type = attribute.value(); - - // not really necessary - else if ( name == MrmlShared::collectionId() ) - m_collectionId = attribute.value(); - - else // custom attributes - m_attributes.insert( name, attribute.value() ); - } - - TQDomElement propsElem = firstChildElement(elem, MrmlShared::propertySheet()); - m_propertySheet.initFromDOM( propsElem ); - - tqDebug("############# new algorithm: name: %s, id: %s, type: %s", m_name.latin1(), m_id.latin1(), m_type.latin1()); -} - -Algorithm Algorithm::defaultAlgorithm() -{ - Algorithm algo; - algo.m_id = "adefault"; - algo.m_type = "adefault"; // ### not in the DTD - algo.m_name = "dummy"; - - return algo; -} - -TQDomElement Algorithm::toElement( TQDomElement& parent ) const -{ - TQDomDocument doc = parent.ownerDocument(); - TQDomElement algorithm = doc.createElement( MrmlShared::algorithm() ); - parent.appendChild( algorithm ); - setOtherAttributes( algorithm ); - - if ( !m_name.isEmpty() ) - algorithm.setAttribute( MrmlShared::algorithmName(), m_name ); - if ( !m_id.isEmpty() ) - algorithm.setAttribute( MrmlShared::algorithmId(), m_id ); - if ( !m_type.isEmpty() ) - algorithm.setAttribute( MrmlShared::algorithmType(), m_type ); - - if ( !m_collectionId.isEmpty() ) - algorithm.setAttribute( MrmlShared::collectionId(), m_collectionId ); - return algorithm; -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -QueryParadigm::QueryParadigm( const TQDomElement& elem ) -{ - TQDomNamedNodeMap attrs = elem.attributes(); - for ( uint i = 0; i < attrs.count(); i++ ) - { - TQDomAttr attr = attrs.item( i ).toAttr(); - m_attributes.insert( attr.name(), attr.value() ); - if ( attr.name() == "type" ) - m_type = attr.value(); - } -} - -bool QueryParadigm::matches( const QueryParadigm& other ) const -{ - return m_attributes.isEmpty() || other.m_attributes.isEmpty() || - equalMaps( m_attributes, other.m_attributes ); -} - -bool QueryParadigm::equalMaps( const TQMap<TQString,TQString> m1, - const TQMap<TQString,TQString> m2 ) -{ - if ( m1.count() != m2.count() ) - return false; - - TQMapConstIterator<TQString,TQString> it = m1.begin(); - for ( ; it != m1.end(); ++it ) - { - TQMapConstIterator<TQString,TQString> it2 = m2.find( it.key() ); - if ( it2 == m2.end() || it.data() != it2.data() ) - return false; - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -void QueryParadigmList::initFromDOM( const TQDomElement& elem ) -{ - clear(); - - TQValueList<TQDomElement> list = - KMrml::directChildElements( elem, MrmlShared::queryParadigm() ); - - TQValueListConstIterator<TQDomElement> it = list.begin(); - for ( ; it != list.end(); ++it ) - { - append( QueryParadigm( *it )); - } -} - -// two QueryParadigmLists match, when there is at least one pair of -// QueryParadigms that match (all attribute-value pairs are equal, or there -// are no attributes at all). -bool QueryParadigmList::matches( const QueryParadigmList& other ) const -{ - ConstIterator it = begin(); - - for ( ; it != end(); ++it ) - { - ConstIterator oit = other.begin(); - for ( ; oit != other.end(); ++oit ) - if ( (*it).matches( *oit ) ) - return true; - } - - return false; -} - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& parent, - const TQString& tagName ) -{ - TQValueList<TQDomElement> list; - - TQDomNode node = parent.firstChild(); - while ( !node.isNull() ) - { - if ( node.isElement() && node.nodeName() == tagName ) - list.append( node.toElement() ); - - node = node.nextSibling(); - } - - return list; -} - -TQDomElement KMrml::firstChildElement( const TQDomElement& parent, - const TQString& tagName ) -{ - TQDomNode node = parent.firstChild(); - while ( !node.isNull() ) - { - if ( node.isElement() && node.nodeName() == tagName ) - return node.toElement(); - - node = node.nextSibling(); - } - - return TQDomElement(); -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -TQDataStream& KMrml::operator<<( TQDataStream& stream, const QueryParadigm& ) -{ - - return stream; -} -TQDataStream& KMrml::operator>>( TQDataStream& stream, QueryParadigm& ) -{ - - return stream; -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, const QueryParadigmList& ) -{ - - return stream; -} -TQDataStream& KMrml::operator>>( TQDataStream& stream, QueryParadigmList& ) -{ - - return stream; -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, const MrmlElement& ) -{ - - return stream; -} -TQDataStream& KMrml::operator>>( TQDataStream& stream, MrmlElement& ) -{ - - return stream; -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, const Algorithm& ) -{ - - return stream; -} -TQDataStream& KMrml::operator>>( TQDataStream& stream, Algorithm& ) -{ - - return stream; -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, const Collection& ) -{ - - return stream; -} -TQDataStream& KMrml::operator>>( TQDataStream& stream, Collection& ) -{ - return stream; -} - -template <class t> TQDataStream& KMrml::operator<<( TQDataStream& stream, - const MrmlElementList<t>& ) -{ - - return stream; -} -template <class t> TQDataStream& KMrml::operator>>( TQDataStream& stream, - MrmlElementList<t>& ) -{ - - return stream; -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, const AlgorithmList& ) -{ - - return stream; -} -TQDataStream& KMrml::operator>>( TQDataStream& stream, AlgorithmList& ) -{ - - return stream; -} - diff --git a/kmrml/kmrml/mrml_elements.h b/kmrml/kmrml/mrml_elements.h deleted file mode 100644 index 02591fb4..00000000 --- a/kmrml/kmrml/mrml_elements.h +++ /dev/null @@ -1,255 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef MRML_ELEMENTS_H -#define MRML_ELEMENTS_H - -#include <tqdom.h> -#include <tqmap.h> -#include <tqstringlist.h> -#include <tqvaluelist.h> - -#include "mrml_shared.h" -#include "propertysheet.h" - -#include <assert.h> - -namespace KMrml -{ - class PropertySheet; - - class QueryParadigm - { - public: - QueryParadigm() {} - QueryParadigm( const TQDomElement& elem ); - bool matches( const QueryParadigm& other ) const; - TQString type() const { return m_type; } - -// bool operator== ( const QueryParadigm& p1, const QueryParadigm& p2 ) - - private: - TQString m_type; - TQMap<TQString,TQString> m_attributes; - - static bool equalMaps( const TQMap<TQString,TQString>, - const TQMap<TQString,TQString> ); - }; - - class QueryParadigmList : protected TQValueList<QueryParadigm> - { - public: - typedef TQValueListIterator<QueryParadigm> Iterator; - typedef TQValueListConstIterator<QueryParadigm> ConstIterator; - - void initFromDOM( const TQDomElement& elem ); - bool matches( const QueryParadigmList& other ) const; - }; - - class MrmlElement - { - public: - MrmlElement() {} - MrmlElement( const TQDomElement& elem ); - virtual ~MrmlElement() {} - - TQString id() const { return m_id; } - TQString name() const { return m_name; } - TQString attribute( const TQString& name ) const { return m_attributes[ name ]; } - QueryParadigmList paradigms() const { return m_paradigms; } - - - TQMapConstIterator<TQString,TQString> attributeIterator() const { - return m_attributes.begin(); - } - TQMapConstIterator<TQString,TQString> end() const { return m_attributes.end(); } - - bool isValid() const { return !m_name.isNull() && !m_id.isNull(); } - - protected: - TQString m_id; - TQString m_name; - QueryParadigmList m_paradigms; - TQMap<TQString,TQString> m_attributes; - - void setOtherAttributes( TQDomElement& elem ) const; - }; - - class Algorithm : public MrmlElement - { - public: - Algorithm() { m_collectionId = "adefault"; } - Algorithm( const TQDomElement& elem ); - TQString type() const { return m_type; } - - TQString collectionId() const - { - return m_collectionId; - } - void setCollectionId( const TQString& id ) - { - m_collectionId = id; - } - - TQDomElement toElement( TQDomElement& parent ) const; - const PropertySheet& propertySheet() const; - - static Algorithm defaultAlgorithm(); - - private: - TQString m_type; - PropertySheet m_propertySheet; - - TQString m_collectionId; - }; - - class Collection : public MrmlElement - { - public: - Collection() {} - Collection( const TQDomElement& elem ); - }; - - template <class t> class MrmlElementList : public TQValueList<t> - { - public: - typedef TQValueListIterator<t> Iterator; - typedef TQValueListConstIterator<t> ConstIterator; - - /** - * Creates an invalid element. - */ - MrmlElementList( const TQString& tagName ) : - TQValueList<t>(), - m_tagName( tagName ) {} - MrmlElementList( const TQDomElement& elem, const TQString& tagName ) : - TQValueList<t>(), - m_tagName( tagName ) - { - initFromDOM( elem ); - } - virtual ~MrmlElementList() {}; - - void initFromDOM( const TQDomElement& elem ) - { - assert( !m_tagName.isEmpty() ); - - TQValueList<t>::clear(); - - TQDomNodeList list = elem.elementsByTagName( m_tagName ); - for ( uint i = 0; i < list.length(); i++ ) - { - TQDomElement elem = list.item( i ).toElement(); - t item( elem ); - if ( item.isValid() ) - this->append( item ); - } - } - - t findByName( const TQString& name ) const - { - TQValueListConstIterator<t> it = TQValueList<t>::begin(); - for ( ; it != TQValueList<t>::end(); ++it ) - { - if ( (*it).name() == name ) - return *it; - } - - return t(); - } - - t findById( const TQString& id ) const - { - TQValueListConstIterator<t> it = TQValueList<t>::begin(); - for ( ; it != TQValueList<t>::end(); ++it ) - { - if ( (*it).id() == id ) - return *it; - } - - return MrmlElement(); - } - - TQStringList itemNames() const { - TQStringList list; - TQValueListConstIterator<t> it = TQValueList<t>::begin(); - for ( ; it != TQValueList<t>::end(); ++it ) - list.append( (*it).name() ); - - return list; - } - - void setItemName( const TQString& tagName ) { m_tagName = tagName; } - TQString tagName() const { return m_tagName; } - - private: - TQString m_tagName; - MrmlElementList(); - }; - - class AlgorithmList : public MrmlElementList<Algorithm> - { - public: - AlgorithmList() : - MrmlElementList<Algorithm>( MrmlShared::algorithm() ) - {} - - AlgorithmList algorithmsForCollection( const Collection& coll ) const; - }; - - class CollectionList : public MrmlElementList<Collection> - { - public: - CollectionList() : - MrmlElementList<Collection>( MrmlShared::collection() ) - {} - }; - - - TQValueList<TQDomElement> directChildElements( const TQDomElement& parent, - const TQString& tagName); - TQDomElement firstChildElement( const TQDomElement& parent, - const TQString& tagName ); - - - TQDataStream& operator<<( TQDataStream& stream, const QueryParadigm& ); - TQDataStream& operator>>( TQDataStream& stream, QueryParadigm& ); - - TQDataStream& operator<<( TQDataStream& stream, const QueryParadigmList& ); - TQDataStream& operator>>( TQDataStream& stream, QueryParadigmList& ); - - TQDataStream& operator<<( TQDataStream& stream, const MrmlElement& ); - TQDataStream& operator>>( TQDataStream& stream, MrmlElement& ); - - TQDataStream& operator<<( TQDataStream& stream, const Algorithm& ); - TQDataStream& operator>>( TQDataStream& stream, Algorithm& ); - - TQDataStream& operator<<( TQDataStream& stream, const Collection& ); - TQDataStream& operator>>( TQDataStream& stream, Collection& ); - - template <class t> TQDataStream& operator<<( TQDataStream&, - const MrmlElementList<t>& ); - template <class t> TQDataStream& operator>>( TQDataStream&, - MrmlElementList<t>& ); - - TQDataStream& operator<<( TQDataStream&, const AlgorithmList& ); - TQDataStream& operator>>( TQDataStream&, AlgorithmList& ); - -} - -#endif // MRML_ELEMENTS_H diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp deleted file mode 100644 index a35814cf..00000000 --- a/kmrml/kmrml/mrml_part.cpp +++ /dev/null @@ -1,857 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqcheckbox.h> -#include <tqcursor.h> -#include <tqdir.h> -#include <tqfile.h> -#include <tqgrid.h> -#include <tqhgroupbox.h> -#include <tqlabel.h> -#include <tqpushbutton.h> -#include <tqtooltip.h> -#include <tqvbox.h> - -#include <tdeaboutdata.h> -#include <tdeapplication.h> -#include <kcombobox.h> -#include <tdeconfig.h> -#include <kdatastream.h> -#include <kdebug.h> -#include <tdeglobal.h> -#include <tdelocale.h> -#include <kiconloader.h> -#include <kinstance.h> -#include <tdeio/job.h> -#include <tdeio/jobclasses.h> -#include <tdemessagebox.h> -#include <knuminput.h> -#include <kprotocolinfo.h> -#include <tdeparts/genericfactory.h> -#include <tdetempfile.h> - -#include <mrml_utils.h> - -#include "algorithmdialog.h" -#include "browser.h" -#include "collectioncombo.h" -#include "mrml_creator.h" -#include "mrml_elements.h" -#include "mrml_shared.h" -#include "mrml_view.h" -#include "mrml_part.h" -#include "version.h" - -using namespace KMrml; - -extern "C" -{ - void * init_libkmrmlpart() { - return new KMrml::PartFactory(); - } -} - -TDEInstance * PartFactory::s_instance = 0L; - -PartFactory::PartFactory() - : KParts::Factory() -{ - MrmlShared::ref(); -} - -PartFactory::~PartFactory() -{ - MrmlShared::deref(); - delete s_instance; - s_instance = 0L; -} - -TDEInstance * PartFactory::instance() -{ - if ( !s_instance ) { - s_instance = new TDEInstance( "kmrml" ); - TDEGlobal::locale()->insertCatalogue( "kmrml" ); - } - return s_instance; -} - -KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget, - const char *widgetName, - TQObject *parent, - const char *name, - const char *, - const TQStringList& args ) -{ - return new MrmlPart( parentWidget, widgetName, parent, name, args ); -} - - -// can't use this due to MrmlShared ref-counting -// typedef KParts::GenericFactory<KMrml::MrmlPart> PartFactory; -// K_EXPORT_COMPONENT_FACTORY( mrmlpart, PartFactory ) - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -uint MrmlPart::s_sessionId = 0; - -MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */, - TQObject *parent, const char *name, - const TQStringList& /* args */ ) - : KParts::ReadOnlyPart( parent, name ), - m_job( 0L ), - m_status( NeedCollection ) -{ - m_sessionId = TQString::number( s_sessionId++ ).prepend("kmrml_"); - - setName( "MRML Part" ); - m_browser = new Browser( this, "mrml browserextension"); - setInstance( PartFactory::instance(), true ); // do load plugins :) - TDEConfig *config = PartFactory::instance()->config(); - config->setGroup("MRML Settings"); - - TQVBox *box = new TQVBox( parentWidget, "main mrml box" ); - m_view = new MrmlView( box, "MrmlView" ); - connect( m_view, TQT_SIGNAL( activated( const KURL&, ButtonState )), - this, TQT_SLOT( slotActivated( const KURL&, ButtonState ))); - connect( m_view, TQT_SIGNAL( onItem( const KURL& )), - this, TQT_SLOT( slotSetStatusBar( const KURL& ))); - - m_panel = new TQHGroupBox( box, "buttons box" ); - - TQGrid *comboGrid = new TQGrid( 2, m_panel, "combo grid" ); - comboGrid->setSpacing( KDialog::spacingHint() ); - - (void) new TQLabel( i18n("Server to query:"), comboGrid ); - - m_hostCombo = new KComboBox( false, comboGrid, "host combo" ); - initHostCombo(); - connect( m_hostCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotHostComboActivated( const TQString& ))); - - (void) new TQLabel( i18n("Search in collection:"), comboGrid ); - m_collectionCombo = new CollectionCombo( comboGrid, "collection-combo" ); - // will be re-set in initCollections(), but we need to set it here to - // prevent crashes when the connection to the server fails - m_collectionCombo->setCollections( &m_collections ); - - m_algoButton = new TQPushButton( TQString(), m_panel ); - m_algoButton->setPixmap( SmallIcon("configure") ); - m_algoButton->setFixedSize( m_algoButton->sizeHint() ); - connect( m_algoButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotConfigureAlgorithm() )); - TQToolTip::add( m_algoButton, i18n("Configure algorithm") ); - - TQWidget *spacer = new TQWidget( m_panel ); - spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, - TQSizePolicy::Minimum ) ); - - int resultSize = config->readNumEntry( "Result-size", 20 ); - m_resultSizeInput = new KIntNumInput( resultSize, m_panel ); - m_resultSizeInput->setRange( 1, 100 ); - m_resultSizeInput->setLabel( i18n("Maximum result images:") ); - - TQVBox *tmp = new TQVBox( m_panel ); - m_random = new TQCheckBox( i18n("Random search"), tmp ); - - m_startButton = new TQPushButton( TQString(), tmp ); - connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() )); - setStatus( NeedCollection ); - - setWidget( box ); - - // setXMLFile( "mrml_part.rc" ); - - slotSetStatusBar( TQString() ); - - enableServerDependentWidgets( false ); -} - -MrmlPart::~MrmlPart() -{ - closeURL(); -} - -void MrmlPart::enableServerDependentWidgets( bool enable ) -{ - m_collectionCombo->setEnabled( enable ); - m_algoButton->setEnabled( enable && false ); // ### re-enable!!! -} - -void MrmlPart::initCollections( const TQDomElement& elem ) -{ - m_collections.initFromDOM( elem ); - - m_collectionCombo->setCollections( &m_collections ); - enableServerDependentWidgets( m_collectionCombo->count() > 0 ); - - if ( m_collectionCombo->count() == 0 ) - { - KMessageBox::information( widget(), - i18n("There is no image collection available\n" - "at %1.\n"), i18n("No Image Collection")); - setStatus( NeedCollection ); - } - else - m_collectionCombo->updateGeometry(); // adjust the entire grid -} - -void MrmlPart::initAlgorithms( const TQDomElement& elem ) -{ - m_algorithms.initFromDOM( elem ); -} - -// this is where we start! -bool MrmlPart::openURL( const KURL& url ) -{ - closeURL(); - - if ( url.protocol() != "mrml" || !url.isValid() ) { - tqWarning("MrmlPart::openURL: cannot handle url: %s", url.prettyURL().latin1()); - return false; // what to do with that? - } - - m_url = url; - TQString host = url.host().isEmpty() ? - TQString::fromLatin1("localhost") : url.host(); - - m_hostCombo->setCurrentItem( host ); - - // urls we need to download before starting the query - KURL::List downloadList; - - m_queryList.clear(); - TQString param = url.queryItem( "relevant" ); - TQStringList list = TQStringList::split( ';', param ); - - // we can only search by example on localhost - if ( host != "localhost" ) - { - if ( !list.isEmpty() ) - KMessageBox::sorry( m_view, - i18n("You can only search by example images " - "on a local indexing server."), - i18n("Only Local Servers Possible") ); - } - - else // localhost query - { - for( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) - { - KURL u; - if ( (*it).at(0) == '/' ) - u.setPath( *it ); - else - u = *it; - - if ( u.isValid() ) - { - if ( u.isLocalFile() ) - m_queryList.append( u ); - else - downloadList.append( u ); - } - } - - - // ### we need a real solution for this! - // gift refuses to start when no config file is available. - if ( !TQFile::exists( m_config.mrmldDataDir() + "/gift-config.mrml" ) ) - { - if ( KMessageBox::questionYesNo(0L, - i18n("There are no indexable folders " - "specified. Do you want to configure them " - "now?"), - i18n("Configuration Missing"), - i18n("Configure"), - i18n("Do Not Configure"), - "kmrml_ask_configure_gift" ) - == KMessageBox::Yes ) - { - TDEApplication::tdeinitExec( "tdecmshell", - TQString::fromLatin1("kcmkmrml")); - setStatus( NeedCollection ); - return false; - } - } - } - - - if ( !downloadList.isEmpty() ) - downloadReferenceFiles( downloadList ); - else - contactServer( m_url ); - - return true; -} - -void MrmlPart::contactServer( const KURL& url ) -{ - m_job = transferJob( url ); - - m_job->addMetaData( MrmlShared::tdeio_task(), MrmlShared::tdeio_initialize() ); - - TQString host = url.host().isEmpty() ? - TQString::fromLatin1("localhost") : url.host(); - - slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host )); -} - -// -// schedules a download all urls of downloadList (all remote and wellformed) -// No other downloads are running (closeURL() has been called before) -// -void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList ) -{ - assert( m_downloadJobs.isEmpty() ); - - KURL::List::ConstIterator it = downloadList.begin(); - for ( ; it != downloadList.end(); it++ ) - { - TQString extension; - int index = (*it).fileName().findRev( '.' ); - if ( index != -1 ) - extension = (*it).fileName().mid( index ); - - KTempFile tmpFile( TQString(), extension ); - if ( tmpFile.status() != 0 ) - { - kdWarning() << "Can't create temporary file, skipping: " << *it << endl; - - continue; - } - - m_tempFiles.append( tmpFile.name() ); - KURL destURL; - destURL.setPath( tmpFile.name() ); - - TDEIO::FileCopyJob *job = TDEIO::file_copy( *it, destURL, -1, - true /* overwrite tmpfile */ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDownloadResult( TDEIO::Job * ) )); - m_downloadJobs.append( job ); - // ### should this be only called for one job? - emit started( job ); - } - - if ( !m_downloadJobs.isEmpty() ) - slotSetStatusBar( i18n("Downloading reference files...") ); - else // probably never happens - contactServer( m_url ); -} - -bool MrmlPart::closeURL() -{ - m_view->stopDownloads(); - m_view->clear(); - - TQPtrListIterator<TDEIO::FileCopyJob> it( m_downloadJobs ); - for ( ; it.current(); ++it ) - it.current()->kill(); - m_downloadJobs.clear(); - - TQStringList::Iterator tit = m_tempFiles.begin(); - for ( ; tit != m_tempFiles.end(); ++tit ) - TQFile::remove( *tit ); - m_tempFiles.clear(); - - if ( m_job ) { - m_job->kill(); - m_job = 0L; - } - - setStatus( NeedCollection ); - - return true; -} - -TDEIO::TransferJob * MrmlPart::transferJob( const KURL& url ) -{ - TDEIO::TransferJob *job = TDEIO::get( url, true, false ); // reload, no gui - job->setAutoErrorHandlingEnabled( true, m_view ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * )), - TQT_SLOT( slotResult( TDEIO::Job * ))); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray& )), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray& ))); - -// ### -// connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString& )), -// TQT_SLOT( slotResult( TDEIO::Job *, const TQString& ))); - - job->setWindow( widget() ); - if ( !m_sessionId.isEmpty() ) - job->addMetaData( MrmlShared::sessionId(), m_sessionId ); - - emit started( job ); - emit setWindowCaption( url.prettyURL() ); - setStatus( InProgress ); - - return job; -} - -void MrmlPart::slotResult( TDEIO::Job *job ) -{ - if ( job == m_job ) - m_job = 0L; - - slotSetStatusBar( TQString() ); - - if ( !job->error() ) - emit completed(); - else { - emit canceled( job->errorString() ); -// tqDebug("*** canceled: error: %s", job->errorString().latin1()); - } - - - bool auto_random = m_view->isEmpty() && m_queryList.isEmpty(); - m_random->setChecked( auto_random ); - m_random->setEnabled( !auto_random ); - setStatus( job->error() ? NeedCollection : CanSearch ); - - if ( !job->error() && !m_queryList.isEmpty() ) { - // we have a connection and we got a list of relevant URLs to query for - // (via the URL) - - createQuery( &m_queryList ); - m_queryList.clear(); - } -} - -// ### when user cancels download, we crash :( -void MrmlPart::slotDownloadResult( TDEIO::Job *job ) -{ - assert( job->inherits( "TDEIO::FileCopyJob" ) ); - TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*>( job ); - - if ( !copyJob->error() ) - m_queryList.append( copyJob->destURL() ); - - m_downloadJobs.removeRef( copyJob ); - - if ( m_downloadJobs.isEmpty() ) // finally, we can start the query! - { - if ( m_queryList.isEmpty() ) // rather unlikely, but could happen ;) - { - kdWarning() << "Couldn't download the reference files. Will start a random search now" << endl; - } - - contactServer( m_url ); - } -} - -// mrml-document in the bytearray -void MrmlPart::slotData( TDEIO::Job *, const TQByteArray& data ) -{ - if ( data.isEmpty() ) - return; - - TQDomDocument doc; - doc.setContent( data ); - - if ( !doc.isNull() ) - parseMrml( doc ); -} - -void MrmlPart::parseMrml( TQDomDocument& doc ) -{ - TQDomNode mrml = doc.documentElement(); // root element - if ( !mrml.isNull() ) { - TQDomNode child = mrml.firstChild(); - for ( ; !child.isNull(); child = child.nextSibling() ) { -// tqDebug("**** HERE %s", child.nodeName().latin1()); - if ( child.isElement() ) { - TQDomElement elem = child.toElement(); - - TQString tagName = elem.tagName(); - - if ( tagName == "acknowledge-session-op" ) - m_sessionId = elem.attribute( MrmlShared::sessionId() ); - - else if ( tagName == MrmlShared::algorithmList() ) { - initAlgorithms( elem ); - } - - else if ( tagName == MrmlShared::collectionList() ) { - initCollections( elem ); - } - - else if ( tagName == "error" ) { - KMessageBox::information( widget(), - i18n("Server returned error:\n%1\n") - .arg( elem.attribute( "message" )), - i18n("Server Error") ); - } - - else if ( tagName == "query-result" ) { - m_view->clear(); - parseQueryResult( elem ); - } - - - } // child.isElement() - } - } // !mrml.isNull() -} - -void MrmlPart::parseQueryResult( TQDomElement& queryResult ) -{ - TQDomNode child = queryResult.firstChild(); - for ( ; !child.isNull(); child = child.nextSibling() ) { - if ( child.isElement() ) { - TQDomElement elem = child.toElement(); - TQString tagName = elem.tagName(); - - if ( tagName == "query-result-element-list" ) { - TQValueList<TQDomElement> list = - KMrml::directChildElements( elem, "query-result-element" ); - - TQValueListConstIterator<TQDomElement> it = list.begin(); - for ( ; it != list.end(); ++it ) - { - TQDomNamedNodeMap a = (*it).attributes(); - m_view->addItem( KURL( (*it).attribute("image-location" ) ), - KURL( (*it).attribute("thumbnail-location" ) ), - (*it).attribute("calculated-similarity")); - - } - } - - else if ( tagName == "query-result" ) - parseQueryResult( elem ); - } - } -} - -// creates/stops the query when the Start/Stop button was pressed -void MrmlPart::slotStartClicked() -{ - if ( m_status == InProgress ) - { - closeURL(); - m_startButton->setText( i18n("&Search" ) ); - return; - } - - // we need to reconnect, if the initial openURL() didn't work due to - // the gift not being available. - if ( m_status == NeedCollection ) - { - openURL( m_url ); - return; - } - - // cut off an eventual query and reference from the url, when the user - // performs a real query (otherwise restoreState() would restore and - // re-do the query from the URL - m_url.setRef( TQString() ); - m_url.setQuery( TQString() ); - - createQuery(); - m_browser->openURLNotify(); -} - -// -// relevantItems is 0L when called from slotStartClicked() and set to a -// non-empty list when called initially, from the commandline. -// -void MrmlPart::createQuery( const KURL::List * relevantItems ) -{ - if ( relevantItems && relevantItems->isEmpty() ) - return; - - TQDomDocument doc( "mrml" ); - TQDomElement mrml = MrmlCreator::createMrml( doc, - sessionId(), - transactionId() ); - - Collection coll = currentCollection(); -// tqDebug("** collection: name: %s, id: %s, valid: %i", coll.name().latin1(), coll.id().latin1(), coll.isValid()); - Algorithm algo = firstAlgorithmForCollection( coll ); -// tqDebug("** algorithm: name: %s, id: %s, valid: %i, collection-id: %s", algo.name().latin1(), algo.id().latin1(), algo.isValid(), algo.collectionId().latin1()); - - if ( algo.isValid() ) - { - MrmlCreator::configureSession( mrml, algo, sessionId() ); - } - - TQDomElement query = MrmlCreator::addQuery( mrml, - m_resultSizeInput->value() ); - if ( algo.isValid() ) - query.setAttribute( MrmlShared::algorithmId(), algo.id() ); - - // ### result-cutoff, query-type? - - // start-up with/without urls on the commandline via mrmlsearch - if ( relevantItems ) - { - TQDomElement elem = MrmlCreator::addRelevanceList( query ); - KURL::List::ConstIterator it = relevantItems->begin(); - for ( ; it != relevantItems->end(); ++it ) - MrmlCreator::createRelevanceElement( doc, elem, (*it).url(), - MrmlCreator::Relevant ); - } - - // get relevant items from the view? Only do this when relevantItems is 0L - else if ( !m_random->isChecked() ) - { - TQDomElement relevants = MrmlCreator::addRelevanceList( query ); - m_view->addRelevanceToQuery( doc, relevants ); - } - - performQuery( doc ); -} - -Collection MrmlPart::currentCollection() const -{ - return m_collectionCombo->current(); -} - -Algorithm MrmlPart::firstAlgorithmForCollection( const Collection& coll ) const -{ - if ( !m_algorithms.isEmpty() ) - { - AlgorithmList::ConstIterator it = m_algorithms.begin(); - for ( ; it != m_algorithms.end(); ++it ) - { - Algorithm algo = *it; - if ( algo.paradigms().matches( coll.paradigms() ) ) - { - algo.setCollectionId( coll.id() ); - return algo; - } - } - } - - tqDebug("#################### -> ADEFAULT!"); - Algorithm algo = Algorithm::defaultAlgorithm(); - algo.setCollectionId( coll.id() ); - return algo; -} - -// emits the given TQDomDocument for eventual plugins, checks after that -// if there are any relevance elements. If there are none, random search is -// implied and performed. -// finally, the search is actually started -void MrmlPart::performQuery( TQDomDocument& doc ) -{ - TQDomElement mrml = doc.documentElement(); - - emit aboutToStartQuery( doc ); // let plugins play with it :) - - // no items available? All "neutral"? -> random search - - TQDomElement queryStep = KMrml::firstChildElement( mrml, "query-step" ); - bool randomSearch = false; - - if ( !queryStep.isNull() ) - { - TQDomElement relevanceList = - KMrml::firstChildElement(queryStep, "user-relevance-element-list"); - TQValueList<TQDomElement> relevanceElements = - KMrml::directChildElements( relevanceList, - "user-relevance-element" ); - - randomSearch = relevanceElements.isEmpty(); - - if ( randomSearch ) - { - m_random->setChecked( true ); - m_random->setEnabled( false ); - queryStep.setAttribute("query-type", "at-random"); - - // remove user-relevance-element-list element for random search - relevanceList.parentNode().removeChild( relevanceList ); - } - } - else - { - KMessageBox::error( m_view, i18n("Error formulating the query. The " - "\"query-step\" element is missing."), - i18n("Query Error") ); - } - - m_job = transferJob( url() ); - slotSetStatusBar( randomSearch ? i18n("Random search...") : - i18n("Searching...") ); - m_job->addMetaData( MrmlShared::tdeio_task(), MrmlShared::tdeio_startQuery() ); - tqDebug("\n\nSending XML:\n%s", doc.toString().latin1()); - m_job->addMetaData( MrmlShared::mrml_data(), doc.toString() ); -} - -void MrmlPart::slotSetStatusBar( const TQString& text ) -{ - if ( text.isEmpty() ) - emit setStatusBarText( i18n("Ready.") ); - else - emit setStatusBarText( text ); -} - -void MrmlPart::slotActivated( const KURL& url, ButtonState button ) -{ - if ( button == Qt::LeftButton ) - emit m_browser->openURLRequest( url ); - else if ( button == Qt::MidButton ) - emit m_browser->createNewWindow( url ); - else if ( button == Qt::RightButton ) { - // enableExtensionActions( url, true ); // for now - emit m_browser->popupMenu( TQCursor::pos(), url, TQString() ); - // enableExtensionActions( url, false ); - } -} - -void MrmlPart::enableExtensionActions( const KURL& url, bool enable ) -{ - bool del = KProtocolInfo::supportsDeleting( url ); - emit m_browser->enableAction( "copy", enable ); - emit m_browser->enableAction( "trash", del ); - emit m_browser->enableAction( "del", del ); - emit m_browser->enableAction( "shred", url.isLocalFile() ); - emit m_browser->enableAction( "properties", enable ); - // emit m_browser->enableAction( "print", enable ); // ### later -} - - -// only implemented because it's abstract in the baseclass -bool MrmlPart::openFile() -{ - return false; -} - -void MrmlPart::slotConfigureAlgorithm() -{ - m_algoButton->setEnabled( false ); - - m_algoConfig = new AlgorithmDialog( m_algorithms, m_collections, - currentCollection(), - m_view, "algorithm configuration" ); - connect( m_algoConfig, TQT_SIGNAL( applyClicked() ), - TQT_SLOT( slotApplyAlgoConfig() )); - connect( m_algoConfig, TQT_SIGNAL( finished() ), - TQT_SLOT( slotAlgoConfigFinished() )); - - m_algoConfig->show(); -} - -void MrmlPart::slotApplyAlgoConfig() -{ - // ### -} - -void MrmlPart::slotAlgoConfigFinished() -{ - if ( m_algoConfig->result() == TQDialog::Accepted ) - slotApplyAlgoConfig(); - - m_algoButton->setEnabled( true ); - m_algoConfig->deleteLater(); - m_algoConfig = 0L; -} - -void MrmlPart::initHostCombo() -{ - m_hostCombo->clear(); - m_hostCombo->insertStringList( m_config.hosts() ); -} - -void MrmlPart::slotHostComboActivated( const TQString& host ) -{ - ServerSettings settings = m_config.settingsForHost( host ); - openURL( settings.getUrl() ); -} - -void MrmlPart::setStatus( Status status ) -{ - switch ( status ) - { - case NeedCollection: - m_startButton->setText( i18n("&Connect") ); - break; - case CanSearch: - m_startButton->setText( i18n("&Search") ); - break; - case InProgress: - m_startButton->setText( i18n("Sto&p") ); - break; - }; - - m_status = status; -} - - -void MrmlPart::saveState( TQDataStream& stream ) -{ - stream << url(); - stream << m_sessionId; - stream << m_queryList; -// stream << m_algorithms; -// stream << m_collections; - - stream << m_resultSizeInput->value(); - stream << *m_collectionCombo; - - m_view->saveState( stream ); -} - -void MrmlPart::restoreState( TQDataStream& stream ) -{ - KURL url; - stream >> url; - - stream >> m_sessionId; - stream >> m_queryList; -// stream >> m_algorithms; -// stream >> m_collections; - - int resultSize; - stream >> resultSize; - m_resultSizeInput->setValue( resultSize ); - stream >> *m_collectionCombo; - - m_view->restoreState( stream ); - -// openURL( url ); - m_url = url; -} - -TDEAboutData * MrmlPart::createAboutData() -{ - TDEAboutData *data = new TDEAboutData( - "kmrml", - I18N_NOOP("MRML Client for TDE"), - KMRML_VERSION, - I18N_NOOP("A tool to search for images by their content"), - TDEAboutData::License_GPL, - I18N_NOOP("(c) 2001-2002, Carsten Pfeiffer"), - 0, - I18N_NOOP("http://devel-home.kde.org/~pfeiffer/kmrml/") ); - - data->addAuthor( "Carsten Pfeiffer", - I18N_NOOP("Developer, Maintainer"), - "pfeiffer@kde.org" ); - data->addCredit( "Wolfgang Mller", - I18N_NOOP("Developer of the GIFT, Helping Hand") ); - - return data; -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -#include "mrml_part.moc" diff --git a/kmrml/kmrml/mrml_part.desktop b/kmrml/kmrml/mrml_part.desktop deleted file mode 100644 index 227bf207..00000000 --- a/kmrml/kmrml/mrml_part.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blahfoo -Name=MRML View -MimeType=text/mrml -X-TDE-ServiceTypes=KParts/ReadOnlyPart -X-TDE-Library=libkmrmlpart -#X-TDE-BrowserView-AllowAsDefault=true -#X-TDE-BrowserView-HideFromMenus=true -#X-TDE-BrowserView-Args=IconView -#X-TDE-BrowserView-ModeProperty=viewMode -#X-TDE-BrowserView-ModePropertyValue=IconView -Icon=view_icon -X-TDE-InitialPreference=10 diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h deleted file mode 100644 index 822ca042..00000000 --- a/kmrml/kmrml/mrml_part.h +++ /dev/null @@ -1,177 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef MRMLPART_H -#define MRMLPART_H - -#include <tqcstring.h> -#include <tqstringlist.h> - -#include <kurl.h> -#include <tdeparts/factory.h> -#include <tdeparts/part.h> - -#include <kmrml_config.h> - -#include "mrml_elements.h" - -class TQCheckBox; -class TQHGroupBox; -class TQPushButton; - -class TDEAboutData; -class KComboBox; -class KIntNumInput; - -namespace TDEIO { - class FileCopyJob; - class TransferJob; -} - -namespace KMrml -{ - -class AlgorithmDialog; -class Browser; -class CollectionCombo; -class MrmlView; - -class MrmlPart : public KParts::ReadOnlyPart -{ - Q_OBJECT - - -public: - enum Status { NeedCollection, CanSearch, InProgress }; - - MrmlPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList& args ); - ~MrmlPart(); - - TQString sessionId() const { return m_sessionId; } - TQString transactionId() const { return TQString(); } // ### - - void saveState( TQDataStream& stream ); - void restoreState( TQDataStream& stream ); - - static TDEAboutData *createAboutData(); - -public slots: - virtual bool openURL( const KURL& ); - virtual bool closeURL(); - - void slotActivated( const KURL& url, ButtonState ); - -protected: - virtual bool openFile(); - Algorithm firstAlgorithmForCollection( const Collection& coll ) const; - Collection currentCollection() const; - -signals: - /** - * allow plugins to extend the query - */ - void aboutToStartQuery( TQDomDocument& ); - -private slots: - void slotStartClicked(); - void slotSetStatusBar( const TQString& ); - void slotSetStatusBar( const KURL& url ) { slotSetStatusBar( url.prettyURL() ); } - void slotHostComboActivated( const TQString& ); - - void slotResult( TDEIO::Job * ); - void slotData( TDEIO::Job *, const TQByteArray& ); - - void slotDownloadResult( TDEIO::Job * ); - - void slotConfigureAlgorithm(); - void slotApplyAlgoConfig(); - void slotAlgoConfigFinished(); - -private: - void createQuery( const KURL::List * relevantItems = 0L ); - void initCollections( const TQDomElement& ); - void initAlgorithms( const TQDomElement& ); - void performQuery( TQDomDocument& doc ); - void parseMrml( TQDomDocument& doc ); - void parseQueryResult( TQDomElement& ); - void enableExtensionActions( const KURL& url, bool enable ); - TDEIO::TransferJob * transferJob( const KURL& url ); - - void initHostCombo(); - void enableServerDependentWidgets( bool enable ); - - void setStatus( Status status ); - - void contactServer( const KURL& url ); - void downloadReferenceFiles( const KURL::List& downloadList ); - - TDEIO::TransferJob *m_job; - MrmlView *m_view; - Config m_config; - KIntNumInput * m_resultSizeInput; - CollectionCombo * m_collectionCombo; - TQPushButton *m_algoButton; - TQHGroupBox *m_panel; - TQPushButton *m_startButton; - TQCheckBox *m_random; - Browser *m_browser; - AlgorithmDialog *m_algoConfig; - KComboBox *m_hostCombo; - - TQPtrList<TDEIO::FileCopyJob> m_downloadJobs; - TQStringList m_tempFiles; - - TQString m_sessionId; - KURL::List m_queryList; // a list of valid LOCAL (!) urls to query for - - CollectionList m_collections; - AlgorithmList m_algorithms; - - Status m_status; - static uint s_sessionId; - -}; - -class PartFactory : public KParts::Factory -{ - Q_OBJECT - - -public: - PartFactory(); - ~PartFactory(); - - static TDEInstance * instance(); - -protected: - virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0, - const char *widgetName = 0, - TQObject *parent = 0, - const char *name = 0, - const char *classname = "KParts::Part", - const TQStringList& args = TQStringList() ); - -private: - static TDEInstance * s_instance; - -}; - -} - -#endif // MRMLPART_H diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp deleted file mode 100644 index 0f55670f..00000000 --- a/kmrml/kmrml/mrml_view.cpp +++ /dev/null @@ -1,480 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqdom.h> -#include <tqlabel.h> -#include <tqpainter.h> -#include <tqtimer.h> -#include <tqtooltip.h> - -#include <kcursor.h> -#include <kdatastream.h> -#include <tdelocale.h> -#include <kcombobox.h> -#include <kmimetype.h> -#include <kurl.h> -#include <kurldrag.h> - -#include "loader.h" -#include "mrml_creator.h" -#include "mrml_view.h" - -using namespace KMrml; - -MrmlView::MrmlView( TQWidget *parent, const char *name ) - : TQScrollView( parent, name ) -{ - setStaticBackground( true ); - setResizePolicy( Manual ); - setHScrollBarMode( AlwaysOff ); - enableClipper( true ); // ### test this - - m_items.setAutoDelete( true ); - - connect( Loader::self(), TQT_SIGNAL( finished(const KURL&, const TQByteArray&)), - TQT_SLOT( slotDownloadFinished( const KURL&, const TQByteArray& ))); - - m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayout() )); - - // we need a pixmap to be shown when no thumbnail is available for a - // query result image - TQLabel l( i18n( "No thumbnail available" ), 0L ); - l.setFixedSize( 80, 80 ); - l.setAlignment( WordBreak | AlignCenter ); -// l.setFrameStyle( TQLabel::Box | TQLabel::Plain ); -// l.setLineWidth( 1 ); - l.setPaletteBackgroundColor( TQt::white ); - l.setPaletteForegroundColor( TQt::black ); - m_unavailablePixmap = TQPixmap::grabWidget( &l ); -} - -MrmlView::~MrmlView() -{ -} - -MrmlViewItem * MrmlView::addItem( const KURL& url, const KURL& thumbURL, - const TQString& similarity ) -{ - bool ok; - double value = similarity.toDouble( &ok ); - if ( !ok || value < 0.05 ) - return 0L; - - return addItem( url, thumbURL, value ); -} - -MrmlViewItem * MrmlView::addItem( const KURL& url, const KURL& thumbURL, - double similarity ) -{ - if ( !url.isValid() ) { - tqWarning( "MrmlPart: received malformed URL from query: %s", - url.prettyURL().isNull() ? "(null)" : url.prettyURL().latin1() ); - return 0L; - } - -// tqDebug("** url: %s", thumbURL.url().latin1()); - - MrmlViewItem *item = new MrmlViewItem( url, thumbURL, similarity, this ); - TQPixmap *pixmap = getPixmap( thumbURL ); - if ( pixmap ) - item->setPixmap( *pixmap ); - - m_items.append( item ); - - m_timer->start( 0, true ); - return item; -} - -void MrmlView::addRelevanceToQuery( TQDomDocument& document, - TQDomElement& parent ) -{ - TQPtrListIterator<MrmlViewItem> it( m_items ); - for( ; it.current(); ++it ) { - it.current()->createRelevanceElement( document, parent ); - } -} - -void MrmlView::clear() -{ - m_items.clear(); // items are deleted and removed from scrollview - setContentsPos( 0, 0 ); -} - -TQPixmap * MrmlView::getPixmap( const KURL& url ) -{ - TQString u = url.url(); - TQPixmap *pix = m_pixmapCache.find( u ); - if ( pix ) - return pix; - - if ( url.isLocalFile() ) { - TQPixmap p; - if ( !p.load( url.path() ) ) - p = m_unavailablePixmap; - - m_pixmapCache.insert( u, p ); - return m_pixmapCache.find( u ); - } - else { // remote url, download with TDEIO - Loader::self()->requestDownload( url ); - } - - return 0L; -} - -void MrmlView::slotDownloadFinished( const KURL& url, const TQByteArray& data ) -{ - TQPtrListIterator<MrmlViewItem> it( m_items ); - for( ; it.current(); ++it ) { - MrmlViewItem *item = it.current(); - if ( item->thumbURL() == url ) - { - TQPixmap p; - if ( data.isEmpty() || !p.loadFromData( data ) ) - p = m_unavailablePixmap; - - m_pixmapCache.insert( url.url(), p ); - item->setPixmap( p ); - - slotLayout(); - return; - } - } -} - -void MrmlView::stopDownloads() -{ - Loader *loader = Loader::self(); - TQPtrListIterator<MrmlViewItem> it( m_items ); - for( ; it.current(); ++it ) { - MrmlViewItem *item = it.current(); - if ( !item->hasRemotePixmap() ) - loader->removeDownload( item->url() ); - } -} - -void MrmlView::slotLayout() -{ - int itemWidth = 0; - TQPtrListIterator<MrmlViewItem> it( m_items ); - - for ( ; it.current(); ++it ) { - itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() ); - } - - if ( itemWidth == 0 ) - return; - - - uint itemsPerRow = visibleWidth() / itemWidth; - int margin = (visibleWidth() - (itemsPerRow * itemWidth)) / 2; - int rowHeight = 0; - uint item = 0; - uint y = 5; - - // pointing to the first item of a row - TQPtrListIterator<MrmlViewItem> rowIt( m_items ); - - for ( it.toFirst(); it.current(); ++it ) { - if ( item >= itemsPerRow ) { - item = 0; - y += rowHeight; - rowHeight = 0; - } - - if ( item == 0 ) - rowIt = it; - - rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() ); - addChild( it.current(), margin + item * itemWidth, y ); - it.current()->show(); - - item++; - - // resize all items of the current row so they all have the same size - if ( item >= itemsPerRow || it.atLast() ) - { - for ( uint i = 0; (i < itemsPerRow && rowIt.current()); i++ ) - { - rowIt.current()->resize( itemWidth, rowHeight ); - ++rowIt; - } - } - } - - resizeContents( visibleWidth(), y + rowHeight ); -} - -void MrmlView::resizeEvent( TQResizeEvent *e ) -{ - int oldW = visibleWidth(); - TQScrollView::resizeEvent( e ); - - if ( visibleWidth() != oldW ) - slotLayout(); -} - -void MrmlView::saveState( TQDataStream& stream ) -{ - stream << m_items.count(); - TQPtrListIterator<MrmlViewItem> it( m_items ); - for( ; it.current(); ++it ) { - stream << *it.current(); - } - -} - -void MrmlView::restoreState( TQDataStream& stream ) -{ - stopDownloads(); - clear(); - - int count; - stream >> count; - - KURL url, thumbURL; - double similarity; - TQ_UINT32 relevance; - MrmlViewItem *item; - - - for ( int i = 0; i < count; i++ ) - { - stream >> url; - stream >> thumbURL; - stream >> similarity; - stream >> relevance; - - item = addItem( url, thumbURL, similarity ); - if ( item ) - item->setRelevance( (MrmlViewItem::Relevance) relevance ); - } -} - -TQDataStream& KMrml::operator<<( TQDataStream& stream, - const KMrml::MrmlViewItem& item ) -{ - return stream << item.url() - << item.thumbURL() - << item.similarity() - << static_cast<TQ_UINT32>( item.relevance() ); -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL, - double similarity, MrmlView *view, - const char *name ) - : TQFrame( view->viewport() , name ), - m_view( view ), - m_url( url ), - m_thumbURL( thumbURL ), - similarityFullWidth( 120 ), // ### - m_hasRemotePixmap( false ) -{ - if ( m_similarity != -1 ) - m_similarity = TQMAX( 0.0, TQMIN( 1.0, similarity )); - setFrameStyle( Panel | Sunken ); - setMouseTracking( true ); - - m_combo = new KComboBox( this ); - TQToolTip::add( m_combo, i18n("You can refine queries by giving feedback about the current result and pressing the Search button again.") ); - m_combo->insertItem( i18n("Relevant"), Relevant ); - m_combo->insertItem( i18n("Neutral"), Neutral ); - m_combo->insertItem( i18n("Irrelevant"), Irrelevant ); - m_combo->adjustSize(); - m_combo->setCurrentItem( Neutral ); - - /* - if ( similarity > -1 ) - TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>") - .arg( url ) - .arg(i18n("Similarity: %1").arg( TQString::number(similarity)))); - else - TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) ); - */ - - setMinimumSize( 130, 130 ); // ### -} - -MrmlViewItem::~MrmlViewItem() -{ -} - -void MrmlViewItem::setPixmap( const TQPixmap& pix ) -{ - if ( !m_url.isLocalFile() ) - m_hasRemotePixmap = true; - - m_pixmap = pix; - adjustSize(); - update(); -} - -void MrmlViewItem::paintEvent( TQPaintEvent *e ) -{ - TQFrame::paintEvent( e ); - - if ( !m_pixmap.isNull() ) { - bitBlt( this, pixmapX(), pixmapY(), - &m_pixmap, 0, 0, m_pixmap.width(), m_pixmap.height(), - CopyROP ); - } - - if ( m_similarity >= 0 ) { - TQPainter p( this ); - TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine ); - p.setPen( pen ); - int x = margin; - int y = m_combo->y() - similarityHeight - 2; - int w = (int) (similarityFullWidth * m_similarity); - int h = similarityHeight; - p.drawRect( x, y, similarityFullWidth, h ); - p.fillRect( x, y, w, h, colorGroup().highlight() ); - } -} - -void MrmlViewItem::resizeEvent( TQResizeEvent *e ) -{ - TQFrame::resizeEvent( e ); - - int y = height() - m_combo->height() - margin; - m_combo->move( width()/2 - m_combo->width()/2, y ); -} - -TQSize MrmlViewItem::sizeHint() const -{ - int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() ); - w += 2 * margin; - - int h = m_pixmap.isNull() ? margin : margin + spacing + m_pixmap.height(); - h += (m_similarity > -1) ? similarityHeight + spacing : 0; - h += m_combo->height() + margin; - - return TQSize( w, h ); -} - -void MrmlViewItem::mousePressEvent( TQMouseEvent *e ) -{ - TQFrame::mousePressEvent( e ); - pressedPos.setX( 0 ); - pressedPos.setY( 0 ); - - - if ( e->button() == Qt::LeftButton || e->button() == Qt::MidButton ) { - if ( hitsPixmap( e->pos() ) ) - pressedPos = e->pos(); - } - else if ( e->button() == Qt::RightButton && hitsPixmap( e->pos() ) ) - emit view()->activated( m_url, e->button() ); -} - -void MrmlViewItem::mouseMoveEvent( TQMouseEvent *e ) -{ - if ( hitsPixmap( e->pos() ) ) { - if ( !ownCursor() ) { // nice hacklet :) - setCursor( KCursor::handCursor() ); - emit view()->onItem( m_url ); - } - } - else { - if ( ownCursor() ) { - unsetCursor(); - emit view()->onItem( KURL() ); - } - } - - if ( (e->state() & Qt::LeftButton) && !pressedPos.isNull() ) { - TQPoint dist = e->pos() - pressedPos; - if ( dist.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { - // start drag here - KURL::List urls; - // ### support multiple files? - urls.append( m_url ); - KURLDrag *drag = new KURLDrag( urls, this ); - drag->setPixmap( KMimeType::pixmapForURL( m_url ) ); - drag->drag(); - } - } -} - -void MrmlViewItem::mouseReleaseEvent( TQMouseEvent *e ) -{ - if ( hitsPixmap( e->pos() )) { - TQPoint dist = e->pos() - pressedPos; - if ( dist.manhattanLength() < TDEGlobalSettings::dndEventDelay() ) { - emit view()->activated( m_url, e->button() ); - } - } -} - -bool MrmlViewItem::hitsPixmap( const TQPoint& pos ) const -{ - if ( m_pixmap.isNull() ) - return false; - - if ( pos.x() > pixmapX() && pos.x() < pixmapX() + m_pixmap.width() && - pos.y() > pixmapY() && pos.y() < pixmapY() + m_pixmap.height() ) - return true; - return false; -} - -void MrmlViewItem::createRelevanceElement( TQDomDocument& document, - TQDomElement& parent ) -{ - int rel = m_combo->currentItem(); - if ( rel == Neutral ) - return; - - MrmlCreator::createRelevanceElement( document, parent, m_url.url(), - (rel == Relevant) ? MrmlCreator::Relevant : MrmlCreator::Irrelevant ); -} - -MrmlViewItem::Relevance MrmlViewItem::relevance() const -{ - return (Relevance) m_combo->currentItem(); -} - -void MrmlViewItem::setRelevance( Relevance relevance ) -{ - m_combo->setCurrentItem( relevance ); -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -int MrmlViewItemList::compareItems( TQPtrCollection::Item item1, - TQPtrCollection::Item item2 ) -{ - double s1 = (static_cast<MrmlViewItem*>( item1 ))->similarity(); - double s2 = (static_cast<MrmlViewItem*>( item2 ))->similarity(); - - if ( s1 < s2 ) - return 1; - else if ( s1 > s2 ) - return -1; - else - return 0; -} - -#include "mrml_view.moc" diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h deleted file mode 100644 index dde6a0e6..00000000 --- a/kmrml/kmrml/mrml_view.h +++ /dev/null @@ -1,182 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef MRML_VIEW_H -#define MRML_VIEW_H - -#include <tqevent.h> -#include <tqframe.h> -#include <tqptrlist.h> -#include <tqpixmap.h> -#include <tqpixmapcache.h> -#include <tqscrollview.h> - -class TQDomDocument; -class TQDomElement; -class TQTimer; - -class KComboBox; - -namespace KMrml -{ - -class MrmlViewItem; - - -class MrmlViewItemList : public TQPtrList<MrmlViewItem> -{ -protected: - // sort by similarity - virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item ); - -}; - - -class MrmlView : public TQScrollView -{ - friend class MrmlViewItem; - - Q_OBJECT - - -public: - MrmlView( TQWidget *parent = 0L, const char *name = 0L ); - ~MrmlView(); - - MrmlViewItem * addItem( const KURL& url, const KURL& thumbURL, - const TQString& similarity ); - MrmlViewItem * addItem( const KURL& url, const KURL& thumbURL, - double similarity ); - - - void addRelevanceToQuery( TQDomDocument&, TQDomElement& parent ); - - void clear(); - - bool isEmpty() const { return m_items.isEmpty(); } - - void stopDownloads(); - - void saveState( TQDataStream& stream ); - void restoreState( TQDataStream& stream ); - -signals: - void activated( const KURL& url, ButtonState button ); - void onItem( const KURL& url ); - -protected: - virtual void resizeEvent( TQResizeEvent * ); - -private slots: - void slotLayout(); - void slotDownloadFinished( const KURL&, const TQByteArray& ); - -private: - /** - * @returns a _temporary_ pointer to a pixmap. Copy it! - */ - TQPixmap * getPixmap( const KURL& url ); - - MrmlViewItemList m_items; - TQTimer *m_timer; - TQPixmapCache m_pixmapCache; - TQPixmap m_unavailablePixmap; - - -}; - - -class MrmlViewItem : public TQFrame -{ - Q_OBJECT - - -public: - enum Relevance - { - Relevant = 0, - Neutral = 1, - Irrelevant = 2 - }; - - MrmlViewItem( const KURL& url, const KURL& thumbURL, double similarity, - MrmlView *view, const char *name=0L ); - virtual ~MrmlViewItem(); - - void setPixmap( const TQPixmap& pixmap ); - - void createRelevanceElement( TQDomDocument& document, TQDomElement& parent ); - - double similarity() const { return m_similarity; } - - void setSimilarity( double value ); - - virtual TQSize sizeHint() const; - - const KURL& url() const { return m_url; } - const KURL& thumbURL() const { return m_thumbURL; } - - bool hasRemotePixmap() const { return !m_thumbURL.isLocalFile() && m_hasRemotePixmap; } - - Relevance relevance() const; - void setRelevance( Relevance relevance ); - -protected: - virtual void paintEvent( TQPaintEvent * ); - virtual void resizeEvent( TQResizeEvent * ); - - virtual void mousePressEvent( TQMouseEvent * ); - virtual void mouseMoveEvent( TQMouseEvent * ); - virtual void mouseReleaseEvent( TQMouseEvent * ); - -private: - bool hitsPixmap( const TQPoint& ) const; - MrmlView * view() const { return m_view; } - - inline int pixmapX() const { - return TQMAX( margin, (width() - m_pixmap.width()) / 2); - } - inline int pixmapY() const { - return m_combo->y() - similarityHeight - m_pixmap.height() - margin; - } - - KComboBox *m_combo; // for relevance - MrmlView *m_view; - - KURL m_url; - KURL m_thumbURL; - - TQPixmap m_pixmap; - - double m_similarity; - const int similarityFullWidth; - bool m_hasRemotePixmap; - - TQPoint pressedPos; - - static const int spacing = 3; - static const int margin = 5; - static const int similarityHeight = 4; - -}; - -TQDataStream& operator <<( TQDataStream& stream, const KMrml::MrmlViewItem& ); - -} - -#endif // MRML_VIEW_H diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp deleted file mode 100644 index 9bdb85cf..00000000 --- a/kmrml/kmrml/mrmlsearch.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// This little baby is called from Konqueror's popupmenu, when you hit -// "Search for similar images...". This program simply gets the URLs -// from Konqueror and creates a query of the form -// mrml://host.com/?relevant=url1;url2;url3;url4.... -// By default, the mrml URL is mrml://localhost", but you can override that -// by editing ~/.trinity/share/config/tdeio_mrmlrc and adding -// [MRML Settings] -// Default URL=mrml://url.to.your.giftserver.com -// -// mrmlsearch will then invoke "kfmclient openURL query" to start open -// a new Konqueror window and perform the query. - -#include <unistd.h> - -#include <tqfile.h> -#include <tqstring.h> -#include <tdeconfig.h> -#include <tdeglobal.h> -#include <kinstance.h> -#include <kurl.h> - -#include <kmrml_config.h> - -extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) -{ - TQString query; - - for ( int i = 1; i < argc; i++ ) { - if ( i > 1 ) - query += ';'; - TQString path = TQFile::decodeName( argv[i] ); - if ( path.at( 0 ) == '/' ) { - KURL u; - u.setPath( path ); - path = u.url(); - } - query.append( path ); - } - - TDEInstance instance( "tdeio_mrml" ); - - KMrml::Config config( instance.config() ); - KMrml::ServerSettings settings = config.defaultSettings(); - KURL url; - url.setProtocol( "mrml" ); - url.setHost( settings.host ); - - query = KURL::encode_string_no_slash( query ); - query.prepend( "?relevant=" ); // this is not encoded! - url.setQuery( query ); - tqDebug("***** Query: %s ** URL: %s", query.latin1(), url.url().latin1()); - - return execlp( "kfmclient", - "kfmclient", "openURL", TQFile::encodeName(url.url()).data(), - "text/mrml", (void *)0 ); -} diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp deleted file mode 100644 index a4278f56..00000000 --- a/kmrml/kmrml/propertysheet.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "propertysheet.h" - -#include "mrml_elements.h" -#include "mrml_shared.h" - -#include <knuminput.h> -#include <tqwidget.h> - -using namespace KMrml; - -template class TQValueList<TQDomElement>; - -PropertySheet::PropertySheet() -{ - init(); -} - -PropertySheet::PropertySheet( const TQDomElement& elem ) -{ - init(); - - initFromDOM( elem ); -} - -PropertySheet::PropertySheet( const PropertySheet& ps ) -{ - *this = ps; -} - -PropertySheet& PropertySheet::operator= ( const PropertySheet& ps ) -{ - if ( &ps == this ) - return *this; - - m_visibility = ps.m_visibility; - m_type = ps.m_type; - m_caption = ps.m_caption; - m_id = ps.m_id; - - m_sendType = ps.m_sendType; - m_sendName = ps.m_sendName; - m_sendValue = ps.m_sendValue; - - m_minRange = ps.m_minRange; - m_maxRange = ps.m_maxRange; - m_stepSize = ps.m_stepSize; - - m_minSubsetSize = ps.m_minSubsetSize; - m_maxSubsetSize = ps.m_maxSubsetSize; - - // deep copy of m_subSheets - TQPtrListIterator<PropertySheet> it( ps.m_subSheets ); - for ( ; it.current(); ++it ) - m_subSheets.append( new PropertySheet( *it.current() ) ); - - return *this; -} - -void PropertySheet::init() -{ - m_subSheets.setAutoDelete( true ); - m_visibility = Visible; -} - -void PropertySheet::initFromDOM( const TQDomElement& elem ) -{ - m_subSheets.clear(); - - m_visibility = getVisibility( elem.attribute( MrmlShared::visibility() )); - m_type = getType( elem.attribute( MrmlShared::propertySheetType() ) ); - m_caption = elem.attribute( MrmlShared::caption() ); - m_id = elem.attribute( MrmlShared::propertySheetId() ); - m_sendType = getSendType( elem.attribute( MrmlShared::sendType() )); - m_sendName = elem.attribute( MrmlShared::sendName() ); - m_sendValue = elem.attribute( MrmlShared::sendValue() ); - m_minRange = toInt( elem.attribute( MrmlShared::from() )); - m_maxRange = toInt( elem.attribute( MrmlShared::to() )); - m_stepSize = toInt( elem.attribute( MrmlShared::step() )); - - m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() )); - m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() )); - - TQValueList<TQDomElement> children = - KMrml::directChildElements( elem, MrmlShared::propertySheet() ); - TQValueListConstIterator<TQDomElement> it = children.begin(); - for ( ; it != children.end(); ++it ) - m_subSheets.append( new PropertySheet( *it ) ); -} - -TQWidget * PropertySheet::createWidget( TQWidget */*parent*/, const char */*name*/ ) -{ - TQWidget *w = 0L; - - switch ( m_type ) - { - case Numeric: - { -// KIntNumInput *input = new KIntNumInput(); - break; - } - - case Subset: - { - if ( m_minSubsetSize == 1 && m_maxSubsetSize == 1 ) - { - - } - - break; - } - - default: - tqDebug("** can't create widget for type: %i", m_type); - } - - return w; -} - - -// -// static methods -// -PropertySheet::Visibility PropertySheet::getVisibility( const TQString& value ) -{ - Visibility vis; - - if ( value == MrmlShared::invisible() ) - vis = Invisible; - else if ( value == MrmlShared::popup() ) - vis = Popup; - else - vis = Visible; // default value - - return vis; -} - -PropertySheet::Type PropertySheet::getType( const TQString& value ) -{ - Type type = (Type) 0; - - if ( value == MrmlShared::multiSet() ) - type = MultiSet; - else if ( value == MrmlShared::subset() ) - type = Subset; - else if ( value == MrmlShared::setElement() ) - type = SetElement; - else if ( value == MrmlShared::boolean() ) - type = Boolean; - else if ( value == MrmlShared::numeric() ) - type = Numeric; - else if ( value == MrmlShared::textual() ) - type = Textual; - else if ( value == MrmlShared::panel() ) - type = Panel; - else if ( value == MrmlShared::clone() ) - type = Clone; - else if ( value == MrmlShared::reference() ) - type = Reference; - - return type; -} - -PropertySheet::SendType PropertySheet::getSendType( const TQString& value ) -{ - SendType type = (SendType) 0; - - if ( value == MrmlShared::element() ) - type = Element; - else if ( value == MrmlShared::attribute() ) - type = Attribute; - else if ( value == MrmlShared::attributeName() ) - type = AttributeName; - else if ( value == MrmlShared::attributeValue() ) - type = AttributeValue; - else if ( value == MrmlShared::children() ) - type = Children; - else if ( value == MrmlShared::none() ) - type = None; - - return type; -} - -int PropertySheet::toInt( const TQString& value, int defaultValue ) -{ - bool ok = false; - int res = value.toInt( &ok ); - return ok ? res : defaultValue; -} diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h deleted file mode 100644 index e4759282..00000000 --- a/kmrml/kmrml/propertysheet.h +++ /dev/null @@ -1,113 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef PROPERTYSHEET_H -#define PROPERTYSHEET_H - -#include <tqdom.h> -#include <tqstring.h> -#include <tqptrlist.h> - -class TQWidget; - -namespace KMrml -{ - class PropertySheet - { - public: - enum Type - { - MultiSet = 1, // ?? - Subset, // radio-button/combobox or listbox - SetElement, // CheckBox -> disables/enables children? - Boolean, // CheckBox - Numeric, // Slider/Spinbox - Textual, // lineedit - Panel, // groupbox? - Clone, - Reference - }; - enum Visibility - { - Visible, - Invisible, - Popup - }; - enum SendType - { - Element = 1, - Attribute, - AttributeName, - AttributeValue, - Children, - None - }; - - PropertySheet(); - PropertySheet( const TQDomElement& elem ); - PropertySheet( const PropertySheet& ps ); - ~PropertySheet() {}; - - PropertySheet& operator=( const PropertySheet& ps ); - - bool isValid() const { - // required mrml attributes - return !m_id.isNull() && m_type != 0 && m_sendType != 0; - } - void initFromDOM( const TQDomElement& elem ); - - void toElement( TQDomElement& parent ); - - TQWidget * createWidget( TQWidget *parent, const char *name = 0 ); - - private: - static Visibility getVisibility( const TQString& value ); - static Type getType( const TQString& value ); - static SendType getSendType( const TQString& value ); - static int toInt( const TQString& value, int defaultValue = 0 ); - - void init(); - - - // update operator=() when adding data members! - - TQPtrList<PropertySheet> m_subSheets; - Visibility m_visibility; - Type m_type; - TQString m_caption; - TQString m_id; - - SendType m_sendType; - TQString m_sendName; - TQString m_sendValue; - - int m_minRange; - int m_maxRange; - int m_stepSize; - - // Type = Subset && m_minSubsetSize == m_maxSubsetSize == 1 -> Combobox - // or radio buttons. - // > max > 1 -> Listbox with multiselection - int m_minSubsetSize; - int m_maxSubsetSize; - - }; - -} - -#endif // PROPERTYSHEET_H diff --git a/kmrml/kmrml/propertywidgets.cpp b/kmrml/kmrml/propertywidgets.cpp deleted file mode 100644 index 18508f3a..00000000 --- a/kmrml/kmrml/propertywidgets.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "propertywidgets.h" - -IntegerWidget::IntegerWidget( const PropertySheet& sheet, - TQWidget *parent, const char *name ) - : TQHBox( parent, name ) -{ - -} - -IntegerWidget::~IntegerWidget() -{ - -} - -int IntegerWidget::value() const -{ - -} - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -ComboWidget::ComboWidget( const PropertySheet& sheet, - TQWidget *parent, const char *name ) - : TQHBox( parent, name ) -{ - -} - -ComboWidget::~ComboWidget() -{ - -} - -TQString ComboWidget::value() const -{ - -} - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -CheckBoxWidget::CheckBoxWidget( const PropertySheet& sheet, - TQWidget *parent, const char *name ) - : TQHBox( parent, name ) -{ - -} - -CheckBoxWidget::~CheckBoxWidget() -{ - -} - -bool CheckBoxWidget::value() const -{ - -} - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -LineEditWidget::LineEditWidget( const PropertySheet& sheet, - TQWidget *parent, const char *name ) - : TQHBox( parent, name ) -{ - -} - -LineEditWidget::~LineEditWidget() -{ - -} - -TQString LineEditWidget::value() const -{ - -} - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - -ListBoxWidget::ListBoxWidget( const PropertySheet& sheet, - TQWidget *parent, const char *name ) - : TQHBox( parent, name ) -{ - -} - -ListBoxWidget::~ListBoxWidget() -{ - -} - -TQStringList ListBoxWidget::value() const -{ - -} - -#include "propertywidgets.moc" diff --git a/kmrml/kmrml/propertywidgets.h b/kmrml/kmrml/propertywidgets.h deleted file mode 100644 index bfb207a0..00000000 --- a/kmrml/kmrml/propertywidgets.h +++ /dev/null @@ -1,113 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef PROPERTYWIDGETS_H -#define PROPERTYWIDGETS_H - -#include <tqhbox.h> - -#include "propertysheet.h" - -namespace KMrml -{ - class IntegerWidget : public TQHBox - { - Q_OBJECT - - - public: - IntegerWidget( const PropertySheet& sheet, - TQWidget *parent = parent, const char *name = 0L ); - ~IntegerWidget(); - - int value() const; - - private: - - }; - - class ComboWidget : public TQHBox - { - Q_OBJECT - - - public: - ComboWidget( const PropertySheet& sheet, - TQWidget *parent = parent, const char *name = 0L ); - ~ComboWidget(); - - TQString value() const; - - private: - - }; - - class CheckBoxWidget : public TQHBox - { - Q_OBJECT - - - public: - CheckBoxWidget( const PropertySheet& sheet, - TQWidget *parent = parent, const char *name = 0L ); - ~CheckBoxWidget(); - - bool value(); - - private: - - - }; - - - class LineEditWidget : public TQHBox - { - Q_OBJECT - - - public: - LineEditWidget( const PropertySheet& sheet, - TQWidget *parent = parent, const char *name = 0L ); - ~LineEditWidget(); - - TQString value(); - - private: - - }; - - class ListBoxWidget : public TQHBox - { - Q_OBJECT - - - public: - ListBoxWidget( const PropertySheet& sheet, - TQWidget *parent = parent, const char *name = 0L ); - ~ListBoxWidget(); - - TQStringList values(); - - private: - - }; - -}; - - -#endif // PROPERTYWIDGETS_H diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt deleted file mode 100644 index 54dbe884..00000000 --- a/kmrml/kmrml/server/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -################################################# -# -# (C) 2010-2011 Calvin Morrison -# mutantturkey@gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/lib - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - -#### other data ################################# - -tde_create_translated_desktop( - SOURCE daemonwatcher.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kded - PO_DIR kmrml-desktops -) - - -#### kded_daemonwatcher (module) ################ - -tde_add_kpart( kded_daemonwatcher AUTOMOC - SOURCES watcher.cpp watcher.skel - LINK kmrmlstuff-static tdeparts-shared tdeio-shared tdeinit_kded-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kmrml/kmrml/server/Makefile.am b/kmrml/kmrml/server/Makefile.am deleted file mode 100644 index 318e8e7f..00000000 --- a/kmrml/kmrml/server/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -kde_module_LTLIBRARIES = kded_daemonwatcher.la - -INCLUDES = $(all_includes) -kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel -# watcher.stub -kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_daemonwatcher_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) - -METASOURCES = AUTO - -servicesdir = $(kde_servicesdir)/kded -services_DATA = daemonwatcher.desktop diff --git a/kmrml/kmrml/server/daemonwatcher.desktop b/kmrml/kmrml/server/daemonwatcher.desktop deleted file mode 100644 index 8177e51e..00000000 --- a/kmrml/kmrml/server/daemonwatcher.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Service -Name=KDED KMRML Daemon Watcher -Comment=Starts daemons on demand and restarts them on failure -X-TDE-ServiceTypes=KDEDModule -X-TDE-ModuleType=Library -X-TDE-Library=daemonwatcher -X-TDE-FactoryName=daemonwatcher -X-TDE-Kded-load-on-demand=true diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp deleted file mode 100644 index 67f0c69a..00000000 --- a/kmrml/kmrml/server/watcher.cpp +++ /dev/null @@ -1,280 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <dcopclient.h> - -#include <tdeapplication.h> -#include <kdebug.h> -#include <tdeversion.h> -#include <tdelocale.h> -#include <tdemessagebox.h> - -#include "watcher.h" - -using namespace KMrml; - -Watcher::Watcher( const TQCString& name ) - : KDEDModule( name ) -{ - m_daemons.setAutoDelete( true ); - - // safety, for clients that die without unregistering - TDEApplication::dcopClient()->setNotifications( true ); - connect( TDEApplication::dcopClient(), - TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( slotAppUnregistered( const TQCString& ))); -} - -Watcher::~Watcher() -{ - TDEApplication::dcopClient()->setNotifications( false ); -} - -bool Watcher::requireDaemon( const TQCString& clientAppId, - const TQString& daemonKey, - const TQString& commandline, - uint timeout /* seconds */, - int restartOnFailure ) -{ - if ( !TDEApplication::dcopClient()->isApplicationRegistered( clientAppId ) ) - kdWarning() << "Watcher::requireDaemon: " << daemonKey - << ": Client AppID is not registered with DCOP: " - << clientAppId << endl; - - DaemonData *daemon = m_daemons.find( daemonKey ); - - if ( daemon ) - { - if ( !daemon->apps.find( clientAppId ) ) - daemon->apps.append( clientAppId ); - - // timeout, commandline and restart values are: first come, first serve - return true; // process already running, all fine - } - - else // start daemon - { - daemon = new DaemonData( daemonKey, commandline, - timeout, restartOnFailure ); - m_daemons.insert( daemonKey, daemon ); - daemon->apps.append( clientAppId ); - -#if TDE_VERSION >= 306 - daemon->process = new TDEProcess(); - daemon->process->setUseShell( true ); -#else - daemon->process = new KShellProcess(); -#endif - daemon->process->setEnvironment( "LC_ALL", "C" ); - daemon->process->setEnvironment( "LANG", "C" ); - daemon->process->setEnvironment( "LANGUAGE", "C" ); - *daemon->process << commandline; - connect( daemon->process, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( slotProcExited( TDEProcess * ))); - return startDaemon( daemon ); - } -} - -void Watcher::unrequireDaemon( const TQCString& clientAppId, - const TQString& daemonKey ) -{ - unrequireDaemon( m_daemons.find( daemonKey ), clientAppId ); -} - -void Watcher::unrequireDaemon( DaemonData *daemon, - const TQCString& clientAppId ) -{ - if ( daemon ) - { - daemon->apps.remove( clientAppId.data() ); - if ( daemon->apps.isEmpty() ) - { - if ( !daemon->timer ) - { - daemon->timer = new TQTimer(); - connect( daemon->timer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotTimeout() )); - } - daemon->timer->start( daemon->timeout * 1000, true ); - } - } - else - kdWarning() << "Watcher::unrequireDaemon: daemon unknown. client: " - << clientAppId << endl; -} - -TQStringList Watcher::runningDaemons() const -{ - TQStringList result; - TQDictIterator<DaemonData> it( m_daemons ); - for ( ; it.current(); ++it ) - result.append( it.current()->commandline ); - - return result; -} - -void Watcher::slotProcExited( TDEProcess *proc ) -{ - DaemonData *daemon = findDaemonFromProcess( proc ); - - if ( proc->normalExit() ) - { - emitExited( daemon ); - return; - } - - if ( daemon ) - { - if ( --daemon->restartOnFailure <= 0 ) - { - if ( KMessageBox::questionYesNo( 0L, - i18n("<qt>The server with the command line" - "<br>%1<br>" - "is not available anymore. Do you want to " - "restart it?" ).arg( daemon->commandline ), - i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") ) - == KMessageBox::Yes ) - { - daemon->restartOnFailure = 1; - } - } - - if ( daemon->restartOnFailure > 0 ) - { - startDaemon( daemon ); - return; - } - } - - emitFailure( daemon ); -} - -bool Watcher::startDaemon( DaemonData *daemon ) -{ - if ( daemon->process->start( TDEProcess::NotifyOnExit ) ) - return true; - - else - { - if ( KMessageBox::questionYesNo( 0L, - i18n("Unable to start the server with the " - "command line" - "<br>%1<br>" - "Try again?").arg( daemon->commandline ), - i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") ) - == KMessageBox::Yes ) - { - return startDaemon( daemon ); - } - } - - return false; -} - -void Watcher::slotTimeout() -{ - TQTimer *timer = static_cast<TQTimer*>( TQT_TQOBJECT( const_cast<TQT_BASE_OBJECT_NAME*>(sender()) ) ); - DaemonData *daemon = findDaemonFromTimer( timer ); - if ( daemon ) - { - if ( daemon->apps.isEmpty() ) - { - // the daemon and TDEProcess might get deleted by killing the - // TDEProcess (through slotProcExited()), so don't dereference - // daemon after proc->kill() - TQString key = daemon->daemonKey; - - // noone registered during the timeout, so kill the daemon - if ( !daemon->process->kill() ) - daemon->process->kill( SIGKILL ); - - m_daemons.remove( key ); - } - } -} - -DaemonData * Watcher::findDaemonFromProcess( TDEProcess *proc ) -{ - DaemonData *daemon; - TQDictIterator<DaemonData> it( m_daemons ); - for ( ; (daemon = it.current()); ++it ) - { - if ( daemon->process == proc ) - return daemon; - } - - return 0L; -} - -DaemonData * Watcher::findDaemonFromTimer( TQTimer *timer ) -{ - DaemonData *daemon; - TQDictIterator<DaemonData> it( m_daemons ); - for ( ; (daemon = it.current()); ++it ) - { - if ( daemon->timer == timer ) - return daemon; - } - - return 0L; -} - -void Watcher::slotAppUnregistered( const TQCString& appId ) -{ - if ( m_daemons.isEmpty() ) - return; - - DaemonData *daemon; - TQDictIterator<DaemonData> it( m_daemons ); - for ( ; (daemon = it.current()); ++it ) - { - if ( daemon->apps.find( appId ) != -1 ) - unrequireDaemon( daemon, appId ); - } -} - -void Watcher::emitExited( DaemonData *daemon ) -{ - if ( daemon ) - { - daemonExited( daemon->daemonKey, - daemon->process->pid(), - daemon->process->exitStatus() ); - - m_daemons.remove( daemon->daemonKey ); - } -} - -void Watcher::emitFailure( DaemonData *daemon ) -{ - if ( daemon ) - { - daemonDied( daemon->daemonKey, daemon->process->pid() ); - m_daemons.remove( daemon->daemonKey ); // deletes daemon + TDEProcess - } -} - -extern "C" { - KDE_EXPORT KDEDModule *create_daemonwatcher(const TQCString & obj ) - { - return new Watcher( obj ); - } -} - - -#include "watcher.moc" diff --git a/kmrml/kmrml/server/watcher.h b/kmrml/kmrml/server/watcher.h deleted file mode 100644 index e9cc0656..00000000 --- a/kmrml/kmrml/server/watcher.h +++ /dev/null @@ -1,108 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef LAUNCHER_H -#define LAUNCHER_H - -#include <tqdict.h> -#include <tqmap.h> -#include <tqstrlist.h> -#include <tqstringlist.h> -#include <tqtimer.h> - -#include <kdedmodule.h> -#include <kprocess.h> - -namespace KMrml -{ - class DaemonData - { - public: - DaemonData( const TQString& key, const TQString& cmd, - uint time, int numRestarts ) - : daemonKey( key ), - commandline( cmd ), - timeout( time ), - apps( true ), // deep copies - restartOnFailure( numRestarts ), - process( 0L ), - timer( 0L ) - { - } - ~DaemonData() - { - delete process; - delete timer; - } - TQString daemonKey; - TQString commandline; - uint timeout; - TQStrList apps; - int restartOnFailure; - TDEProcess *process; - TQTimer *timer; - }; - - class Watcher : public KDEDModule - { - Q_OBJECT -// - K_DCOP - - public: - Watcher( const TQCString& name = "daemonwatcher" ); - ~Watcher(); - - k_dcop: - virtual bool requireDaemon( const TQCString& clientAppId, - const TQString& daemonKey, - const TQString& commandline, - uint timeout = 60 /* seconds */, - int numRestarts = 5 ); - virtual void unrequireDaemon( const TQCString& clientAppId, - const TQString& daemonKey ); - virtual TQStringList runningDaemons() const; - - k_dcop_signals: - void daemonExited(const TQString& daemonKey, pid_t pid, int exitStatus); - void daemonDied( const TQString& daemonKey, pid_t pid ); - - protected: - bool startDaemon( DaemonData *daemon ); - - protected slots: - virtual void slotTimeout(); - - private: - void unrequireDaemon( DaemonData *daemon, const TQCString& clientAppId); - DaemonData *findDaemonFromProcess( TDEProcess *proc ); - DaemonData *findDaemonFromTimer( TQTimer *timer ); - - void emitExited( DaemonData *daemon ); - void emitFailure( DaemonData *daemon ); - - private slots: - void slotProcExited( TDEProcess *proc ); - void slotAppUnregistered( const TQCString& appId ); - - TQDict<DaemonData> m_daemons; - }; - -} - -#endif // LAUNCHER_H 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/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h index 3bca4853..ceec17ab 100644 --- a/kolourpaint/kpcommandhistory.h +++ b/kolourpaint/kpcommandhistory.h @@ -132,7 +132,7 @@ private: // KCommandHistory, this is only "almost source compatible". class kpCommandHistoryBase : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -238,7 +238,7 @@ private: // The solution is to add this functionality to kpCommandHistoryBase. class kpCommandHistory : public kpCommandHistoryBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp index 018dbb9c..ededcb99 100644 --- a/kolourpaint/kpdocument.cpp +++ b/kolourpaint/kpdocument.cpp @@ -686,7 +686,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, } // Write to local temporary file. - if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(atomicFileWriter.file ()), + if (!savePixmapToDevice (pixmap, atomicFileWriter.file (), saveOptions, metaInfo, false/*no lossy prompt*/, parent)) @@ -746,7 +746,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, return false; } - if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(&file), + if (!savePixmapToDevice (pixmap, &file, saveOptions, metaInfo, false/*no lossy prompt*/, parent)) @@ -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/kpdocument.h b/kolourpaint/kpdocument.h index b20d282f..c95af8df 100644 --- a/kolourpaint/kpdocument.h +++ b/kolourpaint/kpdocument.h @@ -54,7 +54,7 @@ class kpSelection; class kpDocument : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp index 21b8f11e..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*/); } @@ -898,7 +898,7 @@ void kpDocumentSaveOptionsWidget::updatePreview () TQBuffer buffer (data); buffer.open (IO_WriteOnly); kpDocument::savePixmapToDevice (*m_documentPixmap, - TQT_TQIODEVICE(&buffer), + &buffer, documentSaveOptions (), m_documentMetaInfo, false/*no lossy prompt*/, diff --git a/kolourpaint/kpdocumentsaveoptionswidget.h b/kolourpaint/kpdocumentsaveoptionswidget.h index 60e4b40a..c08e22b1 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.h +++ b/kolourpaint/kpdocumentsaveoptionswidget.h @@ -43,7 +43,7 @@ class kpResizeSignallingLabel; class kpDocumentSaveOptionsPreviewDialog : public TQWidget { -Q_OBJECT +TQ_OBJECT public: @@ -95,7 +95,7 @@ class KPushButton; class kpDocumentSaveOptionsWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: 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.h b/kolourpaint/kpmainwindow.h index 180ae801..3e54151a 100644 --- a/kolourpaint/kpmainwindow.h +++ b/kolourpaint/kpmainwindow.h @@ -87,7 +87,7 @@ class kpZoomedView; class kpMainWindow : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index 61cb7319..81312049 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -103,25 +103,25 @@ void kpMainWindow::setupEditMenuActions () } - m_actionCut = KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT (slotCut ()), ac); - m_actionCopy = KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT (slotCopy ()), ac); - m_actionPaste = KStdAction::paste (TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT (slotDelete ()), ac, "edit_clear"); + this, TQ_SLOT (slotDelete ()), ac, "edit_clear"); - m_actionSelectAll = KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT (slotSelectAll ()), ac); - m_actionDeselect = KStdAction::deselect (TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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 ()), - TQT_TQOBJECT(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 bc408f2c..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 (TQT_TQOBJECT(this), TQT_SLOT (slotNew ()), ac); - m_actionOpen = KStdAction::open (TQT_TQOBJECT(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 (TQT_TQOBJECT(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 (TQT_TQOBJECT(this), TQT_SLOT (slotSave ()), ac); - m_actionSaveAs = KStdAction::saveAs (TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT (slotExport ()), ac, "file_export"); + this, TQ_SLOT (slotExport ()), ac, "file_export"); m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0, - TQT_TQOBJECT(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 (), - TQT_TQOBJECT(this), TQT_SLOT (slotReload ()), ac, "file_revert"); + this, TQ_SLOT (slotReload ()), ac, "file_revert"); slotEnableReload (); - m_actionPrint = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT (slotPrint ()), ac); - m_actionPrintPreview = KStdAction::printPreview (TQT_TQOBJECT(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 (TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); + this, TQ_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); - m_actionClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotClose ()), ac); - m_actionQuit = KStdAction::quit (TQT_TQOBJECT(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 db2a9b01..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, - TQT_TQOBJECT(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 &)), - TQT_TQOBJECT(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 cb3bca73..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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT (slotCrop ()), ac, "image_crop"); + this, TQ_SLOT (slotCrop ()), ac, "image_crop"); m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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 b3a7448e..c3fe3025 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -57,19 +57,19 @@ void kpMainWindow::setupSettingsMenuActions () createStandardStatusBarAction (); - m_actionFullScreen = KStdAction::fullScreen (TQT_TQOBJECT(this), TQT_SLOT (slotFullScreen ()), ac, + m_actionFullScreen = KStdAction::fullScreen (this, TQ_SLOT (slotFullScreen ()), ac, this/*window*/); m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0, - TQT_TQOBJECT(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 (TQT_TQOBJECT(this), TQT_SLOT (slotKeyBindings ()), ac); - m_actionConfigureToolbars = KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT (slotConfigureToolBars ()), ac); - // m_actionConfigure = KStdAction::preferences (TQT_TQOBJECT(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 9fd87672..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*/, - TQT_TQOBJECT(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*/, - TQT_TQOBJECT(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*/, - TQT_TQOBJECT(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*/, - TQT_TQOBJECT(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*/, - TQT_TQOBJECT(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*/, - TQT_TQOBJECT(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 50bd74ed..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), - TQT_TQOBJECT(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), - TQT_TQOBJECT(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), - TQT_TQOBJECT(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), - TQT_TQOBJECT(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 f76b6183..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 (TQT_TQOBJECT(this), TQT_SLOT (slotActualSize ()), ac); - /*m_actionFitToPage = KStdAction::fitToPage (TQT_TQOBJECT(this), TQT_SLOT (slotFitToPage ()), ac); - m_actionFitToWidth = KStdAction::fitToWidth (TQT_TQOBJECT(this), TQT_SLOT (slotFitToWidth ()), ac); - m_actionFitToHeight = KStdAction::fitToHeight (TQT_TQOBJECT(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 (TQT_TQOBJECT(this), TQT_SLOT (slotZoomIn ()), ac); - m_actionZoomOut = KStdAction::zoomOut (TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, TQT_TQOBJECT(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 ()), - TQT_TQOBJECT(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)), - TQT_TQOBJECT(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)), - TQT_TQOBJECT(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/kpselection.cpp b/kolourpaint/kpselection.cpp index 2728f3cb..32434e9d 100644 --- a/kolourpaint/kpselection.cpp +++ b/kolourpaint/kpselection.cpp @@ -784,7 +784,7 @@ TQPixmap kpSelection::transparentForegroundTextPixmap () const // we can identify the transparent pixels for manually creating // the mask. pixmapPainter.setPen ( - TQColor (mostContrastingRGB (m_textStyle.effectiveBackgroundColor ().toTQRgb () & TQRGB_MASK))); + TQColor (mostContrastingRGB (m_textStyle.effectiveBackgroundColor ().toTQRgb () & TQT_RGB_MASK))); pixmapPainter.setFont (font); @@ -1435,7 +1435,7 @@ void kpSelection::flip (bool horiz, bool vert) #if DEBUG_KP_SELECTION && 1 kdDebug () << "\thave transparency mask - flipping that" << endl; #endif - kpPixmapFX::flip (TQT_TQPIXMAP(&m_transparencyMask), horiz, vert); + kpPixmapFX::flip (&m_transparencyMask, horiz, vert); } diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h index eb5025ae..17ad0461 100644 --- a/kolourpaint/kpselection.h +++ b/kolourpaint/kpselection.h @@ -54,7 +54,7 @@ class TQSize; */ class kpSelection : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpselectiondrag.h b/kolourpaint/kpselectiondrag.h index 3a6f88b7..edda7089 100644 --- a/kolourpaint/kpselectiondrag.h +++ b/kolourpaint/kpselectiondrag.h @@ -37,7 +37,7 @@ class kpSelectionDrag : public TQImageDrag { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpsinglekeytriggersaction.h b/kolourpaint/kpsinglekeytriggersaction.h index 51784672..03389eb8 100644 --- a/kolourpaint/kpsinglekeytriggersaction.h +++ b/kolourpaint/kpsinglekeytriggersaction.h @@ -59,7 +59,7 @@ protected: class kpSingleKeyTriggersAction : public TDEAction, public kpSingleKeyTriggersActionInterface { -Q_OBJECT +TQ_OBJECT public: 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/kpthumbnail.h b/kolourpaint/kpthumbnail.h index f74403e4..79b6483d 100644 --- a/kolourpaint/kpthumbnail.h +++ b/kolourpaint/kpthumbnail.h @@ -37,7 +37,7 @@ class kpThumbnailView; class kpThumbnail : public TQDockWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index fea1cf58..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 &))); } @@ -942,7 +942,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e) // state of all the buttons - not just the one that triggered the event (button()) TQt::ButtonState buttonState = e->stateAfter (); - if (m_mainWindow && e->button () == Qt::MidButton) + if (m_mainWindow && e->button () == TQt::MidButton) { const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection); #if DEBUG_KP_TOOL && 1 @@ -1133,7 +1133,7 @@ void kpTool::mouseReleaseEvent (TQMouseEvent *e) endDrawInternal (m_currentPoint, TQRect (m_startPoint, m_currentPoint).normalize ()); } - if ((e->stateAfter () & Qt::MouseButtonMask) == 0) + if ((e->stateAfter () & TQt::MouseButtonMask) == 0) { releasedAllButtons (); } @@ -1239,7 +1239,7 @@ void kpTool::keyPressEvent (TQKeyEvent *e) // TODO: what about the modifiers TQMouseEvent me (TQEvent::MouseButtonPress, view->mapFromGlobal (TQCursor::pos ()), - Qt::LeftButton, + TQt::LeftButton, 0); mousePressEvent (&me); e->accept (); @@ -1336,8 +1336,8 @@ void kpTool::keyReleaseEvent (TQKeyEvent *e) { TQMouseEvent me (TQEvent::MouseButtonRelease, view->mapFromGlobal (TQCursor::pos ()), - Qt::LeftButton, - Qt::LeftButton); + TQt::LeftButton, + TQt::LeftButton); mouseReleaseEvent (&me); e->accept (); } @@ -1469,17 +1469,17 @@ void kpTool::leaveEvent (TQEvent *) int kpTool::mouseButton (const TQt::ButtonState &buttonState) { // we have nothing to do with mid-buttons - if (buttonState & Qt::MidButton) + if (buttonState & TQt::MidButton) return -1; // both left & right together is quite meaningless... - TQt::ButtonState bothButtons = (TQt::ButtonState) (Qt::LeftButton | Qt::RightButton); + TQt::ButtonState bothButtons = (TQt::ButtonState) (TQt::LeftButton | TQt::RightButton); if ((buttonState & bothButtons) == bothButtons) return -1; - if (buttonState & Qt::LeftButton) + if (buttonState & TQt::LeftButton) return 0; - else if (buttonState & Qt::RightButton) + else if (buttonState & TQt::RightButton) return 1; else return -1; diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h index 2a630144..36fc6cb0 100644 --- a/kolourpaint/kptool.h +++ b/kolourpaint/kptool.h @@ -57,7 +57,7 @@ class kpToolToolBar; // Base class for all tools class kpTool : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp index c130c0d9..8447b966 100644 --- a/kolourpaint/kpview.cpp +++ b/kolourpaint/kpview.cpp @@ -122,7 +122,7 @@ kpView::kpView (kpDocument *document, setBackgroundMode (TQt::NoBackground); // no flicker - setFocusPolicy (TQ_WheelFocus); + setFocusPolicy (TQWidget::WheelFocus); setMouseTracking (true); // mouseMoveEvent's even when no mousebtn down setKeyCompression (true); setInputMethodEnabled (true); // ensure using InputMethod @@ -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 ())); } } @@ -969,7 +969,7 @@ void kpView::mouseMoveEvent (TQMouseEvent *e) // TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the // mainView, landing on top of the thumbnailView cleverly put on top // of the mainView. - setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())); + setHasMouse (rect ().contains (e->pos ())); if (tool ()) tool ()->mouseMoveEvent (e); @@ -1003,7 +1003,7 @@ void kpView::mouseReleaseEvent (TQMouseEvent *e) << endl; #endif - setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())); + setHasMouse (rect ().contains (e->pos ())); if (tool ()) tool ()->mouseReleaseEvent (e); @@ -1343,7 +1343,7 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec destPixmapPainter.setRasterOp (TQt::XorROP); destPixmapPainter.setPen (TQPen (TQt::white, 1, TQt::DotLine)); - destPixmapPainter.setBackgroundMode (Qt::OpaqueMode); + destPixmapPainter.setBackgroundMode (TQt::OpaqueMode); destPixmapPainter.setBackgroundColor (TQt::blue); TQBitmap maskBitmap; diff --git a/kolourpaint/kpview.h b/kolourpaint/kpview.h index a43eb12e..23fca33c 100644 --- a/kolourpaint/kpview.h +++ b/kolourpaint/kpview.h @@ -58,7 +58,7 @@ class kpViewScrollableContainer; */ class kpView : public TQWidget { -Q_OBJECT +TQ_OBJECT public: 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/kpviewmanager.h b/kolourpaint/kpviewmanager.h index d609d7d6..43379162 100644 --- a/kolourpaint/kpviewmanager.h +++ b/kolourpaint/kpviewmanager.h @@ -46,7 +46,7 @@ class kpTempPixmap; class kpViewManager : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp index 50d6ec9c..47c842d9 100644 --- a/kolourpaint/kpviewscrollablecontainer.cpp +++ b/kolourpaint/kpviewscrollablecontainer.cpp @@ -234,7 +234,7 @@ void kpGrip::keyReleaseEvent (TQKeyEvent *e) void kpGrip::mousePressEvent (TQMouseEvent *e) { if (m_startPoint == KP_INVALID_POINT && - (e->stateAfter () & Qt::MouseButtonMask) == Qt::LeftButton) + (e->stateAfter () & TQt::MouseButtonMask) == TQt::LeftButton) { m_startPoint = e->pos (); m_currentPoint = e->pos (); @@ -290,7 +290,7 @@ void kpGrip::mouseMoveEvent (TQMouseEvent *e) if (m_startPoint == KP_INVALID_POINT) { - if ((e->stateAfter () & Qt::MouseButtonMask) == 0) + if ((e->stateAfter () & TQt::MouseButtonMask) == 0) setUserMessage (haventBegunDrawUserMessage ()); return; } @@ -320,7 +320,7 @@ void kpGrip::mouseReleaseEvent (TQMouseEvent *e) (m_type & Bottom) ? dy : 0); } - if ((e->stateAfter () & Qt::MouseButtonMask) == 0) + if ((e->stateAfter () & TQt::MouseButtonMask) == 0) { m_shouldReleaseMouseButtons = false; setUserMessage (TQString()); @@ -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/kpviewscrollablecontainer.h b/kolourpaint/kpviewscrollablecontainer.h index ea6783dc..ff2f9aec 100644 --- a/kolourpaint/kpviewscrollablecontainer.h +++ b/kolourpaint/kpviewscrollablecontainer.h @@ -47,7 +47,7 @@ class kpMainWindow; // TODO: refactor by sharing iface's with kpTool class kpGrip : public TQWidget { -Q_OBJECT +TQ_OBJECT public: @@ -115,7 +115,7 @@ protected: class kpViewScrollableContainer : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/patches/checkerboard-faster-render.diff b/kolourpaint/patches/checkerboard-faster-render.diff index 8c9c6402..824106ca 100644 --- a/kolourpaint/patches/checkerboard-faster-render.diff +++ b/kolourpaint/patches/checkerboard-faster-render.diff @@ -34,17 +34,17 @@ QPainter::fillRect(). QPainter::drawPixmap() seems much faster. For + { + for (int x = 0; x < rep; x++) + { -+ QColor col; ++ TQColor col; + + if ((parityAsInt + x + y) % 2) + { + if (!isPreview) -+ col = QColor (213, 213, 213); ++ col = TQColor (213, 213, 213); + else -+ col = QColor (224, 224, 224); ++ col = TQColor (224, 224, 224); + } + else -+ col = Qt::white; ++ col = TQt::white; + + painter.fillRect (x * cellSize, y * cellSize, + cellSize, cellSize, diff --git a/kolourpaint/patches/color_eraser_speedup.diff b/kolourpaint/patches/color_eraser_speedup.diff index d57ece28..b6e51d5d 100644 --- a/kolourpaint/patches/color_eraser_speedup.diff +++ b/kolourpaint/patches/color_eraser_speedup.diff @@ -64,7 +64,7 @@ diff -u -p -r1.9 kptoolpen.cpp + painter.begin (&pixmap); painter.setPen (color (m_mouseButton)); -- QImage image; +- TQImage image; - if (m_mode & WashesPixmaps) - { #if DEBUG_KP_TOOL_PEN @@ -83,8 +83,8 @@ diff -u -p -r1.9 kptoolpen.cpp @@ -453,10 +451,21 @@ void kpToolPen::draw (const QPoint &this else if (m_mode & (DrawsPixmaps | WashesPixmaps)) { - QRgb colorToReplace; -+ QImage image; + TQRgb colorToReplace; ++ TQImage image; + QRegion region; if (m_mode & WashesPixmaps) diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff index 6398e47a..a3593b95 100644 --- a/kolourpaint/patches/doc_resize_no_flicker.diff +++ b/kolourpaint/patches/doc_resize_no_flicker.diff @@ -118,9 +118,9 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp // protected -void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect ( -- QWidget *widget, const QRect &resizeLineViewRect) +- TQWidget *widget, const QRect &resizeLineViewRect) +void kpViewScrollableContainer::repaintWidgetRegion ( -+ QWidget *widget, ++ TQWidget *widget, + const QRegion &viewRegion) { - const QRect resizeLineGlobalRect = mapViewToGlobal (resizeLineViewRect); @@ -144,7 +144,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp + + if (!redrawWidgetRegion.isEmpty ()) { - // TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)" + // TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)" // but for some reason, doesn't work for viewport(). const bool erase = !dynamic_cast <kpView *> (widget); - widget->repaint (redrawWidgetRect, erase); @@ -153,7 +153,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp } // protected --void kpViewScrollableContainer::repaintWidgetAtResizeLines (QWidget *widget) +-void kpViewScrollableContainer::repaintWidgetAtResizeLines (TQWidget *widget) +void kpViewScrollableContainer::eraseResizeLines (const QRegion &viewRegion) { - repaintWidgetAtResizeLineViewRect (widget, rightResizeLineRect ()); @@ -202,25 +202,25 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp + QPainter p (viewport (), true/*unclipped*/); - p.setRasterOp (Qt::NotROP); + p.setRasterOp (TQt::NotROP); - const QRect rightRect = rightResizeLineRect (); - if (rightRect.isValid ()) -- p.fillRect (mapViewToViewport (rightRect), Qt::white); +- p.fillRect (mapViewToViewport (rightRect), TQt::white); - - const QRect bottomRect = bottomResizeLineRect (); - if (bottomRect.isValid ()) -- p.fillRect (mapViewToViewport (bottomRect), Qt::white); +- p.fillRect (mapViewToViewport (bottomRect), TQt::white); - - const QRect bottomRightRect = bottomRightResizeLineRect (); - if (bottomRightRect.isValid ()) -- p.fillRect (mapViewToViewport (bottomRightRect), Qt::white); +- p.fillRect (mapViewToViewport (bottomRightRect), TQt::white); + const QMemArray <QRect> rects = mapViewToViewport (viewRegion).rects (); + for (QMemArray <QRect>::ConstIterator it = rects.begin (); + it != rects.end (); + it++) + { -+ p.fillRect (*it, Qt::white); ++ p.fillRect (*it, TQt::white); + } p.end (); @@ -353,8 +353,8 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp + } +#endif + - updateResizeLines (QMAX (1, TQMAX (m_view->width () + viewDX, m_view->zoomDocToViewX (1))), - QMAX (1, TQMAX (m_view->height () + viewDY, m_view->zoomDocToViewY (1))), + updateResizeLines (TQMAX (1, TQMAX (m_view->width () + viewDX, m_view->zoomDocToViewX (1))), + TQMAX (1, TQMAX (m_view->height () + viewDY, m_view->zoomDocToViewY (1))), viewDX, viewDY); emit continuedDocResize (newDocSize ()); @@ -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; @@ -455,7 +455,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp + } +} + -+// protected virtual [base QWidget] ++// protected virtual [base TQWidget] +void kpViewScrollableContainer::windowActivationChange (bool wasActive) +{ +#if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER && 1 @@ -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 ())); +} + + @@ -502,11 +502,11 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h QRect mapViewToGlobal (const QRect &viewRect); + QRegion mapViewToGlobal (const QRegion &viewRegion); -- void repaintWidgetAtResizeLineViewRect (QWidget *widget, +- void repaintWidgetAtResizeLineViewRect (TQWidget *widget, - const QRect &resizeLineViewRect); -- void repaintWidgetAtResizeLines (QWidget *widget); +- void repaintWidgetAtResizeLines (TQWidget *widget); - void eraseResizeLines (); -+ void repaintWidgetRegion (QWidget *widget, ++ void repaintWidgetRegion (TQWidget *widget, + const QRegion &viewRegion); + void eraseResizeLines (const QRegion &viewRegion); @@ -519,7 +519,7 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h virtual void viewportPaintEvent (QPaintEvent *e); virtual void paintEvent (QPaintEvent *e); -+protected Q_SLOTS: ++protected slots: + void windowActivationChanged (); +protected: + virtual void windowActivationChange (bool wasActive); @@ -534,7 +534,7 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h int m_resizeRoundedLastViewDX, m_resizeRoundedLastViewDY; + int m_resizeLinesDontPaintClever; bool m_haveMovedFromOriginalDocSize; - QString m_gripStatusMessage; + TQString m_gripStatusMessage; }; Index: kpwidgetmapper.cpp =================================================================== @@ -551,11 +551,11 @@ diff -u -p -r1.1 kpwidgetmapper.cpp #include <qwidget.h> -@@ -54,6 +55,17 @@ QRect fromGlobal (const QWidget *widget, +@@ -54,6 +55,17 @@ QRect fromGlobal (const TQWidget *widget, return QRect (topLeft.x (), topLeft.y (), rect.width (), rect.height ()); } -+QRegion fromGlobal (const QWidget *widget, const QRegion ®ion) ++QRegion fromGlobal (const TQWidget *widget, const QRegion ®ion) +{ + if (!widget || region.isEmpty ()) + return region; @@ -567,13 +567,13 @@ diff -u -p -r1.1 kpwidgetmapper.cpp +} + - QPoint toGlobal (const QWidget *widget, const QPoint &point) + QPoint toGlobal (const TQWidget *widget, const QPoint &point) { -@@ -72,5 +84,16 @@ QRect toGlobal (const QWidget *widget, c +@@ -72,5 +84,16 @@ QRect toGlobal (const TQWidget *widget, c return QRect (topLeft.x (), topLeft.y (), rect.width (), rect.height ()); } -+QRegion toGlobal (const QWidget *widget, const QRegion ®ion) ++QRegion toGlobal (const TQWidget *widget, const QRegion ®ion) +{ + if (!widget || region.isEmpty ()) + return region; @@ -594,7 +594,7 @@ diff -u -p -r1.1 kpwidgetmapper.h --- kpwidgetmapper.h 10 Jul 2004 11:38:09 -0000 1.1 +++ kpwidgetmapper.h 30 Jul 2004 11:37:21 -0000 @@ -32,15 +32,18 @@ - class QWidget; + class TQWidget; class QPoint; class QRect; +class QRegion; @@ -602,13 +602,13 @@ diff -u -p -r1.1 kpwidgetmapper.h namespace kpWidgetMapper { - QPoint fromGlobal (const QWidget *widget, const QPoint &point); - QRect fromGlobal (const QWidget *widget, const QRect &rect); -+ QRegion fromGlobal (const QWidget *widget, const QRegion ®ion); + QPoint fromGlobal (const TQWidget *widget, const QPoint &point); + QRect fromGlobal (const TQWidget *widget, const QRect &rect); ++ QRegion fromGlobal (const TQWidget *widget, const QRegion ®ion); - QPoint toGlobal (const QWidget *widget, const QPoint &point); - QRect toGlobal (const QWidget *widget, const QRect &rect); -+ QRegion toGlobal (const QWidget *widget, const QRegion ®ion); + QPoint toGlobal (const TQWidget *widget, const QPoint &point); + QRect toGlobal (const TQWidget *widget, const QRect &rect); ++ QRegion toGlobal (const TQWidget *widget, const QRegion ®ion); } diff --git a/kolourpaint/pixmapfx/kpcoloreffect.h b/kolourpaint/pixmapfx/kpcoloreffect.h index 793978de..d92fee5c 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.h +++ b/kolourpaint/pixmapfx/kpcoloreffect.h @@ -73,7 +73,7 @@ private: class kpColorEffectWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: 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/kpeffectbalance.h b/kolourpaint/pixmapfx/kpeffectbalance.h index 2357a72c..17155cfb 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.h +++ b/kolourpaint/pixmapfx/kpeffectbalance.h @@ -73,7 +73,7 @@ protected: class kpEffectBalanceWidget : public kpColorEffectWidget { -Q_OBJECT +TQ_OBJECT public: 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/kpeffectblursharpen.h b/kolourpaint/pixmapfx/kpeffectblursharpen.h index 5f42b712..0c4e148c 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.h +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.h @@ -73,7 +73,7 @@ protected: class kpEffectBlurSharpenWidget : public kpColorEffectWidget { -Q_OBJECT +TQ_OBJECT public: 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/kpeffectemboss.h b/kolourpaint/pixmapfx/kpeffectemboss.h index dfb4847e..fbd9f3fc 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.h +++ b/kolourpaint/pixmapfx/kpeffectemboss.h @@ -65,7 +65,7 @@ protected: class kpEffectEmbossWidget : public kpColorEffectWidget { -Q_OBJECT +TQ_OBJECT public: 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/kpeffectflatten.h b/kolourpaint/pixmapfx/kpeffectflatten.h index 78252f5d..0b471b0b 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.h +++ b/kolourpaint/pixmapfx/kpeffectflatten.h @@ -75,7 +75,7 @@ protected: class kpEffectFlattenWidget : public kpColorEffectWidget { -Q_OBJECT +TQ_OBJECT public: 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/kpeffectinvert.h b/kolourpaint/pixmapfx/kpeffectinvert.h index cfe5b6b5..1c975ddf 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.h +++ b/kolourpaint/pixmapfx/kpeffectinvert.h @@ -90,7 +90,7 @@ protected: class kpEffectInvertWidget : public kpColorEffectWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index 910e78ac..528acf27 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp @@ -154,10 +154,10 @@ TQImage convertImageDepth (const TQImage &image, int depth, bool dither) TQImage retImage = image.convertDepth (depth, - Qt::AutoColor | - (dither ? Qt::DiffuseDither : Qt::ThresholdDither) | - Qt::ThresholdAlphaDither | - (dither ? Qt::PreferDither : Qt::AvoidDither)); + TQt::AutoColor | + (dither ? TQt::DiffuseDither : TQt::ThresholdDither) | + TQt::ThresholdAlphaDither | + (dither ? TQt::PreferDither : TQt::AvoidDither)); #if DEBUG_KP_EFFECT_REDUCE_COLORS && 0 kdDebug () << "After colour reduction:" << endl; @@ -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/kpeffectreducecolors.h b/kolourpaint/pixmapfx/kpeffectreducecolors.h index 0dfd18e2..3be807b0 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.h +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.h @@ -72,7 +72,7 @@ protected: class kpEffectReduceColorsWidget : public kpColorEffectWidget { -Q_OBJECT +TQ_OBJECT public: 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/pixmapfx/kpeffectsdialog.h b/kolourpaint/pixmapfx/kpeffectsdialog.h index a0621a70..4432e18c 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.h +++ b/kolourpaint/pixmapfx/kpeffectsdialog.h @@ -47,7 +47,7 @@ class kpMainWindow; class kpEffectsDialog : public kpToolPreviewDialog { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index ac5fca44..cbc69b1d 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/kolourpaint/pixmapfx/kppixmapfx.cpp @@ -694,9 +694,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, 0, 0, destRect.width (), destRect.height ()); #else - bitBlt (TQT_TQPAINTDEVICE(destPixmapPtr), + bitBlt (destPixmapPtr, destRect.x (), destRect.y (), - TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&srcPixmap)), + const_cast<TQPixmap*>(&srcPixmap), 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, @@ -705,9 +705,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, if (srcPixmap.mask ()) { TQBitmap mask = getNonNullMask (*destPixmapPtr); - bitBlt (TQT_TQPAINTDEVICE(&mask), + bitBlt (&mask, destRect.x (), destRect.y (), - TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.mask ())), + const_cast<TQBitmap*>(srcPixmap.mask ()), 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h index c1d77159..0f60861a 100644 --- a/kolourpaint/tools/kptoolaction.h +++ b/kolourpaint/tools/kptoolaction.h @@ -37,7 +37,7 @@ class kpToolAction : public TDEToggleAction, public kpSingleKeyTriggersActionInterface { -Q_OBJECT +TQ_OBJECT public: 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/kptoolairspray.h b/kolourpaint/tools/kptoolairspray.h index e74159ca..ebafd075 100644 --- a/kolourpaint/tools/kptoolairspray.h +++ b/kolourpaint/tools/kptoolairspray.h @@ -46,7 +46,7 @@ class kpViewManager; class kpToolAirSpray : public kpTool { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolbrush.h b/kolourpaint/tools/kptoolbrush.h index 425b558a..6c7e6f4f 100644 --- a/kolourpaint/tools/kptoolbrush.h +++ b/kolourpaint/tools/kptoolbrush.h @@ -33,7 +33,7 @@ class kpToolBrush : public kpToolPen { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolcolorpicker.h b/kolourpaint/tools/kptoolcolorpicker.h index 47601860..b8e16a41 100644 --- a/kolourpaint/tools/kptoolcolorpicker.h +++ b/kolourpaint/tools/kptoolcolorpicker.h @@ -41,7 +41,7 @@ class kpColorToolBar; class kpToolColorPicker : public kpTool { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolcolorwasher.h b/kolourpaint/tools/kptoolcolorwasher.h index 41910638..9b183c69 100644 --- a/kolourpaint/tools/kptoolcolorwasher.h +++ b/kolourpaint/tools/kptoolcolorwasher.h @@ -33,7 +33,7 @@ class kpToolColorWasher : public kpToolPen { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolcurve.h b/kolourpaint/tools/kptoolcurve.h index 7510c8fc..2e9a3355 100644 --- a/kolourpaint/tools/kptoolcurve.h +++ b/kolourpaint/tools/kptoolcurve.h @@ -35,7 +35,7 @@ class kpMainWindow; class kpToolCurve : public kpToolPolygon { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolellipse.h b/kolourpaint/tools/kptoolellipse.h index 2ac8db48..574c609c 100644 --- a/kolourpaint/tools/kptoolellipse.h +++ b/kolourpaint/tools/kptoolellipse.h @@ -35,7 +35,7 @@ class kpMainWindow; class kpToolEllipse : public kpToolRectangle { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptooleraser.h b/kolourpaint/tools/kptooleraser.h index f80335ca..f05a7097 100644 --- a/kolourpaint/tools/kptooleraser.h +++ b/kolourpaint/tools/kptooleraser.h @@ -33,7 +33,7 @@ class kpToolEraser : public kpToolPen { -Q_OBJECT +TQ_OBJECT public: 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/kptoolflip.h b/kolourpaint/tools/kptoolflip.h index 1def23bd..b35cbc38 100644 --- a/kolourpaint/tools/kptoolflip.h +++ b/kolourpaint/tools/kptoolflip.h @@ -64,7 +64,7 @@ private: class kpToolFlipDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolfloodfill.h b/kolourpaint/tools/kptoolfloodfill.h index 67ef8446..271060e7 100644 --- a/kolourpaint/tools/kptoolfloodfill.h +++ b/kolourpaint/tools/kptoolfloodfill.h @@ -47,7 +47,7 @@ class kpToolFloodFillCommand; class kpToolFloodFill : public kpTool { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolline.h b/kolourpaint/tools/kptoolline.h index 44b8f5da..66509504 100644 --- a/kolourpaint/tools/kptoolline.h +++ b/kolourpaint/tools/kptoolline.h @@ -35,7 +35,7 @@ class kpMainWindow; class kpToolLine : public kpToolPolygon { -Q_OBJECT +TQ_OBJECT public: 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/kptoolpen.h b/kolourpaint/tools/kptoolpen.h index 9bbcbb37..c7a01e20 100644 --- a/kolourpaint/tools/kptoolpen.h +++ b/kolourpaint/tools/kptoolpen.h @@ -47,7 +47,7 @@ class kpViewManager; class kpToolPen : public kpTool { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp index 00a70b02..65f380c7 100644 --- a/kolourpaint/tools/kptoolpolygon.cpp +++ b/kolourpaint/tools/kptoolpolygon.cpp @@ -79,23 +79,23 @@ static const char *pointArrayToString (const TQPointArray &pointArray) #endif -static TQPen makeMaskPen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle) +static TQPen makeMaskPen (const kpColor &color, int lineWidth, TQt::PenStyle lineStyle) { return TQPen (color.maskColor (), lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle, - Qt::RoundCap, Qt::RoundJoin); + TQt::RoundCap, TQt::RoundJoin); } -static TQPen makePen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle) +static TQPen makePen (const kpColor &color, int lineWidth, TQt::PenStyle lineStyle) { if (color.isOpaque ()) { return TQPen (color.toTQColor (), lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle, - Qt::RoundCap, Qt::RoundJoin); + TQt::RoundCap, TQt::RoundJoin); } else - return Qt::NoPen; + return TQt::NoPen; } static TQBrush makeMaskBrush (const kpColor &foregroundColor, @@ -105,7 +105,7 @@ static TQBrush makeMaskBrush (const kpColor &foregroundColor, if (toolWidgetFillStyle) return toolWidgetFillStyle->maskBrush (foregroundColor, backgroundColor); else - return Qt::NoBrush; + return TQt::NoBrush; } static TQBrush makeBrush (const kpColor &foregroundColor, @@ -115,7 +115,7 @@ static TQBrush makeBrush (const kpColor &foregroundColor, if (toolWidgetFillStyle) return toolWidgetFillStyle->brush (foregroundColor, backgroundColor); else - return Qt::NoBrush; + return TQt::NoBrush; } static bool only1PixelInPointArray (const TQPointArray &points) @@ -135,7 +135,7 @@ static bool only1PixelInPointArray (const TQPointArray &points) static TQPixmap pixmap (const TQPixmap &oldPixmap, const TQPointArray &points, const TQRect &rect, const kpColor &foregroundColor, kpColor backgroundColor, - int lineWidth, Qt::PenStyle lineStyle, + int lineWidth, TQt::PenStyle lineStyle, kpToolWidgetFillStyle *toolWidgetFillStyle, enum kpToolPolygon::Mode mode, bool final = true) { @@ -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; } @@ -652,7 +652,7 @@ void kpToolPolygon::updateShape () TQPixmap newPixmap = pixmap (oldPixmap, m_points, boundingRect, color (m_mouseButton), color (1 - m_mouseButton), - m_lineWidth, Qt::SolidLine, + m_lineWidth, TQt::SolidLine, m_toolWidgetFillStyle, m_mode, false/*not final*/); @@ -790,7 +790,7 @@ void kpToolPolygon::endShape (const TQPoint &, const TQRect &) (text (), m_points, boundingRect, color (m_mouseButton), color (1 - m_mouseButton), - m_lineWidth, Qt::SolidLine, + m_lineWidth, TQt::SolidLine, m_toolWidgetFillStyle, document ()->getPixmapAt (boundingRect), m_mode, @@ -844,7 +844,7 @@ kpToolPolygonCommand::kpToolPolygonCommand (const TQString &name, const TQPointArray &points, const TQRect &normalizedRect, const kpColor &foregroundColor, const kpColor &backgroundColor, - int lineWidth, Qt::PenStyle lineStyle, + int lineWidth, TQt::PenStyle lineStyle, kpToolWidgetFillStyle *toolWidgetFillStyle, const TQPixmap &originalArea, enum kpToolPolygon::Mode mode, diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h index 788b2a31..e6178025 100644 --- a/kolourpaint/tools/kptoolpolygon.h +++ b/kolourpaint/tools/kptoolpolygon.h @@ -59,7 +59,7 @@ class kpViewManager; class kpToolPolygon : public kpTool { -Q_OBJECT +TQ_OBJECT public: @@ -130,7 +130,7 @@ public: const TQPointArray &points, const TQRect &normalizedRect, const kpColor &foregroundColor, const kpColor &backgroundColor, - int lineWidth, Qt::PenStyle lineStyle, + int lineWidth, TQt::PenStyle lineStyle, kpToolWidgetFillStyle *toolWidgetFillStyle, const TQPixmap &originalArea, kpToolPolygon::Mode mode, @@ -148,7 +148,7 @@ private: kpColor m_foregroundColor, m_backgroundColor; int m_lineWidth; - Qt::PenStyle m_lineStyle; + TQt::PenStyle m_lineStyle; kpToolWidgetFillStyle *m_toolWidgetFillStyle; TQPixmap m_originalArea; diff --git a/kolourpaint/tools/kptoolpolyline.h b/kolourpaint/tools/kptoolpolyline.h index 3c49f8fa..e3d719f1 100644 --- a/kolourpaint/tools/kptoolpolyline.h +++ b/kolourpaint/tools/kptoolpolyline.h @@ -35,7 +35,7 @@ class kpMainWindow; class kpToolPolyline : public kpToolPolygon { -Q_OBJECT +TQ_OBJECT public: 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/kptoolpreviewdialog.h b/kolourpaint/tools/kptoolpreviewdialog.h index 42b21701..f5a6b7c9 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.h +++ b/kolourpaint/tools/kptoolpreviewdialog.h @@ -45,7 +45,7 @@ class kpResizeSignallingLabel; class kpToolPreviewDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp index 9e5883ea..efc9cd16 100644 --- a/kolourpaint/tools/kptoolrectangle.cpp +++ b/kolourpaint/tools/kptoolrectangle.cpp @@ -238,7 +238,7 @@ void kpToolRectangle::updatePen (int mouseButton) if (color (mouseButton).isOpaque ()) m_pen [mouseButton] = TQPen (color (mouseButton).toTQColor ()); else - m_pen [mouseButton] = TQPen(Qt::NoPen); + m_pen [mouseButton] = TQPen(TQt::NoPen); m_maskPen [mouseButton] = TQPen (maskPenColor); } else @@ -250,7 +250,7 @@ void kpToolRectangle::updatePen (int mouseButton) TQt::SolidLine); } else - m_pen [mouseButton] = TQPen(Qt::NoPen); + m_pen [mouseButton] = TQPen(TQt::NoPen); m_maskPen [mouseButton] = TQPen (maskPenColor, m_toolWidgetLineWidth->lineWidth (), TQt::SolidLine); @@ -276,8 +276,8 @@ void kpToolRectangle::updateBrush (int mouseButton) } else { - m_brush [mouseButton] = TQBrush(Qt::NoBrush); - m_maskBrush [mouseButton] = TQBrush(Qt::NoBrush); + m_brush [mouseButton] = TQBrush(TQt::NoBrush); + m_maskBrush [mouseButton] = TQBrush(TQt::NoBrush); } } @@ -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/kptoolrectangle.h b/kolourpaint/tools/kptoolrectangle.h index c1f6562b..ede24449 100644 --- a/kolourpaint/tools/kptoolrectangle.h +++ b/kolourpaint/tools/kptoolrectangle.h @@ -49,7 +49,7 @@ class kpViewManager; class kpToolRectangle : public kpTool { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp index 3ced0735..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 ())); } @@ -634,7 +634,7 @@ static void toolButtonSetLook (TQToolButton *button, button->setUsesTextLabel (true); button->setTextLabel (name, false/*no tooltip*/); button->setAccel (TQAccel::shortcutKey (name)); - button->setFocusPolicy (TQ_StrongFocus); + button->setFocusPolicy (TQWidget::StrongFocus); button->setToggleButton (true); } @@ -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/kptoolresizescale.h b/kolourpaint/tools/kptoolresizescale.h index 9f4d96bd..daa63ec8 100644 --- a/kolourpaint/tools/kptoolresizescale.h +++ b/kolourpaint/tools/kptoolresizescale.h @@ -106,7 +106,7 @@ protected: class kpToolResizeScaleDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: 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/kptoolrotate.h b/kolourpaint/tools/kptoolrotate.h index be1b51c6..33ec1389 100644 --- a/kolourpaint/tools/kptoolrotate.h +++ b/kolourpaint/tools/kptoolrotate.h @@ -80,7 +80,7 @@ private: class kpToolRotateDialog : public kpToolPreviewDialog { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptoolroundedrectangle.h b/kolourpaint/tools/kptoolroundedrectangle.h index 2f451521..89d3616d 100644 --- a/kolourpaint/tools/kptoolroundedrectangle.h +++ b/kolourpaint/tools/kptoolroundedrectangle.h @@ -35,7 +35,7 @@ class kpMainWindow; class kpToolRoundedRectangle : public kpToolRectangle { -Q_OBJECT +TQ_OBJECT public: 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/kptoolselection.h b/kolourpaint/tools/kptoolselection.h index ceef111d..81a3093f 100644 --- a/kolourpaint/tools/kptoolselection.h +++ b/kolourpaint/tools/kptoolselection.h @@ -58,7 +58,7 @@ class kpToolWidgetOpaqueOrTransparent; class kpToolSelection : public kpTool { -Q_OBJECT +TQ_OBJECT public: @@ -242,7 +242,7 @@ private: class kpToolSelectionResizeScaleCommand : public TQObject, public kpNamedCommand { -Q_OBJECT +TQ_OBJECT public: 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/tools/kptoolskew.h b/kolourpaint/tools/kptoolskew.h index f1a34025..1f060209 100644 --- a/kolourpaint/tools/kptoolskew.h +++ b/kolourpaint/tools/kptoolskew.h @@ -75,7 +75,7 @@ private: class kpToolSkewDialog : public kpToolPreviewDialog { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/tools/kptooltext.h b/kolourpaint/tools/kptooltext.h index ec2e117a..e1f31009 100644 --- a/kolourpaint/tools/kptooltext.h +++ b/kolourpaint/tools/kptooltext.h @@ -43,7 +43,7 @@ class kpViewManager; class kpToolText : public kpToolSelection { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/views/kpthumbnailview.h b/kolourpaint/views/kpthumbnailview.h index b36cd2eb..eebfb130 100644 --- a/kolourpaint/views/kpthumbnailview.h +++ b/kolourpaint/views/kpthumbnailview.h @@ -40,7 +40,7 @@ */ class kpThumbnailView : public kpView { -Q_OBJECT +TQ_OBJECT public: 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/views/kpunzoomedthumbnailview.h b/kolourpaint/views/kpunzoomedthumbnailview.h index d34b1165..0be89432 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.h +++ b/kolourpaint/views/kpunzoomedthumbnailview.h @@ -54,7 +54,7 @@ class kpViewScrollableContainer; */ /*sealed*/ class kpUnzoomedThumbnailView : public kpThumbnailView { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/views/kpzoomedthumbnailview.h b/kolourpaint/views/kpzoomedthumbnailview.h index 97fd4022..69eb2e1f 100644 --- a/kolourpaint/views/kpzoomedthumbnailview.h +++ b/kolourpaint/views/kpzoomedthumbnailview.h @@ -49,7 +49,7 @@ */ /*sealed*/ class kpZoomedThumbnailView : public kpThumbnailView { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/views/kpzoomedview.h b/kolourpaint/views/kpzoomedview.h index 045fee4c..d15bd898 100644 --- a/kolourpaint/views/kpzoomedview.h +++ b/kolourpaint/views/kpzoomedview.h @@ -50,7 +50,7 @@ */ /*sealed*/ class kpZoomedView : public kpView { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp index 60299475..8dcf7398 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp @@ -256,8 +256,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p, << " colorCubeDiagDist=" << kpColorSimilarityCube::colorCubeDiagonalDistance << endl << "\tbaseBrightness=" << baseBrightness - << " color[0]=" << ((colors [0].rgb () & TQRGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)) - << " color[1]=" << ((colors [1].rgb () & TQRGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)) + << " color[0]=" << ((colors [0].rgb () & TQT_RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)) + << " color[1]=" << ((colors [1].rgb () & TQT_RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)) << endl; #endif 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/kpcolorsimilaritydialog.h b/kolourpaint/widgets/kpcolorsimilaritydialog.h index 29895951..b58ebcbd 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.h +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.h @@ -37,7 +37,7 @@ class kpMainWindow; class kpColorSimilarityDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index d3bb51e1..67e1e7e8 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -462,7 +462,7 @@ static bool ownColorsInitialised = false; #define rows 2 #define cols 11 kpColorCells::kpColorCells (TQWidget *parent, - Qt::Orientation o, + TQt::Orientation o, const char *name) : KColorCells (parent, rows, cols), m_mouseButton (-1) @@ -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) { @@ -514,16 +514,16 @@ kpColorCells::~kpColorCells () { } -Qt::Orientation kpColorCells::orientation () const +TQt::Orientation kpColorCells::orientation () const { return m_orientation; } -void kpColorCells::setOrientation (Qt::Orientation o) +void kpColorCells::setOrientation (TQt::Orientation o) { int c, r; - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { c = cols; r = rows; @@ -588,7 +588,7 @@ void kpColorCells::setOrientation (Qt::Orientation o) int y, x; int pos; - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { y = i / cols; x = i % cols; @@ -660,23 +660,23 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e) TQt::ButtonState button = e->button (); #if DEBUG_KP_COLOR_TOOL_BAR kdDebug () << "kpColorCells::mouseReleaseEvent(left=" - << (button & Qt::LeftButton) + << (button & TQt::LeftButton) << ",right=" - << (button & Qt::RightButton) + << (button & TQt::RightButton) << ")" << endl; #endif - if (!((button & Qt::LeftButton) && (button & Qt::RightButton))) + if (!((button & TQt::LeftButton) && (button & TQt::RightButton))) { - if (button & Qt::LeftButton) + if (button & TQt::LeftButton) m_mouseButton = 0; - else if (button & Qt::RightButton) + else if (button & TQt::RightButton) 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; @@ -783,14 +783,14 @@ void kpTransparentColorCell::mousePressEvent (TQMouseEvent * /*e*/) // protected virtual [base TQWidget] void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e) { - if (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())) + if (rect ().contains (e->pos ())) { - if (e->button () == Qt::LeftButton) + if (e->button () == TQt::LeftButton) { emit transparentColorSelected (0); emit foregroundColorChanged (kpColor::transparent); } - else if (e->button () == Qt::RightButton) + else if (e->button () == TQt::RightButton) { emit transparentColorSelected (1); emit backgroundColorChanged (kpColor::transparent); @@ -819,7 +819,7 @@ void kpTransparentColorCell::drawContents (TQPainter *p) */ kpColorPalette::kpColorPalette (TQWidget *parent, - Qt::Orientation o, + TQt::Orientation o, const char *name) : TQWidget (parent, name), m_boxLayout (0) @@ -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); } @@ -849,18 +849,18 @@ kpColorPalette::~kpColorPalette () } // public -Qt::Orientation kpColorPalette::orientation () const +TQt::Orientation kpColorPalette::orientation () const { return m_orientation; } -void kpColorPalette::setOrientation (Qt::Orientation o) +void kpColorPalette::setOrientation (TQt::Orientation o) { m_colorCells->setOrientation (o); delete m_boxLayout; - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { m_boxLayout = new TQBoxLayout (this, TQBoxLayout::LeftToRight, 0/*margin*/, 5/*spacing*/); m_boxLayout->addWidget (m_transparentColorCell, 0/*stretch*/, TQt::AlignVCenter); @@ -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 @@ -997,7 +997,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, } // virtual -void kpColorToolBar::setOrientation (Qt::Orientation o) +void kpColorToolBar::setOrientation (TQt::Orientation o) { // (TQDockWindow::undock() calls us) bool isOutsideDock = (place () == TQDockWindow::OutsideDock); @@ -1014,7 +1014,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o) o = m_lastDockedOrientation; } - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { m_boxLayout->setDirection (TQBoxLayout::LeftToRight); } diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h index b4d52a18..d3bff1e3 100644 --- a/kolourpaint/widgets/kpcolortoolbar.h +++ b/kolourpaint/widgets/kpcolortoolbar.h @@ -58,7 +58,7 @@ class kpMainWindow; // class kpDualColorButton : public TQFrame { -Q_OBJECT +TQ_OBJECT public: @@ -118,17 +118,17 @@ protected: class kpColorCells : public KColorCells { -Q_OBJECT +TQ_OBJECT public: kpColorCells (TQWidget *parent, - Qt::Orientation o = Qt::Horizontal, + TQt::Orientation o = TQt::Horizontal, const char *name = 0); virtual ~kpColorCells (); - Qt::Orientation orientation () const; - void setOrientation (Qt::Orientation o); + TQt::Orientation orientation () const; + void setOrientation (TQt::Orientation o); signals: void foregroundColorChanged (const TQColor &color); @@ -139,7 +139,7 @@ signals: void backgroundColorChanged (const kpColor &color); protected: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; virtual void dropEvent (TQDropEvent *e); virtual void paintCell (TQPainter *painter, int row, int col); @@ -156,7 +156,7 @@ protected slots: class kpTransparentColorCell : public TQFrame { -Q_OBJECT +TQ_OBJECT public: @@ -184,24 +184,24 @@ protected: class kpColorPalette : public TQWidget { -Q_OBJECT +TQ_OBJECT public: kpColorPalette (TQWidget *parent, - Qt::Orientation o = Qt::Horizontal, + TQt::Orientation o = TQt::Horizontal, const char *name = 0); virtual ~kpColorPalette (); - Qt::Orientation orientation () const; - void setOrientation (Qt::Orientation o); + TQt::Orientation orientation () const; + void setOrientation (TQt::Orientation o); signals: void foregroundColorChanged (const kpColor &color); void backgroundColorChanged (const kpColor &color); protected: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQBoxLayout *m_boxLayout; kpTransparentColorCell *m_transparentColorCell; @@ -211,7 +211,7 @@ protected: class kpColorSimilarityToolBarItem : public kpColorSimilarityCube { -Q_OBJECT +TQ_OBJECT public: @@ -247,7 +247,7 @@ private: class kpColorToolBar : public TDEToolBar { -Q_OBJECT +TQ_OBJECT public: @@ -290,9 +290,9 @@ public slots: private: kpMainWindow *m_mainWindow; - Qt::Orientation m_lastDockedOrientation; + TQt::Orientation m_lastDockedOrientation; bool m_lastDockedOrientationSet; - virtual void setOrientation (Qt::Orientation o); + virtual void setOrientation (TQt::Orientation o); TQBoxLayout *m_boxLayout; kpDualColorButton *m_dualColorButton; diff --git a/kolourpaint/widgets/kpresizesignallinglabel.h b/kolourpaint/widgets/kpresizesignallinglabel.h index 6d876a77..3fd2b1ac 100644 --- a/kolourpaint/widgets/kpresizesignallinglabel.h +++ b/kolourpaint/widgets/kpresizesignallinglabel.h @@ -34,7 +34,7 @@ class kpResizeSignallingLabel : public TQLabel { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h index eeaace62..e601d901 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.h +++ b/kolourpaint/widgets/kpsqueezedtextlabel.h @@ -36,7 +36,7 @@ // not the middle. class kpSqueezedTextLabel : public TQLabel { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index 6e559fa8..0df59f2e 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -72,7 +72,7 @@ protected: // virtual [base TQWidget] void mouseDoubleClickEvent (TQMouseEvent *e) { - if (e->button () == Qt::LeftButton && m_tool) + if (e->button () == TQt::LeftButton && m_tool) m_tool->globalDraw (); } @@ -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; } } @@ -548,11 +548,11 @@ void kpToolToolBar::slotToolActionToolTipChanged () // public slot virtual [base TQDockWindow] -void kpToolToolBar::setOrientation (Qt::Orientation o) +void kpToolToolBar::setOrientation (TQt::Orientation o) { #if DEBUG_KP_TOOL_TOOL_BAR kdDebug () << "kpToolToolBar::setOrientation(" - << (o == Qt::Vertical ? "vertical" : "horizontal") + << (o == TQt::Vertical ? "vertical" : "horizontal") << ") called!" << endl; #endif @@ -575,7 +575,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o) delete m_toolLayout; delete m_baseLayout; - if (o == Qt::Vertical) + if (o == TQt::Vertical) { m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::TopToBottom, 5/*margin*/, @@ -586,7 +586,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o) 0/*margin*/, 0/*spacing*/); } - else // if (o == Qt::Horizontal) + else // if (o == TQt::Horizontal) { m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::LeftToRight, 5/*margin*/, @@ -616,7 +616,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o) { m_baseLayout->addWidget (*it, 0/*stretch*/, - o == Qt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter); + o == TQt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter); } } @@ -624,9 +624,9 @@ void kpToolToolBar::setOrientation (Qt::Orientation o) } // private -void kpToolToolBar::addButton (TQButton *button, Qt::Orientation o, int num) +void kpToolToolBar::addButton (TQButton *button, TQt::Orientation o, int num) { - if (o == Qt::Vertical) + if (o == TQt::Vertical) m_toolLayout->addWidget (button, num / m_vertCols, num % m_vertCols); else { diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h index 5a5f8f7a..ae7de140 100644 --- a/kolourpaint/widgets/kptooltoolbar.h +++ b/kolourpaint/widgets/kptooltoolbar.h @@ -53,7 +53,7 @@ class kpToolWidgetSpraycanSize; class kpToolToolBar : public TDEToolBar { -Q_OBJECT +TQ_OBJECT public: @@ -100,12 +100,12 @@ private slots: void slotToolActionToolTipChanged (); public slots: - virtual void setOrientation (Qt::Orientation o); + virtual void setOrientation (TQt::Orientation o); private: - void addButton (TQButton *button, Qt::Orientation o, int num); + void addButton (TQButton *button, TQt::Orientation o, int num); - Qt::Orientation m_lastDockedOrientation; + TQt::Orientation m_lastDockedOrientation; bool m_lastDockedOrientationSet; int m_vertCols; diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp index e70be6db..25761856 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.cpp +++ b/kolourpaint/widgets/kptoolwidgetbase.cpp @@ -188,7 +188,7 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const << endl; #endif - return tqMakePair (row, col); + return qMakePair (row, col); } // public @@ -541,7 +541,7 @@ void kpToolWidgetBase::mousePressEvent (TQMouseEvent *e) { e->ignore (); - if (e->button () != Qt::LeftButton) + if (e->button () != TQt::LeftButton) return; diff --git a/kolourpaint/widgets/kptoolwidgetbase.h b/kolourpaint/widgets/kptoolwidgetbase.h index bd0847c2..6fd4775a 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.h +++ b/kolourpaint/widgets/kptoolwidgetbase.h @@ -43,7 +43,7 @@ class TQPainter; // TODO: frame becomes a combobox when its parent kpToolToolBar becomes too small class kpToolWidgetBase : public TQFrame { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h index eee631f1..b3fdd4b1 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.h +++ b/kolourpaint/widgets/kptoolwidgetbrush.h @@ -35,7 +35,7 @@ class kpToolWidgetBrush : public kpToolWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.h b/kolourpaint/widgets/kptoolwidgeterasersize.h index e326ee35..1d9c7031 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.h +++ b/kolourpaint/widgets/kptoolwidgeterasersize.h @@ -37,7 +37,7 @@ class kpColor; class kpToolWidgetEraserSize : public kpToolWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp index d13ae932..9cd5c42d 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp @@ -149,7 +149,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs, switch (fs) { case NoFill: - return Qt::NoBrush; + return TQt::NoBrush; break; case FillWithBackground: return TQBrush (backgroundColor.maskColor ()); @@ -158,7 +158,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs, return TQBrush (foregroundColor.maskColor ()); break; default: - return Qt::NoBrush; + return TQt::NoBrush; break; } } @@ -182,22 +182,22 @@ TQBrush kpToolWidgetFillStyle::brushForFillStyle (FillStyle fs, switch (fs) { case NoFill: - return Qt::NoBrush; + return TQt::NoBrush; break; case FillWithBackground: if (backgroundColor.isOpaque ()) return TQBrush (backgroundColor.toTQColor ()); else - return Qt::NoBrush; + return TQt::NoBrush; break; case FillWithForeground: if (foregroundColor.isOpaque ()) return TQBrush (foregroundColor.toTQColor ()); else - return Qt::NoBrush; + return TQt::NoBrush; break; default: - return Qt::NoBrush; + return TQt::NoBrush; break; } } diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.h b/kolourpaint/widgets/kptoolwidgetfillstyle.h index a8b96ee5..bec64d24 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.h +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.h @@ -37,7 +37,7 @@ class kpColor; class kpToolWidgetFillStyle : public kpToolWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.h b/kolourpaint/widgets/kptoolwidgetlinewidth.h index b83e6c0c..a91be73f 100644 --- a/kolourpaint/widgets/kptoolwidgetlinewidth.h +++ b/kolourpaint/widgets/kptoolwidgetlinewidth.h @@ -33,7 +33,7 @@ class kpToolWidgetLineWidth : public kpToolWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h index 175a5f15..9605b89e 100644 --- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h +++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h @@ -34,7 +34,7 @@ class kpToolWidgetOpaqueOrTransparent : public kpToolWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp index d435c72b..d14942e4 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp @@ -79,7 +79,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char { for (int x = 0; x < image.width (); x++) { - if ((image.pixel (x, y) & TQRGB_MASK) == 0/*black*/) + if ((image.pixel (x, y) & TQT_RGB_MASK) == 0/*black*/) painter.drawPoint (x, y); // mark as opaque } } diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.h b/kolourpaint/widgets/kptoolwidgetspraycansize.h index 5f0a9e39..70341cce 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.h +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.h @@ -33,7 +33,7 @@ class kpToolWidgetSpraycanSize : public kpToolWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kooka/README b/kooka/README index 8ae6fa54..1f5d6d10 100644 --- a/kooka/README +++ b/kooka/README @@ -55,7 +55,7 @@ support all, even not very common options, some scanners offer. Lets see what is necessary and makes sense for the purpose of Kooka. * Kooka does not yet have a strategy for very large images :(. It uses -the Qt QImage/QPixmap as is. On some displays, that causes problems. +the Qt TQImage/QPixmap as is. On some displays, that causes problems. * Automatic document feeder (ADF) support is not yet working correctly. 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/dwmenuaction.h b/kooka/dwmenuaction.h index 130933a4..d8bedbb6 100644 --- a/kooka/dwmenuaction.h +++ b/kooka/dwmenuaction.h @@ -42,7 +42,7 @@ */ class dwMenuAction:public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: dwMenuAction( const TQString& text, 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/imageselectline.h b/kooka/imageselectline.h index d385965c..9fd8b9f9 100644 --- a/kooka/imageselectline.h +++ b/kooka/imageselectline.h @@ -42,7 +42,7 @@ class TQStringList; class ImageSelectLine:public TQHBox { - Q_OBJECT + TQ_OBJECT public: ImageSelectLine( TQWidget *parent, const TQString& text ); 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/img_saver.h b/kooka/img_saver.h index 47596472..79f47765 100644 --- a/kooka/img_saver.h +++ b/kooka/img_saver.h @@ -100,7 +100,7 @@ class KookaImage; class FormatDialog:public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FormatDialog( TQWidget *parent, const TQString&, const char * ); @@ -144,7 +144,7 @@ private: **/ class ImgSaver:public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kooka/imgnamecombo.h b/kooka/imgnamecombo.h index 55d9d393..6d9b0b94 100644 --- a/kooka/imgnamecombo.h +++ b/kooka/imgnamecombo.h @@ -40,7 +40,7 @@ class KFileBranch; class ImageNameCombo: public KComboBox { - Q_OBJECT + TQ_OBJECT public: ImageNameCombo( TQWidget* ); diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index a0182457..1c25cc15 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -57,9 +57,9 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n // layout->setMargin( KDialog::marginHint() ); // layout->setSpacing( KDialog::spacingHint() ); - m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this ); + 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/imgprintdialog.h b/kooka/imgprintdialog.h index d3d40ae2..7f39dd43 100644 --- a/kooka/imgprintdialog.h +++ b/kooka/imgprintdialog.h @@ -52,7 +52,7 @@ class TQCheckBox; class ImgPrintDialog: public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: ImgPrintDialog( KookaImage *img, TQWidget *parent=0L, const char* name=0L ); diff --git a/kooka/kadmosocr.h b/kooka/kadmosocr.h index 33656fd3..be525728 100644 --- a/kooka/kadmosocr.h +++ b/kooka/kadmosocr.h @@ -68,7 +68,7 @@ namespace Kadmos { /* ==== CRep ========================================= */ class CRep : public TQObject { - Q_OBJECT + TQ_OBJECT public: CRep(); diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index dc13655f..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); @@ -178,11 +178,11 @@ void KOCRBase::spellCheckIntro() m_spellchkPage = addVBoxPage( i18n("Spell-checking") ); /* Want the spell checking at all? Checkbox here */ - TQGroupBox *gb1 = new TQGroupBox( 1, Qt::Horizontal, i18n("OCR Post Processing"), m_spellchkPage ); + TQGroupBox *gb1 = new TQGroupBox( 1, TQt::Horizontal, i18n("OCR Post Processing"), m_spellchkPage ); m_cbWantCheck = new TQCheckBox( i18n("Enable spell-checking for validation of the OCR result"), gb1 ); /* Spellcheck options */ - m_gbSpellOpts = new TQGroupBox( 1, Qt::Horizontal, i18n("Spell-Check Options"), + m_gbSpellOpts = new TQGroupBox( 1, TQt::Horizontal, i18n("Spell-Check Options"), m_spellchkPage ); KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false ); @@ -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/kocrbase.h b/kooka/kocrbase.h index 615ef05f..d1c35ebc 100644 --- a/kooka/kocrbase.h +++ b/kooka/kocrbase.h @@ -53,7 +53,7 @@ class TQGroupBox; class KOCRBase: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KOCRBase( TQWidget *, KSpellConfig *spellConfig, diff --git a/kooka/kocrgocr.h b/kooka/kocrgocr.h index cfc5663d..06ee0380 100644 --- a/kooka/kocrgocr.h +++ b/kooka/kocrgocr.h @@ -44,7 +44,7 @@ class KSpellConfig; class KGOCRDialog: public KOCRBase { - Q_OBJECT + TQ_OBJECT public: KGOCRDialog( TQWidget*, KSpellConfig* ); diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 17ef016f..b5ef9da4 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -279,26 +279,26 @@ EngineError KadmosDialog::setupGui() (void) new TQLabel( i18n("Please classify the font type and language of the text on the image:"), page ); TQHBox *locBox = new TQHBox( page ); - m_bbFont = new TQButtonGroup(1, Qt::Horizontal, i18n("Font Type Selection"), locBox); + m_bbFont = new TQButtonGroup(1, TQt::Horizontal, i18n("Font Type Selection"), locBox); m_rbMachine = new TQRadioButton( i18n("Machine print"), m_bbFont ); m_rbHand = new TQRadioButton( i18n("Hand writing"), m_bbFont ); m_rbNorm = new TQRadioButton( i18n("Norm font"), m_bbFont ); - m_gbLang = new TQGroupBox(1, Qt::Horizontal, i18n("Country"), locBox); + m_gbLang = new TQGroupBox(1, TQt::Horizontal, i18n("Country"), locBox); 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); /* --- */ TQHBox *innerBox = new TQHBox( page ); innerBox->setSpacing( KDialog::spacingHint()); - TQButtonGroup *cbGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Modifier"), innerBox ); + TQButtonGroup *cbGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("OCR Modifier"), innerBox ); TQ_CHECK_PTR(cbGroup); m_cbNoise = new TQCheckBox( i18n( "Enable automatic noise reduction" ), cbGroup ); diff --git a/kooka/kocrkadmos.h b/kooka/kocrkadmos.h index 4d6d5ce9..95b2c6f5 100644 --- a/kooka/kocrkadmos.h +++ b/kooka/kocrkadmos.h @@ -65,7 +65,7 @@ private: class KadmosDialog: public KOCRBase { - Q_OBJECT + TQ_OBJECT public: KadmosDialog( TQWidget *, KSpellConfig *spellConfig ); 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/kocrocrad.h b/kooka/kocrocrad.h index 22b4fa1f..eeda40dc 100644 --- a/kooka/kocrocrad.h +++ b/kooka/kocrocrad.h @@ -54,7 +54,7 @@ class TQComboBox; class ocradDialog: public KOCRBase { - Q_OBJECT + TQ_OBJECT public: ocradDialog( TQWidget*, KSpellConfig* ); diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 845df5fc..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(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(m_view), TQT_SLOT( slCreateNewImgFromSelection() ), + m_view, TQ_SLOT( slCreateNewImgFromSelection() ), actionCollection(), "createFromSelection" ); (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ), + this, TQ_SLOT( slMirrorVertical() ), actionCollection(), "mirrorVertical" ); (void) new TDEAction(i18n("&Mirror Image Horizontally"), "mirror-horiz", CTRL+Key_M, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ), + this, TQ_SLOT( slMirrorHorizontal() ), actionCollection(), "mirrorHorizontal" ); (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ), + this, TQ_SLOT( slMirrorBoth() ), actionCollection(), "mirrorBoth" ); (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "document-open", CTRL+Key_G, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(m_view), TQT_SLOT( slSelectDevice()), + m_view, TQ_SLOT( slSelectDevice()), actionCollection(), "selectsource" ); (void) new TDEAction( i18n("Enable All Warnings && Messages"), 0, - TQT_TQOBJECT(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/kooka.h b/kooka/kooka.h index 7c44f748..780e360c 100644 --- a/kooka/kooka.h +++ b/kooka/kooka.h @@ -54,7 +54,7 @@ class KookaView; */ class Kooka : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp index 14e6ef83..b12adcf4 100644 --- a/kooka/kookaimage.cpp +++ b/kooka/kookaimage.cpp @@ -300,7 +300,7 @@ bool KookaImage::loadTiffDir( const TQString& filename, int no ) float yScalefactor = xReso / yReso; kdDebug(28000) << "Different resolution x/y, rescaling with factor " << yScalefactor << endl; /* rescale the image */ - *this = smoothScale( imgWidth, int(imgHeight*yScalefactor), TQ_ScaleFree ); + *this = smoothScale( imgWidth, int(imgHeight*yScalefactor), TQImage::ScaleFree ); } else { @@ -308,7 +308,7 @@ bool KookaImage::loadTiffDir( const TQString& filename, int no ) float scalefactor = yReso / xReso; kdDebug(28000) << "Different resolution x/y, rescaling x with factor " << scalefactor << endl; /* rescale the image */ - *this = smoothScale( int(imgWidth*scalefactor), imgHeight, TQ_ScaleFree ); + *this = smoothScale( int(imgWidth*scalefactor), imgHeight, TQImage::ScaleFree ); } } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index 1cb421a9..e8900668 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -86,7 +86,7 @@ void KookaPreferences::setupOCRPage() /* * Switch ocr engines */ - TQButtonGroup *engGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Engine to Use"), page ); + TQButtonGroup *engGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("OCR Engine to Use"), page ); m_gocrBut = new TQRadioButton( i18n("GOCR engine") , engGroup ); m_kadmosBut = new TQRadioButton( i18n("KADMOS engine"), engGroup ); m_ocradBut = new TQRadioButton( i18n("OCRAD engine"), engGroup ); @@ -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/kookapref.h b/kooka/kookapref.h index be7954c1..35f59acd 100644 --- a/kooka/kookapref.h +++ b/kooka/kookapref.h @@ -46,7 +46,7 @@ class TQCheckBox; class KookaPreferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KookaPreferences(); diff --git a/kooka/kookaprint.cpp b/kooka/kookaprint.cpp index 2a8cdfba..84f7faed 100644 --- a/kooka/kookaprint.cpp +++ b/kooka/kookaprint.cpp @@ -112,7 +112,7 @@ bool KookaPrint::printImage( KookaImage *img ) kdDebug(28000) << "Scaling to printer size " << newWidth << " x " << newHeight << endl; - tmpImg = img->smoothScale(newWidth, newHeight, TQ_ScaleFree); + tmpImg = img->smoothScale(newWidth, newHeight, TQImage::ScaleFree); TQSize sz = tmpImg.size(); // the current image size TQSize maxOnPage = maxPageSize(); // the maximum space on one side @@ -177,7 +177,7 @@ void KookaPrint::printFittingToPage(KookaImage *img) newHeight = int( double( img->height() ) * hAspect ); } - tmpImg = img->smoothScale(newWidth, newHeight, TQ_ScaleFree); + tmpImg = img->smoothScale(newWidth, newHeight, TQImage::ScaleFree); m_painter->drawImage( 0,0, tmpImg ); diff --git a/kooka/kookaprint.h b/kooka/kookaprint.h index 9336a3d0..85f35078 100644 --- a/kooka/kookaprint.h +++ b/kooka/kookaprint.h @@ -54,7 +54,7 @@ private: class KookaPrint:public TQObject { - Q_OBJECT + TQ_OBJECT public: KookaPrint(KPrinter*); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 8cca60ad..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", @@ -191,7 +191,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU m_dockScanParam->setDockSite(KDockWidget::DockFullSite); m_dockScanParam->setWidget( 0 ); // later - sane = new KScanDevice( TQT_TQOBJECT(m_dockScanParam) ); + sane = new KScanDevice( m_dockScanParam ); TQ_CHECK_PTR(sane); m_dockScanParam->manualDock( m_dockRecent, // dock target @@ -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/kookaview.h b/kooka/kookaview.h index f084e057..90160cbf 100644 --- a/kooka/kookaview.h +++ b/kooka/kookaview.h @@ -68,7 +68,7 @@ class ocrResEdit; */ class KookaView : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef enum { MirrorVertical, MirrorHorizontal, MirrorBoth } MirrorType; diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 89660b53..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 */ @@ -1127,7 +1127,7 @@ bool KSANEOCR::eventFilter( TQObject *object, TQEvent *event ) { if( event->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *mev = TQT_TQMOUSEEVENT(event); + TQMouseEvent *mev = static_cast<TQMouseEvent*>(event); int x = mev->x(); int y = mev->y(); @@ -1313,7 +1313,7 @@ void KSANEOCR::slMisspelling( const TQString& originalword, const TQStringList& { TQBrush brush; brush.setColor( TQColor(red)); // , "Dense4Pattern" ); - brush.setStyle( Qt::Dense4Pattern ); + brush.setStyle( TQt::Dense4Pattern ); TQPen pen( red, 2 ); TQRect r = resWord.rect(); @@ -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/ksaneocr.h b/kooka/ksaneocr.h index 6b995ad4..253aeb57 100644 --- a/kooka/ksaneocr.h +++ b/kooka/ksaneocr.h @@ -74,7 +74,7 @@ typedef enum{ ENG_ERROR, ENG_OK, ENG_DATA_MISSING, ENG_BAD_SETUP } EngineError; class KSANEOCR : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum OCREngines{ GOCR, OCRAD, KADMOS }; diff --git a/kooka/ocrresedit.h b/kooka/ocrresedit.h index c71d4e1d..26a280a8 100644 --- a/kooka/ocrresedit.h +++ b/kooka/ocrresedit.h @@ -35,7 +35,7 @@ class ocrWord; class ocrResEdit : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: ocrResEdit( TQWidget *parent ); 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/scanpackager.h b/kooka/scanpackager.h index fdae6495..8916121e 100644 --- a/kooka/scanpackager.h +++ b/kooka/scanpackager.h @@ -73,7 +73,7 @@ private: class ScanPackager : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: ScanPackager( TQWidget *parent); 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/kooka/thumbview.h b/kooka/thumbview.h index fc7a3843..a3a1ce14 100644 --- a/kooka/thumbview.h +++ b/kooka/thumbview.h @@ -60,7 +60,7 @@ namespace TDEIO { class ThumbView: public TQVBox /* TDEIconView */ { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui index 3676c3ba..d0730717 100644 --- a/kpdf/conf/dlgperformance.ui +++ b/kpdf/conf/dlgperformance.ui @@ -265,11 +265,11 @@ <include location="global" impldecl="in implementation">kiconloader.h</include> <include location="local" impldecl="in implementation">dlgperformance.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>lowRadio_toggled( bool on )</slot> <slot>normalRadio_toggled( bool on )</slot> <slot>aggressiveRadio_toggled( bool on )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> </functions> diff --git a/kpdf/conf/kpdf.kcfg b/kpdf/conf/kpdf.kcfg index 7f84081e..c9c4f94f 100644 --- a/kpdf/conf/kpdf.kcfg +++ b/kpdf/conf/kpdf.kcfg @@ -6,7 +6,7 @@ <kcfgfile name="kpdfpartrc" /> <group name="Accessibility" > <entry key="PaperColor" type="Color" > - <default code="true" >Qt::white</default> + <default code="true" >TQt::white</default> </entry> <entry key="HighlightImages" type="Bool" > <default>false</default> @@ -129,7 +129,7 @@ <default>false</default> </entry> <entry key="SlidesBackgroundColor" type="Color" > - <default code="true" >Qt::black</default> + <default code="true" >TQt::black</default> </entry> <entry key="SlidesTransition" type="Enum" > <default>Replace</default> diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index f97be985..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 ); @@ -357,7 +357,7 @@ void KPDFDocument::reparseConfig() TQWidget *KPDFDocument::widget() const { - return TQT_TQWIDGET(parent()); + return static_cast<TQWidget*>(parent()); } bool KPDFDocument::isOpened() const diff --git a/kpdf/core/document.h b/kpdf/core/document.h index a0529261..247a8dfd 100644 --- a/kpdf/core/document.h +++ b/kpdf/core/document.h @@ -49,7 +49,7 @@ class KURL; */ class KPDFDocument : public TQObject { - Q_OBJECT + TQ_OBJECT public: KPDFDocument( TQWidget *widget ); diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 65714b05..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&))); } } @@ -571,7 +571,7 @@ bool Part::closeURL() bool Part::eventFilter( TQObject * watched, TQEvent * e ) { // if pageView has been resized, save splitter sizes - if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_pageView) && e->type() == TQEvent::Resize ) + if ( watched == m_pageView && e->type() == TQEvent::Resize ) m_saveSplitterSizeTimer->start(500, true); // only intercept events, don't block them @@ -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/part.h b/kpdf/part.h index afa39250..aa3b6659 100644 --- a/kpdf/part.h +++ b/kpdf/part.h @@ -58,7 +58,7 @@ class BrowserExtension; */ class Part : public KParts::ReadOnlyPart, public DocumentObserver, virtual public kpdf_dcop { -Q_OBJECT +TQ_OBJECT public: @@ -196,7 +196,7 @@ private: class BrowserExtension : public KParts::BrowserExtension { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 209f8760..a0fdefdc 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -66,7 +66,7 @@ void Shell::init() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", TQT_TQOBJECT(this), 0, "KParts::ReadOnlyPart"); + m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", this, 0, "KParts::ReadOnlyPart"); if (m_part) { // then, setup our actions @@ -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(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - m_recent = KStdAction::openRecent( TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - m_showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(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/shell/shell.h b/kpdf/shell/shell.h index 6c2e4057..0784516f 100644 --- a/kpdf/shell/shell.h +++ b/kpdf/shell/shell.h @@ -35,7 +35,7 @@ namespace KPDF */ class Shell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index eaceeed2..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(); @@ -146,7 +146,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool if ( pages < 1 ) { m_currentPage = -1; - TQT_TQWIDGET( parent() )->hide(); + static_cast<TQWidget*>( parent() )->hide(); return; } @@ -171,7 +171,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool m_pagesButton->setText( TQString::number( pages ) ); m_prevButton->setEnabled( false ); m_nextButton->setEnabled( false ); - TQT_TQWIDGET( parent() )->show(); + static_cast<TQWidget*>( parent() )->show(); } void MiniBar::notifyViewportChanged( bool /*smoothMove*/ ) @@ -275,13 +275,13 @@ void ProgressWidget::setProgress( float percentage ) void ProgressWidget::mouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() == Qt::LeftButton && width() > 0 ) + if ( e->state() == TQt::LeftButton && width() > 0 ) m_miniBar->slotGotoNormalizedPage( (float)( TQApplication::reverseLayout() ? width() - e->x() : e->x() ) / (float)width() ); } void ProgressWidget::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && width() > 0 ) + if ( e->button() == TQt::LeftButton && width() > 0 ) m_miniBar->slotGotoNormalizedPage( (float)( TQApplication::reverseLayout() ? width() - e->x() : e->x() ) / (float)width() ); } @@ -333,7 +333,7 @@ PagesEdit::PagesEdit( MiniBar * parent ) focusOutEvent( 0 ); // use an integer validator - m_validator = new TQIntValidator( 1, 1, TQT_TQOBJECT(this) ); + m_validator = new TQIntValidator( 1, 1, this ); setValidator( m_validator ); // customize text properties diff --git a/kpdf/ui/minibar.h b/kpdf/ui/minibar.h index 2d4ee4bb..29c117d5 100644 --- a/kpdf/ui/minibar.h +++ b/kpdf/ui/minibar.h @@ -24,7 +24,7 @@ class ProgressWidget; */ class MiniBar : public TQFrame, public DocumentObserver { - Q_OBJECT + TQ_OBJECT public: MiniBar( TQWidget *parent, KPDFDocument * document ); diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 97302be4..57f201a0 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -207,7 +207,7 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document ) // widget setup: setup focus, accept drops and track mouse viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy( TQ_StrongFocus ); + viewport()->setFocusPolicy( TQWidget::StrongFocus ); //viewport()->setPaletteBackgroundColor( TQt::white ); viewport()->setBackgroundMode( TQt::NoBackground ); setResizePolicy( Manual ); @@ -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, TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), ac, "zoom_in" ); + KStdAction::zoomIn( this, TQ_SLOT( slotZoomIn() ), ac, "zoom_in" ); - KStdAction::zoomOut( TQT_TQOBJECT(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++" ), - TQT_TQOBJECT(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+-" ), - TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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 @@ -846,7 +846,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e ) return; // if holding mouse mid button, perform zoom - if ( (e->state() & Qt::MidButton) && d->mouseMidStartY >= 0 ) + if ( (e->state() & TQt::MidButton) && d->mouseMidStartY >= 0 ) { int deltaY = d->mouseMidStartY - e->globalPos().y(); d->mouseMidStartY = e->globalPos().y(); @@ -857,8 +857,8 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e ) return; } - bool leftButton = e->state() & Qt::LeftButton, - rightButton = e->state() & Qt::RightButton; + bool leftButton = e->state() & TQt::LeftButton, + rightButton = e->state() & TQt::RightButton; switch ( d->mouseMode ) { case MouseNormal: @@ -926,7 +926,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e ) } // if pressing mid mouse button while not doing other things, begin 'comtinous zoom' mode - if ( e->button() & Qt::MidButton ) + if ( e->button() & TQt::MidButton ) { d->mouseMidStartY = e->globalPos().y(); setCursor( KCursor::sizeVerCursor() ); @@ -937,8 +937,8 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e ) d->mousePressPos = e->globalPos(); // handle mode dependant mouse press actions - bool leftButton = e->button() & Qt::LeftButton, - rightButton = e->button() & Qt::RightButton; + bool leftButton = e->button() & TQt::LeftButton, + rightButton = e->button() & TQt::RightButton; switch ( d->mouseMode ) { case MouseNormal: // drag start / click / link following @@ -979,7 +979,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) if ( d->items.isEmpty() ) { // ..except for right Clicks (emitted even it viewport is empty) - if ( e->button() == Qt::RightButton ) + if ( e->button() == TQt::RightButton ) emit rightClick( 0, e->globalPos() ); return; } @@ -989,7 +989,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) return; // handle mode indepent mid buttom zoom - bool midButton = e->button() & Qt::MidButton; + bool midButton = e->button() & TQt::MidButton; if ( midButton && d->mouseMidStartY > 0 ) { d->mouseMidStartY = -1; @@ -998,8 +998,8 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) return; } - bool leftButton = e->button() & Qt::LeftButton, - rightButton = e->button() & Qt::RightButton; + bool leftButton = e->button() & TQt::LeftButton, + rightButton = e->button() & TQt::RightButton; switch ( d->mouseMode ) { case MouseNormal:{ @@ -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/pageview.h b/kpdf/ui/pageview.h index 267c58f5..4072713d 100644 --- a/kpdf/ui/pageview.h +++ b/kpdf/ui/pageview.h @@ -38,7 +38,7 @@ class PageViewTip; */ class PageView : public TQScrollView, public DocumentObserver { - Q_OBJECT + TQ_OBJECT friend class PageViewTip; diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp index 91a9de8d..90d90472 100644 --- a/kpdf/ui/pageviewutils.cpp +++ b/kpdf/ui/pageviewutils.cpp @@ -24,7 +24,7 @@ PageViewMessage::PageViewMessage( TQWidget * parent ) : TQWidget( parent, "pageViewMessage" ), m_timer( 0 ) { - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundMode( NoBackground ); setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background)); // if the layout is LtR, we can safely place it in the right position @@ -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 6dfd2a9d..65645400 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -61,7 +61,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc ) m_width = -1; - m_accel = new TDEAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" ); + m_accel = new TDEAccel( this, this, "presentationmode-accel" ); // show widget and take control showFullScreen(); @@ -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(), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ), false, true ); - m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ), false, true ); - m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotFirstPage() ), false, true ); - m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotLastPage() ), false, true ); - m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), TQT_TQOBJECT(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*/ ) @@ -235,7 +235,7 @@ void PresentationWidget::wheelEvent( TQWheelEvent * e ) void PresentationWidget::mousePressEvent( TQMouseEvent * e ) { // pressing left button - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { // if pressing on a link, skip other checks if ( ( m_pressedLink = getLink( e->x(), e->y() ) ) ) @@ -252,14 +252,14 @@ void PresentationWidget::mousePressEvent( TQMouseEvent * e ) slotNextPage(); } // pressing right button - else if ( e->button() == Qt::RightButton ) + else if ( e->button() == TQt::RightButton ) slotPrevPage(); } void PresentationWidget::mouseReleaseEvent( TQMouseEvent * e ) { // if releasing on the same link we pressed over, execute it - if ( m_pressedLink && e->button() == Qt::LeftButton ) + if ( m_pressedLink && e->button() == TQt::LeftButton ) { const KPDFLink * link = getLink( e->x(), e->y() ); if ( link == m_pressedLink ) @@ -290,7 +290,7 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e ) if ( e->y() <= (geometry().top() + 1) ) m_topBar->show(); // handle "dragging the wheel" if clicking on its geometry - else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) ) + else if ( e->state() == TQt::LeftButton && m_overlayGeometry.contains( e->pos() ) ) overlayClick( e->pos() ); } } @@ -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() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ) ); - m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ) ); - m_topBar->insertButton( "system-log-out", 1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(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/presentationwidget.h b/kpdf/ui/presentationwidget.h index 177b3da0..e38332d7 100644 --- a/kpdf/ui/presentationwidget.h +++ b/kpdf/ui/presentationwidget.h @@ -34,7 +34,7 @@ class PresentationFrame; */ class PresentationWidget : public TQDialog, public DocumentObserver { - Q_OBJECT + TQ_OBJECT public: PresentationWidget( TQWidget * parent, KPDFDocument * doc ); diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp index 8fcbfe22..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 &) ), - TQT_TQOBJECT(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() ), - TQT_TQOBJECT(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/searchwidget.h b/kpdf/ui/searchwidget.h index c84db96f..16a492de 100644 --- a/kpdf/ui/searchwidget.h +++ b/kpdf/ui/searchwidget.h @@ -29,7 +29,7 @@ class m_inputDelayTimer; */ class SearchWidget : public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: SearchWidget( TQWidget *parent, KPDFDocument *document ); diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index b443daa5..7d66cfb2 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/kpdf/ui/thumbnaillist.cpp @@ -76,7 +76,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document ) // widget setup: can be focused by tab and mouse click (not wheel) viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy( TQ_StrongFocus ); + viewport()->setFocusPolicy( TQWidget::StrongFocus ); setResizePolicy( Manual ); setAcceptDrops( true ); setDragAutoScroll( false ); @@ -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() @@ -311,7 +311,7 @@ void ThumbnailList::keyPressEvent( TQKeyEvent * keyEvent ) void ThumbnailList::contentsMousePressEvent( TQMouseEvent * e ) { - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; int clickY = e->y(); TQValueList<ThumbnailWidget *>::iterator vIt = m_visibleThumbnails.begin(), vEnd = m_visibleThumbnails.end(); @@ -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 ); } @@ -479,7 +479,7 @@ void ThumbnailWidget::setSelected( bool selected ) void ThumbnailWidget::mouseReleaseEvent( TQMouseEvent * e ) { - if ( e->button() != Qt::RightButton ) + if ( e->button() != TQt::RightButton ) return; m_tl->forwardRightClick( m_page, e->globalPos() ); @@ -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 ) ), - TQT_TQOBJECT(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/thumbnaillist.h b/kpdf/ui/thumbnaillist.h index b9fc06ae..b08a98f8 100644 --- a/kpdf/ui/thumbnaillist.h +++ b/kpdf/ui/thumbnaillist.h @@ -29,7 +29,7 @@ class ThumbnailWidget; */ class ThumbnailList : public TQScrollView, public DocumentObserver { -Q_OBJECT +TQ_OBJECT public: ThumbnailList(TQWidget *parent, KPDFDocument *document); 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/kpdf/ui/toc.h b/kpdf/ui/toc.h index 3de43502..9ed1d55c 100644 --- a/kpdf/ui/toc.h +++ b/kpdf/ui/toc.h @@ -19,7 +19,7 @@ class KPDFDocument; class TOC : public TDEListView, public DocumentObserver { -Q_OBJECT +TQ_OBJECT public: TOC(TQWidget *parent, KPDFDocument *document); diff --git a/kpdf/xpdf/xpdf/GlobalParams.cpp b/kpdf/xpdf/xpdf/GlobalParams.cpp index 69ce333f..d98a0ce5 100644 --- a/kpdf/xpdf/xpdf/GlobalParams.cpp +++ b/kpdf/xpdf/xpdf/GlobalParams.cpp @@ -2091,7 +2091,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) { if (res != FcResultMatch || !s) goto fin; ext = rindex((char*)s,'.'); if (!ext) goto fin; - if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4)) { + if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4) || !strncasecmp(ext,".otf",4)) { dfp = new DisplayFontParam(fontName->copy(), displayFontTT); dfp->tt.fileName = new GString((char*)s); FcPatternGetInteger(m, FC_INDEX, 0, &(dfp->tt.faceIndex)); diff --git a/kpovmodeler/StyleConvention b/kpovmodeler/StyleConvention index 8c68d5fe..8199c913 100644 --- a/kpovmodeler/StyleConvention +++ b/kpovmodeler/StyleConvention @@ -69,7 +69,7 @@ Put type modifiers behind the type, not before the variable name. Example: -const QString& type; +const TQString& type; PMObject* obj; @@ -201,19 +201,19 @@ things are set multiple times. But it works :-) (load-library "vc") ;;for QT - (set c-C++-access-key "\\<\\(Q_SIGNALS\\|public\\|protected\\|private - \\|public Q_SLOTS\\|protected Q_SLOTS\\|private Q_SLOTS\\)\\>[ \t]*:") - ;; modify the colour of Q_SLOTS to match public, private, etc ... + (set c-C++-access-key "\\<\\(signals\\|public\\|protected\\|private + \\|public slots\\|protected slots\\|private slots\\)\\>[ \t]*:") + ;; modify the colour of slots to match public, private, etc ... (font-lock-add-keywords 'c++-mode - '(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face))) + '(("\\<\\(slots\\|signals\\)\\>" . font-lock-type-face))) ;; make new font for rest of qt keywords (make-face 'qt-keywords-face) (set-face-foreground 'qt-keywords-face "green") ;; qt keywords (font-lock-add-keywords 'c++-mode - '(("\\<Q_OBJECT\\>" . 'qt-keywords-face))) + '(("\\<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/pmactions.h b/kpovmodeler/pmactions.h index 68656d50..e33e4480 100644 --- a/kpovmodeler/pmactions.h +++ b/kpovmodeler/pmactions.h @@ -34,7 +34,7 @@ class TQToolButton; */ class PMComboAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name ); @@ -66,7 +66,7 @@ private: */ class PMLabelAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PMLabelAction( const TQString &text, TQObject *parent = 0, const char *name = 0 ); @@ -84,7 +84,7 @@ private: */ class PMSpinBoxAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name ); 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/pmbicubicpatchedit.h b/kpovmodeler/pmbicubicpatchedit.h index dd503c9c..08c3abf9 100644 --- a/kpovmodeler/pmbicubicpatchedit.h +++ b/kpovmodeler/pmbicubicpatchedit.h @@ -37,7 +37,7 @@ class TQCheckBox; */ class PMBicubicPatchEdit : public PMGraphicalObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMGraphicalObjectEdit Base; public: 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/pmblendmapmodifiersedit.h b/kpovmodeler/pmblendmapmodifiersedit.h index fceff4f9..c0d8e687 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.h +++ b/kpovmodeler/pmblendmapmodifiersedit.h @@ -41,7 +41,7 @@ class TQPushButton; */ class PMBlendMapModifiersEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmblobcylinderedit.h b/kpovmodeler/pmblobcylinderedit.h index a9b126f0..79a2ed79 100644 --- a/kpovmodeler/pmblobcylinderedit.h +++ b/kpovmodeler/pmblobcylinderedit.h @@ -31,7 +31,7 @@ class PMBlobCylinder; class PMBlobCylinderEdit : public PMDetailObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMDetailObjectEdit Base; public: 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/pmblobedit.h b/kpovmodeler/pmblobedit.h index ee98e539..b75319c4 100644 --- a/kpovmodeler/pmblobedit.h +++ b/kpovmodeler/pmblobedit.h @@ -34,7 +34,7 @@ class TQCheckBox; */ class PMBlobEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmblobsphereedit.h b/kpovmodeler/pmblobsphereedit.h index 86a58c85..7108e9b0 100644 --- a/kpovmodeler/pmblobsphereedit.h +++ b/kpovmodeler/pmblobsphereedit.h @@ -33,7 +33,7 @@ class PMFloatEdit ; */ class PMBlobSphereEdit : public PMDetailObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMDetailObjectEdit Base; public: diff --git a/kpovmodeler/pmboundedbyedit.h b/kpovmodeler/pmboundedbyedit.h index 4b61b4aa..90a969c4 100644 --- a/kpovmodeler/pmboundedbyedit.h +++ b/kpovmodeler/pmboundedbyedit.h @@ -33,7 +33,7 @@ class TQLabel; */ class PMBoundedByEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmboxedit.h b/kpovmodeler/pmboxedit.h index 6b1767da..9491d168 100644 --- a/kpovmodeler/pmboxedit.h +++ b/kpovmodeler/pmboxedit.h @@ -33,7 +33,7 @@ class PMVectorEdit; */ class PMBoxEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmbumpmapedit.h b/kpovmodeler/pmbumpmapedit.h index 0e6d031d..bc274ddf 100644 --- a/kpovmodeler/pmbumpmapedit.h +++ b/kpovmodeler/pmbumpmapedit.h @@ -43,7 +43,7 @@ class TQPushButton; */ class PMBumpMapEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmcameraedit.h b/kpovmodeler/pmcameraedit.h index c125f486..6928062a 100644 --- a/kpovmodeler/pmcameraedit.h +++ b/kpovmodeler/pmcameraedit.h @@ -39,7 +39,7 @@ class TQCheckBox; */ class PMCameraEdit : public PMNamedObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMNamedObjectEdit Base; public: diff --git a/kpovmodeler/pmclippedbyedit.h b/kpovmodeler/pmclippedbyedit.h index 1b2bb6cb..da85e720 100644 --- a/kpovmodeler/pmclippedbyedit.h +++ b/kpovmodeler/pmclippedbyedit.h @@ -33,7 +33,7 @@ class TQLabel; */ class PMClippedByEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmcoloredit.h b/kpovmodeler/pmcoloredit.h index 414eda14..4f7fa8d5 100644 --- a/kpovmodeler/pmcoloredit.h +++ b/kpovmodeler/pmcoloredit.h @@ -35,7 +35,7 @@ class TQColor; */ class PMColorEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmcolorsettings.h b/kpovmodeler/pmcolorsettings.h index d3dbb902..43e8254d 100644 --- a/kpovmodeler/pmcolorsettings.h +++ b/kpovmodeler/pmcolorsettings.h @@ -31,7 +31,7 @@ class KColorButton; */ class PMColorSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmcommandmanager.h b/kpovmodeler/pmcommandmanager.h index 5685ad2c..7f2cbdf2 100644 --- a/kpovmodeler/pmcommandmanager.h +++ b/kpovmodeler/pmcommandmanager.h @@ -37,7 +37,7 @@ class PMPart; */ class PMCommandManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** 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/pmcommentedit.h b/kpovmodeler/pmcommentedit.h index 104160fe..f0849e04 100644 --- a/kpovmodeler/pmcommentedit.h +++ b/kpovmodeler/pmcommentedit.h @@ -33,7 +33,7 @@ class TQMultiLineEdit; */ class PMCommentEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmconeedit.h b/kpovmodeler/pmconeedit.h index 8bfc07d4..5b4d09b5 100644 --- a/kpovmodeler/pmconeedit.h +++ b/kpovmodeler/pmconeedit.h @@ -33,7 +33,7 @@ class PMCone; class PMConeEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmcsgedit.h b/kpovmodeler/pmcsgedit.h index 3600f0ff..0cf700fc 100644 --- a/kpovmodeler/pmcsgedit.h +++ b/kpovmodeler/pmcsgedit.h @@ -33,7 +33,7 @@ class TQComboBox; */ class PMCSGEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmcylinderedit.h b/kpovmodeler/pmcylinderedit.h index 98bfdc98..62585782 100644 --- a/kpovmodeler/pmcylinderedit.h +++ b/kpovmodeler/pmcylinderedit.h @@ -32,7 +32,7 @@ class TQCheckBox; class PMCylinderEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index e0b3bab5..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 ); @@ -201,6 +201,6 @@ void PMDeclareEdit::slotItemSelected( TQListBoxItem* item ) void PMDeclareEdit::slotSelect( ) { if( m_pSelectedObject ) - part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, TQT_TQOBJECT(this) ); + part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, this ); } #include "pmdeclareedit.moc" diff --git a/kpovmodeler/pmdeclareedit.h b/kpovmodeler/pmdeclareedit.h index 260567a7..5d4326e0 100644 --- a/kpovmodeler/pmdeclareedit.h +++ b/kpovmodeler/pmdeclareedit.h @@ -36,7 +36,7 @@ class TQListBoxItem; */ class PMDeclareEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kpovmodeler/pmdensityedit.h b/kpovmodeler/pmdensityedit.h index 7fdb97d3..003b74f7 100644 --- a/kpovmodeler/pmdensityedit.h +++ b/kpovmodeler/pmdensityedit.h @@ -32,7 +32,7 @@ class PMDensity; */ class PMDensityEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmdetailobjectedit.h b/kpovmodeler/pmdetailobjectedit.h index 9f7137dd..5f2568f5 100644 --- a/kpovmodeler/pmdetailobjectedit.h +++ b/kpovmodeler/pmdetailobjectedit.h @@ -33,7 +33,7 @@ class TQComboBox; */ class PMDetailObjectEdit : public PMNamedObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMNamedObjectEdit Base; public: diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp index 45b5c828..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( ); @@ -390,7 +390,7 @@ void PMDialogEditBase::slotTexturePreview( ) buffer.open( IO_WriteOnly ); TQTextStream str( &buffer ); PMPovray31Format format; - PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) ); + PMSerializer* dev = format.newSerializer( &buffer ); PMRenderMode mode; PMObjectList neededDeclares, objectsToCheck; TQPtrDict<PMObject> objectsToSerialize( 101 ); diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h index 4d7fb6f9..33dbf307 100644 --- a/kpovmodeler/pmdialogeditbase.h +++ b/kpovmodeler/pmdialogeditbase.h @@ -52,7 +52,7 @@ class PMPovrayOutputWidget; */ class PMDialogEditBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index ef106343..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( ) ); } @@ -174,7 +174,7 @@ PMDialogView::~PMDialogView( ) void PMDialogView::slotObjectChanged( PMObject* obj, const int mode, TQObject* sender ) { - if( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) ) + if( sender == this ) return; if( mode & PMCNewSelection ) { @@ -325,7 +325,7 @@ void PMDialogView::slotControlPointSelectionChanged( ) { if( m_pDisplayedWidget && m_pDisplayedWidget->displayedObject( ) ) emit objectChanged( m_pDisplayedWidget->displayedObject( ), - PMCControlPointSelection, TQT_TQOBJECT(this) ); + PMCControlPointSelection, this ); } void PMDialogView::displayObject( PMObject* obj, bool updateDescription ) @@ -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/pmdialogview.h b/kpovmodeler/pmdialogview.h index b1ddb817..8e7331f9 100644 --- a/kpovmodeler/pmdialogview.h +++ b/kpovmodeler/pmdialogview.h @@ -41,7 +41,7 @@ class TQLabel; */ class PMDialogEditContent : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: PMDialogEditContent( TQWidget* parent, const char* name = 0 ); @@ -62,7 +62,7 @@ private: */ class PMDialogView : public PMViewBase { - Q_OBJECT + TQ_OBJECT public: /** 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/pmdiscedit.h b/kpovmodeler/pmdiscedit.h index 64712799..7cb71f54 100644 --- a/kpovmodeler/pmdiscedit.h +++ b/kpovmodeler/pmdiscedit.h @@ -31,7 +31,7 @@ class PMDisc; class PMDiscEdit : public PMGraphicalObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMGraphicalObjectEdit Base; public: diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 7c0775ef..2f93ffbe 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -142,7 +142,7 @@ PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f mainDockWidget = 0L; d = new PMDockMainWindowPrivate( ); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } PMDockMainWindow::~PMDockMainWindow() @@ -171,15 +171,15 @@ 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 ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -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 ); @@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw ) void PMDockMainWindow::setView( TQWidget *view ) { if ( view->isA("PMDockWidget") ){ - if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this ); + if ( view->parent() != this ) ((PMDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -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 ); @@ -485,7 +485,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); header = 0L; @@ -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) ); } @@ -527,7 +527,7 @@ PMDockWidget::~PMDockWidget() d->blockHasUndockedSignal = false; } emit iMBeingClosed(); - manager->childDock->remove( TQT_TQOBJECT(this) ); + manager->childDock->remove( this ); delete pix; delete d; // destroy private data } @@ -559,7 +559,7 @@ void PMDockWidget::setEnableDocking( int pos ) void PMDockWidget::updateHeader() { if ( parent() ){ - if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){ + if ( (parent() == manager->main) || isGroup || (eDocking == PMDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); @@ -573,7 +573,7 @@ void PMDockWidget::updateHeader() void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) + if ( parent() != s ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -798,7 +798,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP if( pw->inherits( "PMDockSplitter" ) ) { PMDockSplitter* ds = ( PMDockSplitter* ) pw; - if( ds->splitterOrientation( ) ==Qt::Vertical ) + if( ds->splitterOrientation( ) ==TQt::Vertical ) found = true; } } @@ -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 ); @@ -874,13 +874,13 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP // if to dock not to the center of the target dockwidget, // dock to newDock PMDockSplitter* panner = 0L; - if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() ); - if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() ); + if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() ); + if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setKeepSize(manager->splitterKeepSize()); - panner->setFocusPolicy( TQ_NoFocus ); + panner->setFocusPolicy( TQWidget::NoFocus ); target->applyToWidget( panner ); applyToWidget( panner ); target->formerDockPos = target->currentDockPos; @@ -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 ){ @@ -994,13 +994,13 @@ void PMDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom ); @@ -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() ); @@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ + if ( mw->parent() != this ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1118,13 +1118,13 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab ) bool PMDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) ); } bool PMDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -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 ); @@ -1310,7 +1310,7 @@ void PMDockManager::activate() obj->show(); } } - if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); + if ( !main->inherits("TQDialog") ) main->show(); } bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -1343,7 +1343,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) else curdw->toDesktop( ); break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( curdw->eDocking != (int)PMDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); @@ -1367,7 +1367,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( draging ){ if ( !dropCancel ) drop(); @@ -1426,7 +1426,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; } - if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && + if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) && (curdw->eDocking != (int)PMDockWidget::DockNone) ) { startDrag( curdw); } @@ -1464,8 +1464,8 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( w, "PMDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "PMDockTabGroup", "_dock_tab" ) ) return 0L; if (!childDockWidgetList) return 0L; if ( childDockWidgetList->find(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L; @@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); PMDockWidget *obj1; while ( (obj1=(PMDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj1->parent() == main ) mainWidgetStr = TQString::fromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -1915,7 +1915,7 @@ void PMDockManager::readConfig(TQDomElement &base) PMDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Qt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop, + (orientation == (int)TQt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( TDEConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj->parent() == main ) c->writeEntry( "Main:view", obj->name() ); } @@ -2165,9 +2165,9 @@ void PMDockManager::readConfig( TDEConfig* c, TQString group ) PMDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) ); int sepPos = c->readNumEntry( oname + ":sepPos" ); - Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" ); + TQt::Orientation p = (TQt::Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p ==Qt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p ==TQt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } @@ -2271,7 +2271,7 @@ PMDockWidget* PMDockManager::getDockWidgetFromName( const TQString& dockName ) PMDockWidget* autoCreate = 0L; if ( autoCreateDock ){ autoCreate = new PMDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); - autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } @@ -2468,7 +2468,7 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 kdDebug()<<"PMDockArea::resize"<<endl; #endif - TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false); + TQObjectList *list=queryList("TQWidget",0,false); TQObjectListIt it( *list ); // iterate over the buttons TQObject *obj; diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h index d1ebc1de..d65c5aa7 100644 --- a/kpovmodeler/pmdockwidget.h +++ b/kpovmodeler/pmdockwidget.h @@ -108,7 +108,7 @@ class TQToolBar; */ class PMDockWidgetAbstractHeader : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -158,7 +158,7 @@ private: */ class PMDockWidgetAbstractHeaderDrag : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -204,7 +204,7 @@ private: */ class PMDockWidgetHeaderDrag : public PMDockWidgetAbstractHeaderDrag { - Q_OBJECT + TQ_OBJECT public: @@ -246,7 +246,7 @@ private: */ class PMDockWidgetHeader : public PMDockWidgetAbstractHeader { - Q_OBJECT + TQ_OBJECT public: @@ -352,7 +352,7 @@ private: */ class EXPORT_DOCKCLASS PMDockTabGroup : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -411,7 +411,7 @@ private: */ class EXPORT_DOCKCLASS PMDockWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT friend class PMDockManager; friend class PMDockSplitter; @@ -805,7 +805,7 @@ private: // GROUP data TQString firstName; TQString lastName; - Qt::Orientation splitterOrientation; + TQt::Orientation splitterOrientation; bool isGroup; bool isTabGroup; @@ -829,7 +829,7 @@ private: */ class EXPORT_DOCKCLASS PMDockManager: public TQObject { - Q_OBJECT + TQ_OBJECT friend class PMDockWidget; friend class PMDockMainWindow; @@ -1214,7 +1214,7 @@ private: */ class EXPORT_DOCKCLASS PMDockMainWindow : public TDEMainWindow, virtual public PartBase { - Q_OBJECT + TQ_OBJECT friend class PMDockManager; @@ -1419,7 +1419,7 @@ same as PMDockMainWindow*/ class EXPORT_DOCKCLASS PMDockArea : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class PMDockManager; diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp index dff656d7..60a06867 100644 --- a/kpovmodeler/pmdockwidget_private.cpp +++ b/kpovmodeler/pmdockwidget_private.cpp @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <tqcursor.h> -PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution) : TQWidget(parent, name) { divider = 0L; @@ -49,7 +49,7 @@ void PMDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (orientation ==Qt::Horizontal) + if (orientation ==TQt::Horizontal) divider->setCursor(TQCursor(sizeVerCursor)); else divider->setCursor(TQCursor(sizeHorCursor)); @@ -68,7 +68,7 @@ void PMDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes int minx, maxx, miny, maxy; - if (orientation ==Qt::Horizontal) { + if (orientation ==TQt::Horizontal) { miny = child0->minimumSize().height() + child1->minimumSize().height()+4; maxy = child0->maximumSize().height() + child1->maximumSize().height()+4; minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width(); @@ -118,7 +118,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev) int factor = (mHighResolution)? 10000:100; // real resize event, recalculate xpos if (ev && mKeepSize && isVisible()) { - if (orientation ==Qt::Horizontal) { + if (orientation ==TQt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) xpos = factor * checkValue( child0->height()+1 ) / height(); } else { @@ -126,8 +126,8 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev) xpos = factor * checkValue( child0->width()+1 ) / width(); } } - int position = checkValue( (orientation ==Qt::Vertical ? width() : height()) * xpos/factor ); - if (orientation ==Qt::Horizontal){ + int position = checkValue( (orientation ==TQt::Vertical ? width() : height()) * xpos/factor ); + if (orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, position+4, width(), height()-position-4); divider->setGeometry(0, position, width(), 4); @@ -142,7 +142,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev) int PMDockSplitter::checkValue( int position ) const { if (initialised){ - if (orientation ==Qt::Vertical){ + if (orientation ==TQt::Vertical){ if (position < (child0->minimumSize().width())) position = child0->minimumSize().width(); if ((width()-4-position) < (child1->minimumSize().width())) @@ -157,9 +157,9 @@ int PMDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((orientation ==Qt::Vertical) && (position > width())) + if ((orientation ==TQt::Vertical) && (position > width())) position = width(); - if ((orientation ==Qt::Horizontal) && (position > height())) + if ((orientation ==TQt::Horizontal) && (position > height())) position = height(); return position; @@ -176,7 +176,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (orientation ==Qt::Horizontal) { + if (orientation ==TQt::Horizontal) { if (!mOpaqueResize) { int position = checkValue( mapFromGlobal(mev->globalPos()).y() ); divider->move( 0, position ); @@ -201,7 +201,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (orientation ==Qt::Horizontal){ + if (orientation ==TQt::Horizontal){ xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); divider->repaint(true); @@ -292,7 +292,7 @@ PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name :TQPushButton( parent, name ) { moveMouse = false; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } PMDockButton_Private::~PMDockButton_Private() @@ -361,7 +361,7 @@ void PMDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) { if (w) { TQWidget* embeddedWdg = ((PMDockWidget*)w)->getWidget(); - if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) { + if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) { embeddedWdg->setFocus(); } } diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h index 1b3253aa..b9f9f06d 100644 --- a/kpovmodeler/pmdockwidget_private.h +++ b/kpovmodeler/pmdockwidget_private.h @@ -41,10 +41,10 @@ class TQFrame; */ class PMDockSplitter : public TQWidget { - Q_OBJECT + TQ_OBJECT public: - PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); + PMDockSplitter(TQWidget *parent= 0, const char *name= 0, TQt::Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false); virtual ~PMDockSplitter(){}; void activate(TQWidget *c0, TQWidget *c1 = 0L); @@ -71,7 +71,7 @@ public: bool highResolution() const; // MODIFICATION (Zehender) - Qt::Orientation splitterOrientation( ) const { return orientation; } + TQt::Orientation splitterOrientation( ) const { return orientation; } protected: int checkValue( int ) const; @@ -81,7 +81,7 @@ private: void setupMinMaxSize(); TQWidget *child0, *child1; - Qt::Orientation orientation; + TQt::Orientation orientation; bool initialised; TQFrame* divider; int xpos; @@ -96,7 +96,7 @@ private: */ class PMDockButton_Private : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: PMDockButton_Private( TQWidget *parent=0, const char *name=0 ); @@ -116,7 +116,7 @@ private: */ class PMDockWidgetPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: PMDockWidgetPrivate(); diff --git a/kpovmodeler/pmdragwidget.h b/kpovmodeler/pmdragwidget.h index cd54b773..34881db6 100644 --- a/kpovmodeler/pmdragwidget.h +++ b/kpovmodeler/pmdragwidget.h @@ -33,7 +33,7 @@ */ class PMDragWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PMDragWidget( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); diff --git a/kpovmodeler/pmerrordialog.h b/kpovmodeler/pmerrordialog.h index c3871c6d..be871378 100644 --- a/kpovmodeler/pmerrordialog.h +++ b/kpovmodeler/pmerrordialog.h @@ -40,7 +40,7 @@ class PMObject; */ class PMErrorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h index 6d8e83a4..fcd74778 100644 --- a/kpovmodeler/pmfactory.h +++ b/kpovmodeler/pmfactory.h @@ -26,7 +26,7 @@ class TDEInstance; class PMFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: PMFactory( ); diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h index 454cf1f8..e028d3c5 100644 --- a/kpovmodeler/pmfiledialog.h +++ b/kpovmodeler/pmfiledialog.h @@ -37,7 +37,7 @@ class PMPart; */ class PMFileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: /** 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/pmfinishedit.h b/kpovmodeler/pmfinishedit.h index efbb210f..3f7f2e5e 100644 --- a/kpovmodeler/pmfinishedit.h +++ b/kpovmodeler/pmfinishedit.h @@ -37,7 +37,7 @@ class TQWidget; */ class PMFinishEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmfogedit.h b/kpovmodeler/pmfogedit.h index 1b299d0d..34c68a2f 100644 --- a/kpovmodeler/pmfogedit.h +++ b/kpovmodeler/pmfogedit.h @@ -40,7 +40,7 @@ class TQLabel; */ class PMFogEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmglobalphotonsedit.h b/kpovmodeler/pmglobalphotonsedit.h index aea618fb..8992dfd8 100644 --- a/kpovmodeler/pmglobalphotonsedit.h +++ b/kpovmodeler/pmglobalphotonsedit.h @@ -36,7 +36,7 @@ class TQCheckBox; */ class PMGlobalPhotonsEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmglobalsettingsedit.h b/kpovmodeler/pmglobalsettingsedit.h index 27f3ad12..6de780d2 100644 --- a/kpovmodeler/pmglobalsettingsedit.h +++ b/kpovmodeler/pmglobalsettingsedit.h @@ -37,7 +37,7 @@ class TQComboBox; */ class PMGlobalSettingsEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 1114e3d7..23e170da 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -143,40 +143,40 @@ PMGLView::PMGLView( PMPart* part, PMViewType t, initializeGL( ); setMouseTracking( true ); - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); PMRenderManager* rm = PMRenderManager::theManager( ); rm->viewCreated( ); setMinimumSize( 50, 50 ); - connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) ); - connect( part, TQT_SIGNAL( clear( ) ), TQT_SLOT( slotClear( ) ) ); + connect( part, TQ_SIGNAL( refresh( ) ), TQ_SLOT( slotRefresh( ) ) ); + connect( part, TQ_SIGNAL( clear( ) ), TQ_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( 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, TQT_SIGNAL( activeRenderModeChanged( ) ), - TQT_SLOT( slotActiveRenderModeChanged( ) ) ); + connect( part, TQ_SIGNAL( activeRenderModeChanged( ) ), + TQ_SLOT( slotActiveRenderModeChanged( ) ) ); - connect( &m_startTimer, TQT_SIGNAL( timeout( ) ), - TQT_SLOT( slotMouseChangeTimer( ) ) ); - connect( &m_autoScrollTimer, TQT_SIGNAL( timeout( ) ), - TQT_SLOT( slotAutoScroll( ) ) ); + connect( &m_startTimer, TQ_SIGNAL( timeout( ) ), + TQ_SLOT( slotMouseChangeTimer( ) ) ); + connect( &m_autoScrollTimer, TQ_SIGNAL( timeout( ) ), + TQ_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( 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, TQT_SIGNAL( controlPointMessage( const TQString& ) ), - m_pPart, TQT_SIGNAL( controlPointMessage( const TQString& ) ) ); + connect( this, TQ_SIGNAL( controlPointMessage( const TQString& ) ), + m_pPart, TQ_SIGNAL( controlPointMessage( const TQString& ) ) ); updateControlPoints( ); } @@ -507,7 +507,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) { if( m_bScaleMode || m_bTranslateMode ) { - if( ( e->button( ) & Qt::LeftButton ) && ( e->state( ) == 0 ) ) + if( ( e->button( ) & TQt::LeftButton ) && ( e->state( ) == 0 ) ) { m_bMousePressed = true; m_mousePos = e->pos( ); @@ -517,7 +517,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) } else if( m_type != PMViewCamera ) { - if( ( e->button( ) & Qt::LeftButton ) && m_bInverseValid + if( ( e->button( ) & TQt::LeftButton ) && m_bInverseValid && m_pActiveObject ) { if( m_pUnderMouse ) @@ -578,7 +578,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) if( !( m_bGraphicalChangeMode || m_bMousePressed ) ) { - if( ( e->button( ) == Qt::RightButton ) && ( e->state( ) == 0 ) ) + if( ( e->button( ) == TQt::RightButton ) && ( e->state( ) == 0 ) ) { m_contextClickPosition = PMVector( screenToInternalX( e->x( ) ), screenToInternalY( e->y( ) ) ); @@ -599,7 +599,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) } } - if( e->button( ) == Qt::MidButton ) + if( e->button( ) == TQt::MidButton ) { m_bMidMousePressed = true; m_mousePos = e->pos( ); @@ -677,7 +677,7 @@ void PMGLView::mouseReleaseEvent( TQMouseEvent* e ) m_autoScrollTimer.stop( ); } - if( e->button( ) & Qt::MidButton ) + if( e->button( ) & TQt::MidButton ) m_bMidMousePressed = false; m_bSelectUnderMouse = false; @@ -955,12 +955,12 @@ void PMGLView::graphicalChange( const TQPoint& mousePos ) m_pActiveObject->controlPointsChangedList( m_controlPoints, changedObjects ); if( changedObjects.isEmpty( ) ) - emit objectChanged( m_pActiveObject, PMCGraphicalChange, TQT_TQOBJECT(this) ); + emit objectChanged( m_pActiveObject, PMCGraphicalChange, this ); else { PMObjectListIterator it( changedObjects ); for( ; it.current( ); ++it ) - emit objectChanged( it.current( ), PMCGraphicalChange, TQT_TQOBJECT(this) ); + emit objectChanged( it.current( ), PMCGraphicalChange, this ); } } @@ -1238,7 +1238,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, redraw = true; if( redraw ) - repaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) ); + repaint( sender == this ); } void PMGLView::repaint( bool graphicalChange ) @@ -1353,7 +1353,7 @@ void PMGLView::selectControlPoint( PMControlPoint* cp, bool select, bool deselec } if( selectionChanged ) - emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) ); + emit objectChanged( m_pActiveObject, PMCControlPointSelection, this ); } void PMGLView::startSelection( ) @@ -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 ); @@ -1652,7 +1652,7 @@ void PMGLView::slotControlPoint( int id ) PMControlPointListIterator cit( m_controlPoints ); for( ; cit.current( ); ++cit ) cit.current( )->setSelected( p == cit.current( ) ); - emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) ); + emit objectChanged( m_pActiveObject, PMCControlPointSelection, this ); } } @@ -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/pmglview.h b/kpovmodeler/pmglview.h index 23054337..dfc7437d 100644 --- a/kpovmodeler/pmglview.h +++ b/kpovmodeler/pmglview.h @@ -49,7 +49,7 @@ class TQComboBox; */ class PMGLView : public PMViewBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -571,7 +571,7 @@ public: */ class PMGLViewOptionsWidget : public PMViewOptionsWidget { - Q_OBJECT + TQ_OBJECT public: /** 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/pmgraphicalobjectedit.h b/kpovmodeler/pmgraphicalobjectedit.h index 0ef15253..c3a92e18 100644 --- a/kpovmodeler/pmgraphicalobjectedit.h +++ b/kpovmodeler/pmgraphicalobjectedit.h @@ -35,7 +35,7 @@ class TQLabel; */ class PMGraphicalObjectEdit : public PMDetailObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMDetailObjectEdit Base; public: diff --git a/kpovmodeler/pmgridsettings.h b/kpovmodeler/pmgridsettings.h index bd04dab7..b5d9cce8 100644 --- a/kpovmodeler/pmgridsettings.h +++ b/kpovmodeler/pmgridsettings.h @@ -33,7 +33,7 @@ class PMFloatEdit; */ class PMGridSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmheightfieldedit.h b/kpovmodeler/pmheightfieldedit.h index 126780e5..40f6468c 100644 --- a/kpovmodeler/pmheightfieldedit.h +++ b/kpovmodeler/pmheightfieldedit.h @@ -37,7 +37,7 @@ class TQPushButton; */ class PMHeightFieldEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: diff --git a/kpovmodeler/pmheightfieldroam.cpp b/kpovmodeler/pmheightfieldroam.cpp index 87856155..5b55b65e 100644 --- a/kpovmodeler/pmheightfieldroam.cpp +++ b/kpovmodeler/pmheightfieldroam.cpp @@ -180,7 +180,7 @@ bool PMHeightFieldROAM::imageToData(const TQString &fileName) colourIndex = false; else { - scaledMap = scaledMap.convertDepthWithPalette( 8, mapFile.tqcolorTable( ), 256 ); + scaledMap = scaledMap.convertDepthWithPalette( 8, mapFile.colorTable( ), 256 ); colourIndex = true; } 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/pmimagemapedit.h b/kpovmodeler/pmimagemapedit.h index 8296feb8..4b527d92 100644 --- a/kpovmodeler/pmimagemapedit.h +++ b/kpovmodeler/pmimagemapedit.h @@ -43,7 +43,7 @@ class TQPushButton; */ class PMImageMapEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kpovmodeler/pminserterrordialog.h b/kpovmodeler/pminserterrordialog.h index 7bdf7ecf..9e016b3b 100644 --- a/kpovmodeler/pminserterrordialog.h +++ b/kpovmodeler/pminserterrordialog.h @@ -34,7 +34,7 @@ class TQLabel; during the execution of a command */ class PMInsertErrorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** 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/pminterioredit.h b/kpovmodeler/pminterioredit.h index e4570906..a71aaa62 100644 --- a/kpovmodeler/pminterioredit.h +++ b/kpovmodeler/pminterioredit.h @@ -37,7 +37,7 @@ class TQLabel; */ class PMInteriorEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: diff --git a/kpovmodeler/pminteriortextureedit.h b/kpovmodeler/pminteriortextureedit.h index 8a5c2bbf..fff7ebff 100644 --- a/kpovmodeler/pminteriortextureedit.h +++ b/kpovmodeler/pminteriortextureedit.h @@ -32,7 +32,7 @@ class PMInteriorTexture; */ class PMInteriorTextureEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmisosurfaceedit.h b/kpovmodeler/pmisosurfaceedit.h index 6a3ed07e..8c16749d 100644 --- a/kpovmodeler/pmisosurfaceedit.h +++ b/kpovmodeler/pmisosurfaceedit.h @@ -39,7 +39,7 @@ class TQLineEdit; */ class PMIsoSurfaceEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmjuliafractaledit.h b/kpovmodeler/pmjuliafractaledit.h index 2b8371ee..a0ca8393 100644 --- a/kpovmodeler/pmjuliafractaledit.h +++ b/kpovmodeler/pmjuliafractaledit.h @@ -37,7 +37,7 @@ class TQLabel; */ class PMJuliaFractalEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmlatheedit.h b/kpovmodeler/pmlatheedit.h index 6b19312e..ae5152a5 100644 --- a/kpovmodeler/pmlatheedit.h +++ b/kpovmodeler/pmlatheedit.h @@ -41,7 +41,7 @@ class TQLabel; */ class PMLatheEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h index ea25cb45..5b92fba2 100644 --- a/kpovmodeler/pmlayoutsettings.h +++ b/kpovmodeler/pmlayoutsettings.h @@ -39,7 +39,7 @@ class TQLabel; */ class PMLayoutSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmlibrarybrowser.h b/kpovmodeler/pmlibrarybrowser.h index 474a0233..b1fbc91d 100644 --- a/kpovmodeler/pmlibrarybrowser.h +++ b/kpovmodeler/pmlibrarybrowser.h @@ -46,7 +46,7 @@ typedef TQDict<TQString> TQStringDict; */ class PMLibraryBrowserView : public PMViewBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -65,7 +65,7 @@ public: */ class PMLibraryBrowserViewWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: PMLibraryBrowserViewWidget( TQWidget *parent, const char* name = NULL ); 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/pmlibraryentrypreview.h b/kpovmodeler/pmlibraryentrypreview.h index 8f33b98c..5d07fa40 100644 --- a/kpovmodeler/pmlibraryentrypreview.h +++ b/kpovmodeler/pmlibraryentrypreview.h @@ -40,7 +40,7 @@ class PMTreeView; */ class PMLibraryEntryPreview: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** Constructor */ 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/pmlibraryhandleedit.h b/kpovmodeler/pmlibraryhandleedit.h index 954fea94..aa3ed470 100644 --- a/kpovmodeler/pmlibraryhandleedit.h +++ b/kpovmodeler/pmlibraryhandleedit.h @@ -35,7 +35,7 @@ class PMLibraryHandle; */ class PMLibraryHandleEdit: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h index 47e07e50..6077c9e4 100644 --- a/kpovmodeler/pmlibraryiconview.h +++ b/kpovmodeler/pmlibraryiconview.h @@ -31,7 +31,7 @@ class PMLibraryHandle; */ class PMLibraryIconDrag : public TQIconDrag { - Q_OBJECT + TQ_OBJECT public: /** Constructor */ @@ -61,7 +61,7 @@ private: */ class PMLibraryIconView: public TDEIconView { - Q_OBJECT + TQ_OBJECT public: PMLibraryIconView( TQWidget *parent, const char* name = NULL ); 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/pmlibraryobjectsearch.h b/kpovmodeler/pmlibraryobjectsearch.h index afbd06b0..06430216 100644 --- a/kpovmodeler/pmlibraryobjectsearch.h +++ b/kpovmodeler/pmlibraryobjectsearch.h @@ -37,7 +37,7 @@ class TDEListView; */ class PMLibraryObjectSearch: public TQWidget { - Q_OBJECT + TQ_OBJECT public: PMLibraryObjectSearch( TQWidget *parent ); 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/pmlightedit.h b/kpovmodeler/pmlightedit.h index ebeff9ae..90c75bca 100644 --- a/kpovmodeler/pmlightedit.h +++ b/kpovmodeler/pmlightedit.h @@ -39,7 +39,7 @@ class TQCheckBox; */ class PMLightEdit : public PMNamedObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMNamedObjectEdit Base; public: 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/pmlightgroupedit.h b/kpovmodeler/pmlightgroupedit.h index 1c329b82..daa37cce 100644 --- a/kpovmodeler/pmlightgroupedit.h +++ b/kpovmodeler/pmlightgroupedit.h @@ -33,7 +33,7 @@ class TQCheckBox; */ class PMLightGroupEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmlineedits.h b/kpovmodeler/pmlineedits.h index 23c2896a..4d267a63 100644 --- a/kpovmodeler/pmlineedits.h +++ b/kpovmodeler/pmlineedits.h @@ -30,7 +30,7 @@ class PMFloatEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT public: enum ValidationOp { OpGreater, OpGreaterEqual, @@ -89,7 +89,7 @@ private: class PMIntEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT public: /** 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/pmlinkedit.h b/kpovmodeler/pmlinkedit.h index 1602653e..8a030b90 100644 --- a/kpovmodeler/pmlinkedit.h +++ b/kpovmodeler/pmlinkedit.h @@ -33,7 +33,7 @@ class TQPushButton; */ class PMLinkEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** 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/pmlistpatternedit.h b/kpovmodeler/pmlistpatternedit.h index 1c45d9d2..6a520374 100644 --- a/kpovmodeler/pmlistpatternedit.h +++ b/kpovmodeler/pmlistpatternedit.h @@ -36,7 +36,7 @@ class TQLabel; */ class PMListPatternEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kpovmodeler/pmmaterialedit.h b/kpovmodeler/pmmaterialedit.h index fdd6c9ba..b3be698e 100644 --- a/kpovmodeler/pmmaterialedit.h +++ b/kpovmodeler/pmmaterialedit.h @@ -32,7 +32,7 @@ class PMMaterial; */ class PMMaterialEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmmaterialmapedit.h b/kpovmodeler/pmmaterialmapedit.h index bd83c61e..a6bba01a 100644 --- a/kpovmodeler/pmmaterialmapedit.h +++ b/kpovmodeler/pmmaterialmapedit.h @@ -40,7 +40,7 @@ class TQPushButton; */ class PMMaterialMapEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmmediaedit.h b/kpovmodeler/pmmediaedit.h index 4a73ade3..cef8d415 100644 --- a/kpovmodeler/pmmediaedit.h +++ b/kpovmodeler/pmmediaedit.h @@ -38,7 +38,7 @@ class TQComboBox; */ class PMMediaEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmmeshedit.h b/kpovmodeler/pmmeshedit.h index 681b32c2..106211d5 100644 --- a/kpovmodeler/pmmeshedit.h +++ b/kpovmodeler/pmmeshedit.h @@ -34,7 +34,7 @@ class PMVectorEdit; */ class PMMeshEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmnamedobjectedit.h b/kpovmodeler/pmnamedobjectedit.h index 12c4cbbc..7b5c6110 100644 --- a/kpovmodeler/pmnamedobjectedit.h +++ b/kpovmodeler/pmnamedobjectedit.h @@ -33,7 +33,7 @@ class TQLineEdit; */ class PMNamedObjectEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmnormaledit.h b/kpovmodeler/pmnormaledit.h index a3512c57..9fb3bbbb 100644 --- a/kpovmodeler/pmnormaledit.h +++ b/kpovmodeler/pmnormaledit.h @@ -34,7 +34,7 @@ class PMFloatEdit; */ class PMNormalEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp index 23631df0..cd1ee6da 100644 --- a/kpovmodeler/pmobjectdrag.cpp +++ b/kpovmodeler/pmobjectdrag.cpp @@ -73,7 +73,7 @@ PMObjectDrag::PMObjectDrag( PMPart* part, PMObject* object, TQWidget* dragSource TQBuffer buffer( data ); buffer.open( IO_WriteOnly ); - PMSerializer* ser = it.current( )->newSerializer( TQT_TQIODEVICE(&buffer) ); + PMSerializer* ser = it.current( )->newSerializer( &buffer ); if( ser ) { @@ -143,7 +143,7 @@ PMObjectDrag::PMObjectDrag( PMPart* part, const PMObjectList& objList, TQWidget* TQBuffer buffer( data ); buffer.open( IO_WriteOnly ); - PMSerializer* ser = fit.current( )->newSerializer( TQT_TQIODEVICE(&buffer) ); + PMSerializer* ser = fit.current( )->newSerializer( &buffer ); if( ser ) { 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/pmobjectlibrarysettings.h b/kpovmodeler/pmobjectlibrarysettings.h index 884902e2..68e1e6c8 100644 --- a/kpovmodeler/pmobjectlibrarysettings.h +++ b/kpovmodeler/pmobjectlibrarysettings.h @@ -34,7 +34,7 @@ class TQListBox; */ class PMObjectLibrarySettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmobjectlinkedit.h b/kpovmodeler/pmobjectlinkedit.h index 298933ba..fea6b9c4 100644 --- a/kpovmodeler/pmobjectlinkedit.h +++ b/kpovmodeler/pmobjectlinkedit.h @@ -33,7 +33,7 @@ class PMLinkEdit; */ class PMObjectLinkEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmobjectselect.h b/kpovmodeler/pmobjectselect.h index 8130f242..eb2e00a5 100644 --- a/kpovmodeler/pmobjectselect.h +++ b/kpovmodeler/pmobjectselect.h @@ -82,7 +82,7 @@ private: */ class PMObjectSelect : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmobjectsettings.h b/kpovmodeler/pmobjectsettings.h index fed22d81..29bfbf18 100644 --- a/kpovmodeler/pmobjectsettings.h +++ b/kpovmodeler/pmobjectsettings.h @@ -33,7 +33,7 @@ class TQCheckBox; */ class PMObjectSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmopenglsettings.h b/kpovmodeler/pmopenglsettings.h index 32cad3f5..42f7b494 100644 --- a/kpovmodeler/pmopenglsettings.h +++ b/kpovmodeler/pmopenglsettings.h @@ -31,7 +31,7 @@ class TQCheckBox; */ class PMOpenGLSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmpalettevalueedit.h b/kpovmodeler/pmpalettevalueedit.h index 3dc897bf..cf024461 100644 --- a/kpovmodeler/pmpalettevalueedit.h +++ b/kpovmodeler/pmpalettevalueedit.h @@ -33,7 +33,7 @@ class PMIntEdit; */ class PMPaletteValueEdit: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** */ diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp index ef921734..4a5f64b0 100644 --- a/kpovmodeler/pmparser.cpp +++ b/kpovmodeler/pmparser.cpp @@ -48,7 +48,7 @@ PMParser::PMParser( PMPart* part, const TQByteArray& array ) m_pPart = part; TQBuffer* buffer = new TQBuffer( array ); buffer->open( IO_ReadOnly ); - m_pDevice = TQT_TQIODEVICE(buffer); + m_pDevice = buffer; m_bDeviceCreated = true; init( ); diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp index 8198a9d7..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 ); } @@ -951,7 +951,7 @@ bool PMPart::exportPovray( const KURL& url ) if( ok ) { PMPovray35Format format; - PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(file) ); + PMSerializer* dev = format.newSerializer( file ); dev->serialize( m_pScene ); delete dev; @@ -1369,7 +1369,7 @@ void PMPart::slotFileImport( ) TQFile file( fileName ); if( file.open( IO_ReadOnly ) ) { - PMParser* newParser = selectedFormat->newParser( this, TQT_TQIODEVICE(&file) ); + PMParser* newParser = selectedFormat->newParser( this, &file ); if( newParser ) { if( m_pActiveObject ) @@ -1404,7 +1404,7 @@ void PMPart::slotFileExport( ) TQBuffer buffer( baData ); buffer.open( IO_WriteOnly ); - PMSerializer* newSer = selectedFormat->newSerializer( TQT_TQIODEVICE(&buffer) ); + PMSerializer* newSer = selectedFormat->newSerializer( &buffer ); if( newSer ) { newSer->serialize( m_pScene ); @@ -2713,7 +2713,7 @@ void PMPart::slotRender( ) TQBuffer buffer( a ); buffer.open( IO_WriteOnly ); PMPovray35Format format; - PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) ); + PMSerializer* dev = format.newSerializer( &buffer ); dev->serialize( m_pScene ); delete dev; @@ -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/pmpart.h b/kpovmodeler/pmpart.h index d7ef0e56..65d1494d 100644 --- a/kpovmodeler/pmpart.h +++ b/kpovmodeler/pmpart.h @@ -68,7 +68,7 @@ class TDEProcess; */ class PMPart : public KParts::ReadWritePart, virtual public PMPartIface { - Q_OBJECT + TQ_OBJECT public: /** @@ -1024,7 +1024,7 @@ private: class PMBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class PMPart; public: 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/pmpatternedit.h b/kpovmodeler/pmpatternedit.h index a1bc6117..ec7f1928 100644 --- a/kpovmodeler/pmpatternedit.h +++ b/kpovmodeler/pmpatternedit.h @@ -43,7 +43,7 @@ class TQPushButton; */ class PMPatternEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmphotonsedit.h b/kpovmodeler/pmphotonsedit.h index 1aecf472..e449d087 100644 --- a/kpovmodeler/pmphotonsedit.h +++ b/kpovmodeler/pmphotonsedit.h @@ -35,7 +35,7 @@ class TQLabel; */ class PMPhotonsEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmpigmentedit.h b/kpovmodeler/pmpigmentedit.h index 6340574b..186ddd67 100644 --- a/kpovmodeler/pmpigmentedit.h +++ b/kpovmodeler/pmpigmentedit.h @@ -33,7 +33,7 @@ class TQCheckBox; */ class PMPigmentEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmplaneedit.h b/kpovmodeler/pmplaneedit.h index 55930745..0cd139ae 100644 --- a/kpovmodeler/pmplaneedit.h +++ b/kpovmodeler/pmplaneedit.h @@ -32,7 +32,7 @@ class TQCheckBox; class PMPlaneEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmpluginsettings.h b/kpovmodeler/pmpluginsettings.h index d3227d9d..69653cbc 100644 --- a/kpovmodeler/pmpluginsettings.h +++ b/kpovmodeler/pmpluginsettings.h @@ -33,7 +33,7 @@ class TQPushButton; */ class PMPluginSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmpolynomedit.h b/kpovmodeler/pmpolynomedit.h index ae4e4be4..56810c3d 100644 --- a/kpovmodeler/pmpolynomedit.h +++ b/kpovmodeler/pmpolynomedit.h @@ -37,7 +37,7 @@ class TQCheckBox; */ class PMPolynomEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmpovraymatrixedit.h b/kpovmodeler/pmpovraymatrixedit.h index 23d636ad..8d264efe 100644 --- a/kpovmodeler/pmpovraymatrixedit.h +++ b/kpovmodeler/pmpovraymatrixedit.h @@ -33,7 +33,7 @@ class PMFloatEdit; */ class PMPovrayMatrixEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmpovrayoutputwidget.h b/kpovmodeler/pmpovrayoutputwidget.h index f8c693c8..abaf8960 100644 --- a/kpovmodeler/pmpovrayoutputwidget.h +++ b/kpovmodeler/pmpovrayoutputwidget.h @@ -32,7 +32,7 @@ class TDEConfig; */ class PMPovrayOutputWidget : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** 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/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h index 0e3a7786..a0868311 100644 --- a/kpovmodeler/pmpovrayrenderwidget.h +++ b/kpovmodeler/pmpovrayrenderwidget.h @@ -42,7 +42,7 @@ class KTempFile; */ class PMPovrayRenderWidget : public PMDragWidget { - Q_OBJECT + TQ_OBJECT public: /** 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/pmpovraysettings.h b/kpovmodeler/pmpovraysettings.h index a0175e17..28229d80 100644 --- a/kpovmodeler/pmpovraysettings.h +++ b/kpovmodeler/pmpovraysettings.h @@ -34,7 +34,7 @@ class TQListBox; */ class PMPovraySettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h index 816e353a..408753f8 100644 --- a/kpovmodeler/pmpovraywidget.h +++ b/kpovmodeler/pmpovraywidget.h @@ -41,7 +41,7 @@ class KURL; */ class PMPovrayWidget : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmpreviewsettings.h b/kpovmodeler/pmpreviewsettings.h index dc48f902..b8e1940b 100644 --- a/kpovmodeler/pmpreviewsettings.h +++ b/kpovmodeler/pmpreviewsettings.h @@ -34,7 +34,7 @@ class KColorButton; */ class PMPreviewSettings : public PMSettingsDialogPage { - Q_OBJECT + TQ_OBJECT public: /** 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/pmprismedit.h b/kpovmodeler/pmprismedit.h index 3b00524e..78f9bb5a 100644 --- a/kpovmodeler/pmprismedit.h +++ b/kpovmodeler/pmprismedit.h @@ -43,7 +43,7 @@ class TQLabel; */ class PMPrismEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmquickcoloredit.h b/kpovmodeler/pmquickcoloredit.h index 16094a47..d3122fe4 100644 --- a/kpovmodeler/pmquickcoloredit.h +++ b/kpovmodeler/pmquickcoloredit.h @@ -35,7 +35,7 @@ class PMColorEdit; */ class PMQuickColorEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmradiosityedit.h b/kpovmodeler/pmradiosityedit.h index 8cdf8262..c7a5fb6e 100644 --- a/kpovmodeler/pmradiosityedit.h +++ b/kpovmodeler/pmradiosityedit.h @@ -35,7 +35,7 @@ class TQCheckBox; */ class PMRadiosityEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmrainbowedit.h b/kpovmodeler/pmrainbowedit.h index 7c2eacd6..3c54e3fe 100644 --- a/kpovmodeler/pmrainbowedit.h +++ b/kpovmodeler/pmrainbowedit.h @@ -36,7 +36,7 @@ class TQLabel; */ class PMRainbowEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmrawedit.h b/kpovmodeler/pmrawedit.h index 73c6b5d5..5dd5df3e 100644 --- a/kpovmodeler/pmrawedit.h +++ b/kpovmodeler/pmrawedit.h @@ -33,7 +33,7 @@ class TQMultiLineEdit; */ class PMRawEdit : public PMNamedObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMNamedObjectEdit Base; public: diff --git a/kpovmodeler/pmrendermanager.h b/kpovmodeler/pmrendermanager.h index 13ce8073..20db3442 100644 --- a/kpovmodeler/pmrendermanager.h +++ b/kpovmodeler/pmrendermanager.h @@ -94,7 +94,7 @@ typedef TQPtrListIterator<PMRenderTask> PMRenderTaskListIterator; */ class PMRenderManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** 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/pmrendermodesdialog.h b/kpovmodeler/pmrendermodesdialog.h index 5adbefaf..9cb20744 100644 --- a/kpovmodeler/pmrendermodesdialog.h +++ b/kpovmodeler/pmrendermodesdialog.h @@ -37,7 +37,7 @@ class PMFloatEdit; */ class PMRenderModesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -106,7 +106,7 @@ private: */ class PMRenderModeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** 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/pmrotateedit.h b/kpovmodeler/pmrotateedit.h index 14f18810..b4ed696a 100644 --- a/kpovmodeler/pmrotateedit.h +++ b/kpovmodeler/pmrotateedit.h @@ -33,7 +33,7 @@ class PMVectorEdit; */ class PMRotateEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmscaleedit.h b/kpovmodeler/pmscaleedit.h index a16c337f..18956361 100644 --- a/kpovmodeler/pmscaleedit.h +++ b/kpovmodeler/pmscaleedit.h @@ -33,7 +33,7 @@ class PMVectorEdit; */ class PMScaleEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp index 08f0cb3c..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( ) ) ); } } @@ -241,7 +241,7 @@ void PMSettingsDialog::slotRepaint( ) void PMSettingsDialog::slotShowPage( ) { - const TQObject* w = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( ))); + const TQObject* w = sender( ); if( w ) { int index = findPage( ( const PMSettingsDialogPage* ) w ); diff --git a/kpovmodeler/pmsettingsdialog.h b/kpovmodeler/pmsettingsdialog.h index 1b2efa1a..ad4f5119 100644 --- a/kpovmodeler/pmsettingsdialog.h +++ b/kpovmodeler/pmsettingsdialog.h @@ -50,7 +50,7 @@ class PMViewLayoutEntry; */ class PMSettingsDialogPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -125,7 +125,7 @@ public: */ class PMSettingsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index 7b96e066..2932eccc 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -52,7 +52,7 @@ PMShell::PMShell( const KURL& url ) setPluginLoadingMode( DoNotLoadPlugins ); setInstance( PMFactory::instance( ), false ); - m_pPart = new PMPart( this, "part", TQT_TQOBJECT(this), "part", true, this ); + m_pPart = new PMPart( this, "part", this, "part", true, this ); m_pPart->setReadWrite( ); // read-write mode m_viewNumber = 0; m_objectsToDelete.setAutoDelete( true ); @@ -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( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew( ) ), actionCollection( ) ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen( ) ), actionCollection( ) ); - m_pRecent = KStdAction::openRecent( TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave( ) ), actionCollection( ) ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) ); + KStdAction::save( this, TQ_SLOT( slotFileSave( ) ), actionCollection( ) ); + KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs( ) ), actionCollection( ) ); - KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT( slotFileRevert( ) ), actionCollection( ) ); - KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint( ) ), actionCollection( ) ); + KStdAction::revert( this, TQ_SLOT( slotFileRevert( ) ), actionCollection( ) ); + KStdAction::print( this, TQ_SLOT( slotFilePrint( ) ), actionCollection( ) ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose( ) ), actionCollection( ) ); - KStdAction::quit( TQT_TQOBJECT(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, TQT_TQOBJECT(this), - TQT_SLOT( slotShowPath( ) ), actionCollection( ), + m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, this, + TQ_SLOT( slotShowPath( ) ), actionCollection( ), "options_show_path" ); m_pPathAction->setCheckedState(i18n("Hide &Path")); - m_pStatusbarAction = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT( slotShowStatusbar( ) ), + m_pStatusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( slotShowStatusbar( ) ), actionCollection( ) ); - KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT( saveOptions( ) ), actionCollection( ) ); + KStdAction::saveOptions( this, TQ_SLOT( saveOptions( ) ), actionCollection( ) ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys( ) ), + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys( ) ), actionCollection( ) ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars( ) ), + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars( ) ), actionCollection( ) ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotSettings( ) ), actionCollection( ) ); + KStdAction::preferences( this, TQ_SLOT( slotSettings( ) ), actionCollection( ) ); - m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewTopView( ) ), + m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, this, + TQ_SLOT( slotNewTopView( ) ), actionCollection( ), "view_new_topview" ); - m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewBottomView( ) ), + m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, this, + TQ_SLOT( slotNewBottomView( ) ), actionCollection( ), "view_new_bottomview" ); - m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewLeftView( ) ), + m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, this, + TQ_SLOT( slotNewLeftView( ) ), actionCollection( ), "view_new_leftview" ); - m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewRightView( ) ), + m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, this, + TQ_SLOT( slotNewRightView( ) ), actionCollection( ), "view_new_rightview" ); - m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewFrontView( ) ), + m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, this, + TQ_SLOT( slotNewFrontView( ) ), actionCollection( ), "view_new_frontview" ); - m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewBackView( ) ), + m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, this, + TQ_SLOT( slotNewBackView( ) ), actionCollection( ), "view_new_back_view" ); - m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewCameraView( ) ), + m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, this, + TQ_SLOT( slotNewCameraView( ) ), actionCollection( ), "view_new_cameraview" ); - m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewTreeView( ) ), actionCollection( ), + m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, this, + TQ_SLOT( slotNewTreeView( ) ), actionCollection( ), "view_new_treeview" ); - m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewDialogView( ) ), actionCollection( ), + m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, this, + TQ_SLOT( slotNewDialogView( ) ), actionCollection( ), "view_new_dialogview" ); #ifdef KPM_WITH_OBJECT_LIBRARY - m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ), + m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, this, + 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, TQT_TQOBJECT(this), - TQT_SLOT( slotSaveViewLayout( ) ), + m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, this, + 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; } @@ -341,13 +341,13 @@ void PMShell::slotNewLibraryBrowserView( ) void PMShell::slotDockWidgetClosed( ) { - const TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( ))); + const TQObject* o = sender( ); if( o && o->inherits( "PMDockWidget" ) ) { if( m_objectsToDelete.containsRef( o ) == 0 ) { m_objectsToDelete.append( o ); - TQTimer::singleShot( 0, TQT_TQOBJECT(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, TQT_TQOBJECT(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/pmshell.h b/kpovmodeler/pmshell.h index c21a51ad..026e6d36 100644 --- a/kpovmodeler/pmshell.h +++ b/kpovmodeler/pmshell.h @@ -41,7 +41,7 @@ class PMViewOptions; */ class PMShell : public PMDockMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpovmodeler/pmskysphereedit.h b/kpovmodeler/pmskysphereedit.h index 758ffed2..6b1ad377 100644 --- a/kpovmodeler/pmskysphereedit.h +++ b/kpovmodeler/pmskysphereedit.h @@ -32,7 +32,7 @@ class PMSkySphere; */ class PMSkySphereEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmslopeedit.h b/kpovmodeler/pmslopeedit.h index 137012b6..c0e71842 100644 --- a/kpovmodeler/pmslopeedit.h +++ b/kpovmodeler/pmslopeedit.h @@ -38,7 +38,7 @@ class TQLabel; */ class PMSlopeEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmsolidcoloredit.h b/kpovmodeler/pmsolidcoloredit.h index 493dd42a..76fd0933 100644 --- a/kpovmodeler/pmsolidcoloredit.h +++ b/kpovmodeler/pmsolidcoloredit.h @@ -33,7 +33,7 @@ class PMColorEdit; */ class PMSolidColorEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: 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/pmsolidobjectedit.h b/kpovmodeler/pmsolidobjectedit.h index 9be7514f..54698469 100644 --- a/kpovmodeler/pmsolidobjectedit.h +++ b/kpovmodeler/pmsolidobjectedit.h @@ -33,7 +33,7 @@ class TQCheckBox; */ class PMSolidObjectEdit : public PMGraphicalObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMGraphicalObjectEdit Base; public: 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/pmsoredit.h b/kpovmodeler/pmsoredit.h index 90ed8007..d803567b 100644 --- a/kpovmodeler/pmsoredit.h +++ b/kpovmodeler/pmsoredit.h @@ -41,7 +41,7 @@ class PMVectorListEdit; */ class PMSurfaceOfRevolutionEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmsphereedit.h b/kpovmodeler/pmsphereedit.h index 04db9599..a35740cb 100644 --- a/kpovmodeler/pmsphereedit.h +++ b/kpovmodeler/pmsphereedit.h @@ -35,7 +35,7 @@ class PMFloatEdit ; */ class PMSphereEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmspheresweepedit.h b/kpovmodeler/pmspheresweepedit.h index 994211a9..22811538 100644 --- a/kpovmodeler/pmspheresweepedit.h +++ b/kpovmodeler/pmspheresweepedit.h @@ -42,7 +42,7 @@ class TQLabel; */ class PMSphereSweepEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmsqeedit.h b/kpovmodeler/pmsqeedit.h index 305ad862..abcad372 100644 --- a/kpovmodeler/pmsqeedit.h +++ b/kpovmodeler/pmsqeedit.h @@ -33,7 +33,7 @@ class PMFloatEdit; */ class PMSuperquadricEllipsoidEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmtextedit.h b/kpovmodeler/pmtextedit.h index 9b205159..8b2b285c 100644 --- a/kpovmodeler/pmtextedit.h +++ b/kpovmodeler/pmtextedit.h @@ -36,7 +36,7 @@ class TQPushButton; */ class PMTextEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmtexturebaseedit.h b/kpovmodeler/pmtexturebaseedit.h index 6fe6c3ea..c1d1f066 100644 --- a/kpovmodeler/pmtexturebaseedit.h +++ b/kpovmodeler/pmtexturebaseedit.h @@ -33,7 +33,7 @@ class PMLinkEdit; */ class PMTextureBaseEdit : public PMNamedObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMNamedObjectEdit Base; public: 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/pmtextureedit.h b/kpovmodeler/pmtextureedit.h index 605dca39..66580b11 100644 --- a/kpovmodeler/pmtextureedit.h +++ b/kpovmodeler/pmtextureedit.h @@ -33,7 +33,7 @@ class TQCheckBox; */ class PMTextureEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmtexturemapedit.h b/kpovmodeler/pmtexturemapedit.h index 95b9d030..ff14d727 100644 --- a/kpovmodeler/pmtexturemapedit.h +++ b/kpovmodeler/pmtexturemapedit.h @@ -37,7 +37,7 @@ class TQLabel; */ class PMTextureMapEdit : public PMTextureBaseEdit { - Q_OBJECT + TQ_OBJECT typedef PMTextureBaseEdit Base; public: 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/pmtorusedit.h b/kpovmodeler/pmtorusedit.h index aac8050b..b6ec6499 100644 --- a/kpovmodeler/pmtorusedit.h +++ b/kpovmodeler/pmtorusedit.h @@ -34,7 +34,7 @@ class TQCheckBox; */ class PMTorusEdit : public PMSolidObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMSolidObjectEdit Base; public: 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/pmtranslateedit.h b/kpovmodeler/pmtranslateedit.h index 376ac6c7..19b018d8 100644 --- a/kpovmodeler/pmtranslateedit.h +++ b/kpovmodeler/pmtranslateedit.h @@ -33,7 +33,7 @@ class PMVectorEdit; */ class PMTranslateEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index 7ac1ca76..99499d83 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -75,16 +75,16 @@ PMTreeView::PMTreeView( PMPart* part, TQWidget* parent /*= 0*/, viewport( )->setAcceptDrops( true ); viewport( )->setMouseTracking( true ); - viewport( )->setFocusPolicy( TQ_WheelFocus ); - setFocusPolicy( TQ_WheelFocus ); + viewport( )->setFocusPolicy( TQWidget::WheelFocus ); + 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( ); } @@ -101,7 +101,7 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode, bool as = m_acceptSelect; m_acceptSelect = true; - if( TQT_BASE_OBJECT(sender) != TQT_BASE_OBJECT(this) ) + if( sender != this ) { if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) ) { @@ -361,7 +361,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) if( m_selectionCleared ) { - emit objectChanged( 0, PMCNewSelection, TQT_TQOBJECT(this) ); + emit objectChanged( 0, PMCNewSelection, this ); specialAction = true; } else if( m_itemSelected || m_itemDeselected ) @@ -378,7 +378,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) m_pLastSelected->setSelected( true ); emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, - TQT_TQOBJECT(this) ); + this ); } else { @@ -407,7 +407,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) { tmp->setSelected( true ); emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ), - PMCSelected, TQT_TQOBJECT(this) ); + PMCSelected, this ); if( tmp == m_pLastSelected ) break; } @@ -418,7 +418,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) { tmp->setSelected( true ); emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ), - PMCSelected, TQT_TQOBJECT(this) ); + PMCSelected, this ); if( tmp == oldCurrent ) break; } @@ -436,12 +436,12 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) if( m_itemSelected ) { if( m_pLastSelected->object( )->isSelectable( ) ) - emit objectChanged( m_pLastSelected->object( ), PMCSelected, TQT_TQOBJECT(this) ); + emit objectChanged( m_pLastSelected->object( ), PMCSelected, this ); else m_pLastSelected->setSelected( false ); } else if( m_itemDeselected ) - emit objectChanged( m_pLastSelected->object( ), PMCDeselected, TQT_TQOBJECT(this) ); + emit objectChanged( m_pLastSelected->object( ), PMCDeselected, this ); } m_acceptSelect = false; } @@ -472,7 +472,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e ) TQPoint p = e->pos( ); - if( e->button( ) & Qt::RightButton ) + if( e->button( ) & TQt::RightButton ) { if( m_pPart->factory( ) ) { @@ -497,7 +497,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e ) if( item ) { - if( e->button( ) == Qt::LeftButton || e->button( ) == Qt::MidButton ) + if( e->button( ) == TQt::LeftButton || e->button( ) == TQt::MidButton ) { m_pressed = true; m_pressedPos = e->pos( ); @@ -526,7 +526,7 @@ void PMTreeView::viewportMouseReleaseEvent( TQMouseEvent* e ) m_pLastSelected->setSelected( true ); m_acceptSelect = false; - emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, TQT_TQOBJECT(this) ); + emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, this ); } } } @@ -769,7 +769,7 @@ void PMTreeView::keyPressEvent( TQKeyEvent* e ) m_acceptSelect = false; emit objectChanged( ( ( PMTreeViewItem* ) newSelection )->object( ), - PMCNewSelection, TQT_TQOBJECT(this) ); + PMCNewSelection, this ); } if( deleteItem && m_pPart->isReadWrite( ) ) diff --git a/kpovmodeler/pmtreeview.h b/kpovmodeler/pmtreeview.h index 87764921..8589ec6d 100644 --- a/kpovmodeler/pmtreeview.h +++ b/kpovmodeler/pmtreeview.h @@ -53,7 +53,7 @@ public: */ class PMTreeView : public TQListView { - Q_OBJECT + TQ_OBJECT friend class PMTreeViewItem; public: 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/pmtriangleedit.h b/kpovmodeler/pmtriangleedit.h index 86141872..fdf21e10 100644 --- a/kpovmodeler/pmtriangleedit.h +++ b/kpovmodeler/pmtriangleedit.h @@ -36,7 +36,7 @@ class TQPushButton; */ class PMTriangleEdit : public PMGraphicalObjectEdit { - Q_OBJECT + TQ_OBJECT typedef PMGraphicalObjectEdit Base; public: 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/pmvectoredit.h b/kpovmodeler/pmvectoredit.h index e970f7b1..2c2d6ca4 100644 --- a/kpovmodeler/pmvectoredit.h +++ b/kpovmodeler/pmvectoredit.h @@ -33,7 +33,7 @@ */ class PMVectorEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index 0fa5ded9..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 ) ); } @@ -345,7 +345,7 @@ bool PMVectorListEdit::eventFilter( TQObject* o, TQEvent* e ) if( e->type( ) == TQEvent::Wheel && parent( ) ) return TQApplication::sendEvent( parent( ), e ); if( e->type( ) == TQEvent::MouseButtonPress - && ( ( TQMouseEvent* ) e )->button( ) == Qt::RightButton ) + && ( ( TQMouseEvent* ) e )->button( ) == TQt::RightButton ) { bool b = TQTable::eventFilter( o, e ); emit showContextMenu( ); diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h index 77b38d78..8064b778 100644 --- a/kpovmodeler/pmvectorlistedit.h +++ b/kpovmodeler/pmvectorlistedit.h @@ -55,7 +55,7 @@ private: */ class PMVectorListEdit : public TQTable { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp index e9ec01d1..8ede8ab1 100644 --- a/kpovmodeler/pmview.cpp +++ b/kpovmodeler/pmview.cpp @@ -40,8 +40,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name ) setBackgroundMode( PaletteBase ); TQVBoxLayout* layout = new TQVBoxLayout( this ); - m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" ); - m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter, + m_pMainSplitter = new TQSplitter( TQt::Horizontal, this, "MainSplitter" ); + m_pTreeEditSplitter = new TQSplitter( TQt::Vertical, m_pMainSplitter, "TreeEditSplitter" ); diff --git a/kpovmodeler/pmview.h b/kpovmodeler/pmview.h index 42a73597..5e43f9d9 100644 --- a/kpovmodeler/pmview.h +++ b/kpovmodeler/pmview.h @@ -37,7 +37,7 @@ class TDEConfig; */ class PMView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h index 6cb92b09..a6ce739c 100644 --- a/kpovmodeler/pmviewbase.h +++ b/kpovmodeler/pmviewbase.h @@ -64,7 +64,7 @@ public: */ class PMViewOptionsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -90,7 +90,7 @@ signals: */ class PMViewBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index a3eb400b..a61646db 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -520,7 +520,7 @@ void PMViewLayout::recursiveExtractColumns( if( w->inherits( "PMDockSplitter" ) ) { PMDockSplitter* sp = ( PMDockSplitter* ) w; - if( sp->splitterOrientation( ) == Qt::Vertical ) + if( sp->splitterOrientation( ) == TQt::Vertical ) { colStart = false; // vertical splitter, split up the current column @@ -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/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h index 80c65e17..a88e7303 100644 --- a/kpovmodeler/pmviewlayoutmanager.h +++ b/kpovmodeler/pmviewlayoutmanager.h @@ -289,7 +289,7 @@ private: class PMSaveViewLayoutDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PMSaveViewLayoutDialog( PMShell* parent, const char* name = 0 ); 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/kpovmodeler/pmwarpedit.h b/kpovmodeler/pmwarpedit.h index 4761a32f..0838cb39 100644 --- a/kpovmodeler/pmwarpedit.h +++ b/kpovmodeler/pmwarpedit.h @@ -38,7 +38,7 @@ class TQLabel; */ class PMWarpEdit : public PMDialogEditBase { - Q_OBJECT + TQ_OBJECT typedef PMDialogEditBase Base; public: diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 7041fea1..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())); */ } @@ -575,15 +575,15 @@ void KLineal::mousePressEvent(TQMouseEvent *inEvent) { TQRect gr = geometry(); mDragOffset = mLastClickPos - TQPoint(gr.left(), gr.top()); - if (inEvent->button() == Qt::LeftButton) { + if (inEvent->button() == TQt::LeftButton) { if (!mDragging) { grabMouse(KCursor::sizeAllCursor()); mDragging = TRUE; } - } else if (inEvent->button() == Qt::MidButton) { + } else if (inEvent->button() == TQt::MidButton) { _clicked = true; turnLeft(); - } else if (inEvent->button() == Qt::RightButton) { + } else if (inEvent->button() == TQt::RightButton) { showMenu(); } } diff --git a/kruler/klineal.h b/kruler/klineal.h index f9c7f8af..0c2001cb 100644 --- a/kruler/klineal.h +++ b/kruler/klineal.h @@ -31,7 +31,7 @@ #include <tqcursor.h> class KLineal : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: enum { North=0, West=1, South=2, East=3 }; diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index ad5df57c..0743de97 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -6,6 +6,7 @@ * (c) Aaron J. Seigo 2002 * (c) Nadeem Hasan 2003 * (c) Bernd Brandstetter 2004 + * (c) Emanoil Kotsev 2023 * * Released under the LGPL see file LICENSE for details. */ @@ -35,6 +36,9 @@ #include <tdepopupmenu.h> #include <kpushbutton.h> #include <tdestartupinfo.h> +#include <kiconloader.h> +#include <kprocess.h> +#include <krun.h> #include <tqcursor.h> #include <tqregexp.h> @@ -72,12 +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, 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 ); @@ -106,39 +111,59 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) autoincFilename(); } - connect( &grabTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( grabTimerDone() ) ); - connect( &updateTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( updatePreview() ) ); - TQTimer::singleShot( 0, TQT_TQOBJECT(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); TQPushButton *helpButton = actionButton( Help ); helpButton->setPopup(helpMenu->menu()); + // Populate Open With... menu + TDEPopupMenu *popupOpenWith = new TDEPopupMenu(this); + openWithOffers = TDETrader::self()->query("image/png", "Type == 'Application'"); + int i = 0; + for (TDETrader::OfferList::Iterator it = openWithOffers.begin(); it != openWithOffers.end(); ++it) + { + popupOpenWith->insertItem(SmallIcon((*it)->icon()), (*it)->name(), i); + ++i; // we need menu ids to match with OfferList indexes + } + mainWidget->btnOpenWith->setPopup(popupOpenWith); + connect(popupOpenWith, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenWith(int))); + + // Check for KolourPaint availability + KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint"); + if (!kpaint) { + mainWidget->btnOpenWithKP->hide(); + } + TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(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, TQT_TQOBJECT(this), TQT_SLOT(slotSave())); - accel->insert(TDEStdAccel::Save, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); -// accel->insert(TDEShortcut(CTRL+Key_A), TQT_TQOBJECT(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, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); - accel->insert(TDEStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert(TDEStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); - accel->insert(TDEStdAccel::Copy, TQT_TQOBJECT(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, TQT_TQOBJECT(this), TQT_SLOT(slotSave())); - accel->insert( "Save2", Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); - accel->insert( "Print2", Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert( "New2", Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); - accel->insert( "New3", Key_Space, TQT_TQOBJECT(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(); + + oldWinPos = pos(); } KSnapshot::~KSnapshot() @@ -254,15 +279,16 @@ void KSnapshot::slotDragSnapshot() void KSnapshot::slotGrab() { + oldWinPos = pos(); hide(); - if ( mainWidget->delay() && mainWidget->mode() != Region ) + if ( mainWidget->delay() ) grabTimer.start( mainWidget->delay() * 1000, true ); 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(); @@ -312,7 +338,7 @@ void KSnapshot::slotPrint() neww = newh/h*w; } - img = img.smoothScale( int(neww), int(newh), TQ_ScaleMin ); + img = img.smoothScale( int(neww), int(newh), TQImage::ScaleMin ); tqApp->processEvents(); int x = (metrics.width()-img.width())/2; @@ -342,6 +368,7 @@ void KSnapshot::slotRegionGrabbed( const TQPixmap &pix ) delete rgnGrab; TQApplication::restoreOverrideCursor(); + move(oldWinPos); show(); } @@ -356,29 +383,107 @@ void KSnapshot::slotWindowGrabbed( const TQPixmap &pix ) } TQApplication::restoreOverrideCursor(); + move(oldWinPos); show(); } +void KSnapshot::slotOpenWith(int id) +{ + openWithExternalApp(*openWithOffers[id]); +} + +void KSnapshot::slotOpenWithKP() { + KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint"); + if (kpaint) { + openWithExternalApp(*kpaint); + } +} + +void KSnapshot::openWithExternalApp(const KService &service) { + // Write snapshot to temporary file + bool ok = false; + KTempFile *tmpFile = new KTempFile; + if (tmpFile->status() == 0) { + if (snapshot.save(tmpFile->file(), "PNG")) { + if (tmpFile->close()) { + ok = true; + } + } + } + + if (!ok) { + KMessageBox::error(this, i18n("KSnapshot was unable to create temporary file."), + i18n("Unable to save image")); + delete tmpFile; + return; + } + + // Launch application + KURL::List list; + list.append(tmpFile->name()); + TQStringList args = KRun::processDesktopExec(service, list, false, false); + + TDEProcess *externalApp = new TDEProcess; + *externalApp << args; + 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())); + delete tmpFile; + return; + } + + m_tmpFiles[externalApp] = tmpFile; +} + +void KSnapshot::slotExternalAppClosed(TDEProcess *process) +{ + if (process && m_tmpFiles.contains(process)) + { + KTempFile *tmpFile = m_tmpFiles[process]; + if (tmpFile) + { + snapshot.load(tmpFile->name()); + updatePreview(); + tmpFile->unlink(); + delete tmpFile; + } + m_tmpFiles.remove(process); + } +} + +void KSnapshot::slotAboutToQuit() +{ + for (KTempFile *tmpFile : m_tmpFiles) + { + tmpFile->unlink(); + delete tmpFile; + } + m_tmpFiles.clear(); + + TDEConfig *conf=TDEGlobal::config(); + conf->setGroup("GENERAL"); + conf->writeEntry("delay",mainWidget->delay()); + conf->writeEntry("mode",mainWidget->mode()); + conf->writeEntry("includeDecorations",mainWidget->includeDecorations()); + KURL url = filename; + url.setPass( TQString() ); + conf->writePathEntry("filename",url.url()); +} + void KSnapshot::closeEvent( TQCloseEvent * e ) { - TDEConfig *conf=TDEGlobal::config(); - conf->setGroup("GENERAL"); - conf->writeEntry("delay",mainWidget->delay()); - conf->writeEntry("mode",mainWidget->mode()); - conf->writeEntry("includeDecorations",mainWidget->includeDecorations()); - KURL url = filename; - url.setPass( TQString() ); - conf->writePathEntry("filename",url.url()); - e->accept(); + e->accept(); } bool KSnapshot::eventFilter( TQObject* o, TQEvent* e) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(grabber) && e->type() == TQEvent::MouseButtonPress ) { + if ( o == grabber && e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; if ( TQWidget::mouseGrabber() != grabber ) return false; - if ( me->button() == Qt::LeftButton ) + if ( me->button() == TQt::LeftButton ) performGrab(); } return false; @@ -430,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(); @@ -446,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 ) { @@ -460,6 +565,7 @@ void KSnapshot::performGrab() TQApplication::restoreOverrideCursor(); modified = true; updateCaption(); + move(oldWinPos); show(); } @@ -483,6 +589,11 @@ void KSnapshot::setURL( const TQString &url ) updateCaption(); } +void KSnapshot::setPixmap(const TQPixmap &newImage) { + snapshot = newImage; + updatePreview(); +} + void KSnapshot::setGrabMode( int m ) { mainWidget->setMode( m ); diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index 1146a718..47cbe47e 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -5,6 +5,7 @@ #include <tqbitmap.h> #include <tqcursor.h> #include <tqlabel.h> +#include <tqmap.h> #include <tqpainter.h> #include <tqpixmap.h> #include <tqstyle.h> @@ -14,14 +15,16 @@ #include <tdeglobalsettings.h> #include <kdialogbase.h> #include <kurl.h> +#include <ktrader.h> class RegionGrabber; class KSnapshotWidget; +class KTempFile; +class TDEProcess; class KSnapshotPreview : public TQLabel { - Q_OBJECT - + TQ_OBJECT public: KSnapshotPreview(TQWidget *parent, const char *name = 0) @@ -42,14 +45,14 @@ class KSnapshotPreview : public TQLabel { TQPainter p(&mask); - style().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); + style().drawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); p.end(); handle.setMask(mask); } { TQPainter p(&handle); - style().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); + style().drawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); p.end(); } @@ -89,8 +92,7 @@ class KSnapshotPreview : public TQLabel class KSnapshot : public KDialogBase, virtual public KSnapshotIface { - Q_OBJECT - + TQ_OBJECT public: KSnapshot(TQWidget *parent= 0, const char *name= 0, bool grabCurrent=false); @@ -102,16 +104,21 @@ public: TQString url() const { return filename.url(); } protected slots: + void slotAboutToQuit(); void slotGrab(); void slotSave(); void slotSaveAs(); void slotCopy(); void slotPrint(); + void slotOpenWith(int id); + void slotOpenWithKP(); + void slotExternalAppClosed(TDEProcess *process); void slotMovePointer( int x, int y ); void setTime(int newTime); void setURL(const TQString &newURL); void setGrabMode( int m ); + void setPixmap(const TQPixmap &newImage); void exit(); protected: @@ -120,7 +127,7 @@ protected: virtual void closeEvent( TQCloseEvent * e ); void resizeEvent(TQResizeEvent*); bool eventFilter( TQObject*, TQEvent* ); - + private slots: void grabTimerDone(); void slotDragSnapshot(); @@ -131,6 +138,7 @@ private slots: private: bool save( const KURL& url ); + void openWithExternalApp(const KService &service); void performGrab(); void autoincFilename(); int grabMode(); @@ -144,6 +152,9 @@ private: KSnapshotWidget *mainWidget; RegionGrabber *rgnGrab; bool modified; + TDETrader::OfferList openWithOffers; + TQMap<TDEProcess*, KTempFile*> m_tmpFiles; + TQPoint oldWinPos; }; #endif // KSNAPSHOT_H diff --git a/ksnapshot/ksnapshotiface.h b/ksnapshot/ksnapshotiface.h index 5136b0ba..e8ac5158 100644 --- a/ksnapshot/ksnapshotiface.h +++ b/ksnapshot/ksnapshotiface.h @@ -12,6 +12,7 @@ #define __KS_IFACE_H #include <dcopobject.h> +#include <tqpixmap.h> class KSnapshotIface : virtual public DCOPObject { @@ -60,6 +61,10 @@ class KSnapshotIface : virtual public DCOPObject /** Exit KSnapshot **/ virtual void exit() = 0; + + /** Set image, for applications which want to make use of KSnapshot's UI + and interface with their own images */ + virtual void setPixmap(const TQPixmap &newImage) = 0; }; #endif diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui index 245d433b..71385f90 100644 --- a/ksnapshot/ksnapshotwidget.ui +++ b/ksnapshot/ksnapshotwidget.ui @@ -242,6 +242,34 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <string>Click this button to print the current screenshot.</string> </property> </widget> + <widget class="KPushButton"> + <property name="name"> + <cstring>btnOpenWithKP</cstring> + </property> + <property name="text"> + <string>Open in &KolourPaint</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Click this button to edit the snapshot in KolourPaint.</string> + </property> + <property name="iconSet"> + <iconset>"kolourpaint"</iconset> + </property> + </widget> + <widget class="KPushButton"> + <property name="name"> + <cstring>btnOpenWith</cstring> + </property> + <property name="text"> + <string>Open &with...</string> + </property> + <property name="iconSet"> + <iconset>"document-open"</iconset> + </property> + <property name="whatsThis" stdset="0"> + <string>Click this button to open the snapshot in another application.</string> + </property> + </widget> </vbox> </widget> </grid> @@ -290,6 +318,12 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <slot>slotPrintClicked()</slot> </connection> <connection> + <sender>btnOpenWithKP</sender> + <signal>clicked()</signal> + <receiver>KSnapshotWidget</receiver> + <slot>slotOpenWithKPClicked()</slot> + </connection> + <connection> <sender>btnSave</sender> <signal>clicked()</signal> <receiver>KSnapshotWidget</receiver> @@ -323,23 +357,25 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>newClicked()</signal> <signal>saveClicked()</signal> <signal>copyClicked()</signal> <signal>printClicked()</signal> + <signal>openWithKPClicked()</signal> <signal>startImageDrag()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot> <slot access="protected" specifier="non virtual">slotNewClicked()</slot> <slot access="protected" specifier="non virtual">slotSaveClicked()</slot> <slot access="protected" specifier="non virtual">slotCopyClicked()</slot> <slot access="protected" specifier="non virtual">slotPrintClicked()</slot> <slot access="protected" specifier="non virtual">slotStartDrag()</slot> + <slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot> <slot specifier="non virtual" returnType="int">previewWidth()</slot> <slot specifier="non virtual" returnType="int">previewHeight()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">setPreview( const TQPixmap & pm )</function> <function specifier="non virtual">setDelay( int i )</function> diff --git a/ksnapshot/ksnapshotwidget.ui.h b/ksnapshot/ksnapshotwidget.ui.h index 921accc9..c84f65ca 100644 --- a/ksnapshot/ksnapshotwidget.ui.h +++ b/ksnapshot/ksnapshotwidget.ui.h @@ -27,8 +27,6 @@ void KSnapshotWidget::slotModeChanged( int mode ) default: break; } - - spinDelay->setEnabled(mode != 2); } @@ -39,10 +37,10 @@ void KSnapshotWidget::setPreview( const TQPixmap &pm ) if ( r1 * previewWidth() < previewHeight() ) img = img.smoothScale( previewWidth(), int( previewWidth() * r1 ), - TQ_ScaleMin ); + TQImage::ScaleMin ); else img = img.smoothScale( ( int ) ( ( ( double )previewHeight() ) / r1 ), - previewHeight(), TQ_ScaleMin ); + previewHeight(), TQImage::ScaleMin ); TQToolTip::remove( lblImage ); TQToolTip::add( lblImage, @@ -136,3 +134,8 @@ void KSnapshotWidget::slotCopyClicked() { emit copyClicked(); } + +void KSnapshotWidget::slotOpenWithKPClicked() +{ + emit openWithKPClicked(); +} diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 2c4d4a2b..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() @@ -104,7 +104,7 @@ void RegionGrabber::initGrabber() void RegionGrabber::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { mouseDown = true; grabRect = TQRect( e->pos(), e->pos() ); @@ -168,7 +168,7 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); diff --git a/ksnapshot/regiongrabber.h b/ksnapshot/regiongrabber.h index 24c65d70..0495bf5a 100644 --- a/ksnapshot/regiongrabber.h +++ b/ksnapshot/regiongrabber.h @@ -37,7 +37,7 @@ class SizeTip : public TQLabel class RegionGrabber : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp index eac0fa6e..70fbabdc 100644 --- a/ksnapshot/windowgrabber.cpp +++ b/ksnapshot/windowgrabber.cpp @@ -240,7 +240,7 @@ TQPixmap WindowGrabber::grabCurrent( bool includeDecorations ) void WindowGrabber::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) + if ( e->button() == TQt::RightButton ) yPos = e->globalY(); else { TQPixmap pm; @@ -258,7 +258,7 @@ void WindowGrabber::mousePressEvent( TQMouseEvent *e ) void WindowGrabber::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) + if ( e->button() == TQt::RightButton ) yPos = -1; } diff --git a/ksnapshot/windowgrabber.h b/ksnapshot/windowgrabber.h index cf2c186a..eb771d8d 100644 --- a/ksnapshot/windowgrabber.h +++ b/ksnapshot/windowgrabber.h @@ -28,7 +28,7 @@ class WindowGrabber : public TQDialog { - Q_OBJECT + TQ_OBJECT public: 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/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h index 70704ec1..75ac574c 100644 --- a/ksvg/core/KSVGCanvas.h +++ b/ksvg/core/KSVGCanvas.h @@ -58,7 +58,7 @@ class CanvasPaintServer; // Must be a TQObject to be able to be loaded by KLibLoader... class KSVGCanvas : public TQObject { -Q_OBJECT +TQ_OBJECT public: KSVGCanvas(unsigned int width, unsigned int height); diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp index f075d2ff..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); } @@ -128,14 +128,14 @@ void KSVGLoader::slotResult(TDEIO::Job *job) if(check.contains(".svgz") || check.contains(".svg.gz")) { // decode the gzipped svg and emit it - TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(new TQBuffer(m_data)), "application/x-gzip"); + TQIODevice *dev = KFilterDev::device(new TQBuffer(m_data), "application/x-gzip"); dev->open(IO_ReadOnly); emit gotResult(dev); } else { m_job = 0; - emit gotResult(TQT_TQIODEVICE(new TQBuffer(m_data))); + emit gotResult(new TQBuffer(m_data)); m_data.resize(0); } } @@ -162,7 +162,7 @@ void KSVGLoader::slotResult(TDEIO::Job *job) if(buffer.open(IO_ReadOnly)) { - const char *imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer)); + const char *imageFormat = TQImageIO::imageFormat(&buffer); if(imageFormat != 0) { @@ -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/core/KSVGLoader.h b/ksvg/core/KSVGLoader.h index 10cd19ac..9e18c218 100644 --- a/ksvg/core/KSVGLoader.h +++ b/ksvg/core/KSVGLoader.h @@ -54,7 +54,7 @@ class SVGElementImpl; class SVGDocumentImpl; class KSVGLoader : public TQObject { -Q_OBJECT +TQ_OBJECT public: KSVGLoader(); diff --git a/ksvg/core/KSVGReader.h b/ksvg/core/KSVGReader.h index 6ca13337..226124b0 100644 --- a/ksvg/core/KSVGReader.h +++ b/ksvg/core/KSVGReader.h @@ -30,7 +30,7 @@ namespace KSVG class SVGDocumentImpl; class KSVGReader : public TQObject { -Q_OBJECT +TQ_OBJECT public: struct ParsingArgs diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h index dc289191..f0fd2042 100644 --- a/ksvg/ecma/ksvg_window.h +++ b/ksvg/ecma/ksvg_window.h @@ -99,7 +99,7 @@ public: }; class WindowQObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: WindowQObject(Window *w); 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/SVGDocumentImpl.h b/ksvg/impl/SVGDocumentImpl.h index e9d12a0d..58babf96 100644 --- a/ksvg/impl/SVGDocumentImpl.h +++ b/ksvg/impl/SVGDocumentImpl.h @@ -71,7 +71,7 @@ class SVGDocumentImpl : public TQObject, public DOM::Document, public SVGDOMNodeBridge { -Q_OBJECT +TQ_OBJECT public: SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *parentImage = 0); diff --git a/ksvg/impl/SVGGlyphElementImpl.cpp b/ksvg/impl/SVGGlyphElementImpl.cpp index 9b909960..b267fe18 100644 --- a/ksvg/impl/SVGGlyphElementImpl.cpp +++ b/ksvg/impl/SVGGlyphElementImpl.cpp @@ -46,7 +46,7 @@ TQString SVGGlyphElementImpl::d() const unicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly glyph-name SVGGlyphElementImpl::GlyphName DontDelete|ReadOnly d SVGGlyphElementImpl::D DontDelete|ReadOnly - orientation SVGGlyphElementImpl::Qt::Orientation DontDelete|ReadOnly + orientation SVGGlyphElementImpl::Orientation DontDelete|ReadOnly arabic-form SVGGlyphElementImpl::ArabicForm DontDelete|ReadOnly lang SVGGlyphElementImpl::Lang DontDelete|ReadOnly horiz-adv-x SVGGlyphElementImpl::HorizAdvX DontDelete|ReadOnly 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/SVGImageElementImpl.h b/ksvg/impl/SVGImageElementImpl.h index 96985440..c0858ba8 100644 --- a/ksvg/impl/SVGImageElementImpl.h +++ b/ksvg/impl/SVGImageElementImpl.h @@ -51,7 +51,7 @@ class SVGImageElementImpl : public TQObject, public SVGStylableImpl, public SVGTransformableImpl { -Q_OBJECT +TQ_OBJECT public: SVGImageElementImpl(DOM::ElementImpl *); diff --git a/ksvg/impl/SVGScriptElementImpl.cpp b/ksvg/impl/SVGScriptElementImpl.cpp index f97ebf89..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 *))); } } @@ -95,7 +95,7 @@ void SVGScriptElementImpl::slotResult(TDEIO::Job *) m_data[m_data.size() - 1] = '\0'; TQBuffer buf(m_data); - TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(&buf), "application/x-gzip", false); + TQIODevice *dev = KFilterDev::device(&buf, "application/x-gzip", false); TQByteArray contents; if(dev->open(IO_ReadOnly)) contents = dev->readAll(); diff --git a/ksvg/impl/SVGScriptElementImpl.h b/ksvg/impl/SVGScriptElementImpl.h index 2850af9d..d6c03cf9 100644 --- a/ksvg/impl/SVGScriptElementImpl.h +++ b/ksvg/impl/SVGScriptElementImpl.h @@ -41,7 +41,7 @@ class SVGScriptElementImpl : public TQObject, public SVGURIReferenceImpl, public SVGExternalResourcesRequiredImpl { -Q_OBJECT +TQ_OBJECT public: SVGScriptElementImpl(DOM::ElementImpl *); 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/impl/SVGTimeScheduler.h b/ksvg/impl/SVGTimeScheduler.h index cc897a57..605a5173 100644 --- a/ksvg/impl/SVGTimeScheduler.h +++ b/ksvg/impl/SVGTimeScheduler.h @@ -66,7 +66,7 @@ typedef TQValueList<SVGTimer *> SVGTimerList; class SVGDocumentImpl; class SVGTimeScheduler : public TQObject { -Q_OBJECT +TQ_OBJECT public: SVGTimeScheduler(SVGDocumentImpl *doc); diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h index e0785460..185c7a98 100644 --- a/ksvg/plugin/backends/agg/AggCanvasFactory.h +++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h @@ -35,7 +35,7 @@ public: AggCanvasFactory(); virtual ~AggCanvasFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList()); }; }; diff --git a/ksvg/plugin/backends/libart/LibartCanvasFactory.h b/ksvg/plugin/backends/libart/LibartCanvasFactory.h index 6afd958d..f13d43c1 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasFactory.h +++ b/ksvg/plugin/backends/libart/LibartCanvasFactory.h @@ -35,7 +35,7 @@ public: LibartCanvasFactory(); virtual ~LibartCanvasFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList()); }; } diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h index 0141915e..3c19ca70 100644 --- a/ksvg/plugin/ksvg_factory.h +++ b/ksvg/plugin/ksvg_factory.h @@ -29,7 +29,7 @@ class TDEInstance; class KSVGPluginFactory : public KParts::Factory { -Q_OBJECT +TQ_OBJECT public: KSVGPluginFactory(TQObject *parent = 0, const char *name = 0); @@ -46,7 +46,7 @@ private: class KSVGPluginBrowserExtension : public KParts::BrowserExtension { -Q_OBJECT +TQ_OBJECT friend class KSVGPlugin; diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index 48cf6d56..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); @@ -110,26 +110,26 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const if(!ksvgd->canvas) return; - ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window)); + 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()); @@ -299,7 +299,7 @@ void KSVGPlugin::slotRenderingBackend() if(!ksvgd->canvas) return; - ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window)); + ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window); openURL(m_url); } diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h index 7097f728..de35bd62 100644 --- a/ksvg/plugin/ksvg_plugin.h +++ b/ksvg/plugin/ksvg_plugin.h @@ -34,7 +34,7 @@ namespace KSVG class KSVGPlugin : public KParts::ReadOnlyPart { -Q_OBJECT +TQ_OBJECT public: KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, unsigned int width = 0, unsigned int height = 0); diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp index 2e65f012..be8d0559 100644 --- a/ksvg/plugin/ksvg_widget.cpp +++ b/ksvg/plugin/ksvg_widget.cpp @@ -31,7 +31,7 @@ KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name) : TQWidget(parent, name), m_part(part) { setMouseTracking(true); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); setBackgroundMode(NoBackground); @@ -74,11 +74,11 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T } int button = 0; - if(event->stateAfter() & Qt::LeftButton) + if(event->stateAfter() & TQt::LeftButton) button = 1; - else if(event->stateAfter() & Qt::MidButton) + else if(event->stateAfter() & TQt::MidButton) button = 2; - else if(event->stateAfter() & Qt::RightButton) + else if(event->stateAfter() & TQt::RightButton) button = 3; KSVG::SVGMouseEventImpl *mev = new KSVG::SVGMouseEventImpl(id, // type @@ -104,7 +104,7 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T void KSVGWidget::mouseMoveEvent(TQMouseEvent *event) { - if(event->state() & TQt::ControlButton && event->state() & Qt::LeftButton) + if(event->state() & TQt::ControlButton && event->state() & TQt::LeftButton) { if(m_panningPos.isNull()) m_panningPos = event->pos(); @@ -186,7 +186,7 @@ void KSVGWidget::mousePressEvent(TQMouseEvent *event) if(event->state() & TQt::ControlButton) return; - if(event->button() == Qt::RightButton) + if(event->button() == TQt::RightButton) { if(part() && part()->factory()) { diff --git a/ksvg/plugin/ksvg_widget.h b/ksvg/plugin/ksvg_widget.h index eadc57a7..e2c194b3 100644 --- a/ksvg/plugin/ksvg_widget.h +++ b/ksvg/plugin/ksvg_widget.h @@ -30,7 +30,7 @@ class KSVGPlugin; class KSVGWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name); diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp index 60328855..bbc59e2a 100644 --- a/ksvg/plugin/svgcreator.cpp +++ b/ksvg/plugin/svgcreator.cpp @@ -59,10 +59,10 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im pix.fill(TQt::white); KSVG::KSVGCanvas *c = KSVG::CanvasFactory::self()->loadCanvas(width, height); - c->setup(TQT_TQPAINTDEVICE(&pix), TQT_TQPAINTDEVICE(&pix)); + 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/plugin/svgcreator.h b/ksvg/plugin/svgcreator.h index f788895b..faf5b308 100644 --- a/ksvg/plugin/svgcreator.h +++ b/ksvg/plugin/svgcreator.h @@ -26,7 +26,7 @@ class SVGCreator : public TQObject, public ThumbCreator { - Q_OBJECT + TQ_OBJECT public: SVGCreator(); diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp index 895b5357..64944736 100644 --- a/ksvg/test/external/SVGTestWidget.cpp +++ b/ksvg/test/external/SVGTestWidget.cpp @@ -18,9 +18,9 @@ SVGTestWidget::SVGTestWidget(const KURL &url) { setBackgroundColor(TQt::white); setMouseTracking(true); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); - m_doc = DocumentFactory::self()->requestDocument(TQT_TQOBJECT(this), TQT_SLOT(slotRenderingFinished())); + m_doc = DocumentFactory::self()->requestDocument(this, TQ_SLOT(slotRenderingFinished())); if(!m_doc) return; @@ -29,7 +29,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url) if(!m_canvas) return; - m_canvas->setup(TQT_TQPAINTDEVICE(this), TQT_TQPAINTDEVICE(this)); + m_canvas->setup(this, this); if(!DocumentFactory::self()->attachCanvas(m_canvas, m_doc)) return; @@ -88,11 +88,11 @@ KSVG::SVGMouseEventImpl *newMouseEvent(SVGDocument *doc, KSVG::SVGEventImpl::Eve } int button = 0; - if(event->stateAfter() & Qt::LeftButton) + if(event->stateAfter() & TQt::LeftButton) button = 1; - else if(event->stateAfter() & Qt::MidButton) + else if(event->stateAfter() & TQt::MidButton) button = 2; - else if(event->stateAfter() & Qt::RightButton) + else if(event->stateAfter() & TQt::RightButton) button = 3; KSVG::SVGMouseEventImpl *mev = new KSVG::SVGMouseEventImpl(id, // type diff --git a/ksvg/test/external/SVGTestWidget.h b/ksvg/test/external/SVGTestWidget.h index 0e7cb478..f1fae4fe 100644 --- a/ksvg/test/external/SVGTestWidget.h +++ b/ksvg/test/external/SVGTestWidget.h @@ -8,7 +8,7 @@ class SVGTestWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: SVGTestWidget(const KURL &url); 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/ksvg/test/external/printnodetest.h b/ksvg/test/external/printnodetest.h index 39903b75..f42e93ad 100644 --- a/ksvg/test/external/printnodetest.h +++ b/ksvg/test/external/printnodetest.h @@ -10,7 +10,7 @@ namespace KSVG class SVGDocument; class Worker : public TQObject { -Q_OBJECT +TQ_OBJECT public: Worker(const KURL &url); diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index 72ce1839..7fa5e323 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -39,7 +39,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) setFrameStyle( WinPanel | Raised ); - TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this); + TQGroupBox *gBox = new TQGroupBox( 1,TQt::Horizontal, this); gBox->setGeometry( 10, 10, width()-20, height()-20 ); gBox->setAlignment( AlignHCenter ); gBox->installEventFilter( this ); @@ -83,7 +83,7 @@ AboutWidget::~AboutWidget() bool AboutWidget::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent *ev = static_cast<TQMouseEvent*>( e ); if ( !m_homepage->geometry().contains( ev->pos() ) ) { deleteLater(); return true; diff --git a/kuickshow/src/aboutwidget.h b/kuickshow/src/aboutwidget.h index b6636bb2..54f81ec5 100644 --- a/kuickshow/src/aboutwidget.h +++ b/kuickshow/src/aboutwidget.h @@ -26,7 +26,7 @@ class KURLWidget; class AboutWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index 4746638e..fc483c45 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -37,12 +37,12 @@ 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 gbScale = new TQGroupBox( i18n("Scaling"), this ); - gbScale->setColumnLayout( 0, Qt::Horizontal ); + gbScale->setColumnLayout( 0, TQt::Horizontal ); cbDownScale = new TQCheckBox( i18n("Shrink image to screen size, if larger"), gbScale, "shrinktoscreen" ); @@ -52,13 +52,13 @@ 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) )); // -- gbGeometry = new TQGroupBox( i18n("Geometry"), this ); - gbGeometry->setColumnLayout( 0, Qt::Horizontal ); + gbGeometry->setColumnLayout( 0, TQt::Horizontal ); cbFlipVertically = new TQCheckBox( i18n("Flip vertically"), gbGeometry ); @@ -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/defaultswidget.h b/kuickshow/src/defaultswidget.h index d5b18fc7..0215f8f2 100644 --- a/kuickshow/src/defaultswidget.h +++ b/kuickshow/src/defaultswidget.h @@ -32,7 +32,7 @@ class KIntNumInput; class DefaultsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index 91012ac2..c3e18505 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -37,19 +37,19 @@ 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 ); comp->setReplaceEnv( true ); setCompletionObject( comp, false ); setAutoDeleteCompletionObject( true ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver cs( config, "GeneralConfiguration" ); diff --git a/kuickshow/src/filefinder.h b/kuickshow/src/filefinder.h index d461e401..a53baa45 100644 --- a/kuickshow/src/filefinder.h +++ b/kuickshow/src/filefinder.h @@ -27,7 +27,7 @@ class KURLCompletion; class FileFinder : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 61c75118..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() @@ -179,7 +179,7 @@ void FileWidget::findCompletion( const TQString& text ) bool FileWidget::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::KeyPress ) { - TQKeyEvent *k = TQT_TQKEYEVENT( e ); + TQKeyEvent *k = static_cast<TQKeyEvent*>( e ); if ( (k->state() & (ControlButton | AltButton)) == 0 ) { int key = k->key(); @@ -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/filewidget.h b/kuickshow/src/filewidget.h index 87eff314..31d97381 100644 --- a/kuickshow/src/filewidget.h +++ b/kuickshow/src/filewidget.h @@ -28,7 +28,7 @@ class KFileItem; class FileWidget : public KDirOperator { - Q_OBJECT + TQ_OBJECT public: 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/generalwidget.h b/kuickshow/src/generalwidget.h index 6220e2e7..f5970e2a 100644 --- a/kuickshow/src/generalwidget.h +++ b/kuickshow/src/generalwidget.h @@ -31,7 +31,7 @@ class KIntNumInput; class GeneralWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 2c227063..6b934f18 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -94,7 +94,7 @@ ImageWindow::~ImageWindow() void ImageWindow::init() { - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); KCursor::setAutoHideCursor( this, true, true ); KCursor::setHideCursorDelay( 1500 ); @@ -146,103 +146,103 @@ void ImageWindow::updateActions() void ImageWindow::setupActions() { new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(), - TQT_TQOBJECT(this), TQT_SLOT( slotRequestNext() ), + this, TQ_SLOT( slotRequestNext() ), m_actions, "next_image" ); new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(), - TQT_TQOBJECT(this), TQT_SLOT( slotRequestPrevious() ), + this, TQ_SLOT( slotRequestPrevious() ), m_actions, "previous_image" ); new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( imageDelete() ), + this, TQ_SLOT( imageDelete() ), m_actions, "delete_image" ); new TDEAction( i18n("Move Image to Trash"), Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( imageTrash() ), + this, TQ_SLOT( imageTrash() ), m_actions, "trash_image" ); new TDEAction( i18n("Zoom In"), Key_Plus, - TQT_TQOBJECT(this), TQT_SLOT( zoomIn() ), + this, TQ_SLOT( zoomIn() ), m_actions, "zoom_in" ); new TDEAction( i18n("Zoom Out"), Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( zoomOut() ), + this, TQ_SLOT( zoomOut() ), m_actions, "zoom_out" ); new TDEAction( i18n("Restore Original Size"), Key_O, - TQT_TQOBJECT(this), TQT_SLOT( showImageOriginalSize() ), + this, TQ_SLOT( showImageOriginalSize() ), m_actions, "original_size" ); new TDEAction( i18n("Maximize"), Key_M, - TQT_TQOBJECT(this), TQT_SLOT( maximize() ), + this, TQ_SLOT( maximize() ), m_actions, "maximize" ); new TDEAction( i18n("Rotate 90 Degrees"), Key_9, - TQT_TQOBJECT(this), TQT_SLOT( rotate90() ), + this, TQ_SLOT( rotate90() ), m_actions, "rotate90" ); new TDEAction( i18n("Rotate 180 Degrees"), Key_8, - TQT_TQOBJECT(this), TQT_SLOT( rotate180() ), + this, TQ_SLOT( rotate180() ), m_actions, "rotate180" ); new TDEAction( i18n("Rotate 270 Degrees"), Key_7, - TQT_TQOBJECT(this), TQT_SLOT( rotate270() ), + this, TQ_SLOT( rotate270() ), m_actions, "rotate270" ); new TDEAction( i18n("Flip Horizontally"), Key_Asterisk, - TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ), + this, TQ_SLOT( flipHoriz() ), m_actions, "flip_horicontally" ); new TDEAction( i18n("Flip Vertically"), Key_Slash, - TQT_TQOBJECT(this), TQT_SLOT( flipVert() ), + this, TQ_SLOT( flipVert() ), m_actions, "flip_vertically" ); new TDEAction( i18n("Print Image..."), TDEStdAccel::print(), - TQT_TQOBJECT(this), TQT_SLOT( printImage() ), + this, TQ_SLOT( printImage() ), m_actions, "print_image" ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveImage() ), + KStdAction::saveAs( this, TQ_SLOT( saveImage() ), m_actions, "save_image_as" ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), + KStdAction::close( this, TQ_SLOT( close() ), m_actions, "close_image" ); // -------- new TDEAction( i18n("More Brightness"), Key_B, - TQT_TQOBJECT(this), TQT_SLOT( moreBrightness() ), + this, TQ_SLOT( moreBrightness() ), m_actions, "more_brightness" ); new TDEAction( i18n("Less Brightness"), SHIFT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT( lessBrightness() ), + this, TQ_SLOT( lessBrightness() ), m_actions, "less_brightness" ); new TDEAction( i18n("More Contrast"), Key_C, - TQT_TQOBJECT(this), TQT_SLOT( moreContrast() ), + this, TQ_SLOT( moreContrast() ), m_actions, "more_contrast" ); new TDEAction( i18n("Less Contrast"), SHIFT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT( lessContrast() ), + this, TQ_SLOT( lessContrast() ), m_actions, "less_contrast" ); new TDEAction( i18n("More Gamma"), Key_G, - TQT_TQOBJECT(this), TQT_SLOT( moreGamma() ), + this, TQ_SLOT( moreGamma() ), m_actions, "more_gamma" ); new TDEAction( i18n("Less Gamma"), SHIFT + Key_G, - TQT_TQOBJECT(this), TQT_SLOT( lessGamma() ), + this, TQ_SLOT( lessGamma() ), m_actions, "less_gamma" ); // -------- new TDEAction( i18n("Scroll Up"), Key_Up, - TQT_TQOBJECT(this), TQT_SLOT( scrollUp() ), + this, TQ_SLOT( scrollUp() ), m_actions, "scroll_up" ); new TDEAction( i18n("Scroll Down"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT( scrollDown() ), + this, TQ_SLOT( scrollDown() ), m_actions, "scroll_down" ); new TDEAction( i18n("Scroll Left"), Key_Left, - TQT_TQOBJECT(this), TQT_SLOT( scrollLeft() ), + this, TQ_SLOT( scrollLeft() ), m_actions, "scroll_left" ); new TDEAction( i18n("Scroll Right"), Key_Right, - TQT_TQOBJECT(this), TQT_SLOT( scrollRight() ), + this, TQ_SLOT( scrollRight() ), m_actions, "scroll_right" ); // -------- new TDEAction( i18n("Pause Slideshow"), Key_P, - TQT_TQOBJECT(this), TQT_SLOT( pauseSlideShow() ), + this, TQ_SLOT( pauseSlideShow() ), m_actions, "kuick_slideshow_pause" ); - TDEAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(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), - TQT_TQOBJECT(this), TQT_SLOT( reload() ), + this, TQ_SLOT( reload() ), m_actions, "reload_image" ); new TDEAction( i18n("Properties"), ALT + Key_Return, - TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), + this, TQ_SLOT( slotProperties() ), m_actions, "properties" ); m_actions->readShortcutSettings(); @@ -630,7 +630,7 @@ void ImageWindow::mousePressEvent( TQMouseEvent *e ) xposPress = xmove; yposPress = ymove; - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { if ( e->state() & ShiftButton ) updateCursor( ZoomCursor ); else @@ -675,7 +675,7 @@ void ImageWindow::updateCursor( KuickCursor cursor ) void ImageWindow::mouseMoveEvent( TQMouseEvent *e ) { - if ( !(e->state() & Qt::LeftButton) ) { // only handle LeftButton actions + if ( !(e->state() & TQt::LeftButton) ) { // only handle LeftButton actions return; } @@ -736,7 +736,7 @@ void ImageWindow::mouseReleaseEvent( TQMouseEvent *e ) } // only proceed if shift-Key is still pressed - if ( !(e->button() == Qt::LeftButton && e->state() & ShiftButton) ) + if ( !(e->button() == TQt::LeftButton && e->state() & ShiftButton) ) return; int neww, newh, topX, topY, botX, botY; diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h index fbc8b900..30d2c00e 100644 --- a/kuickshow/src/imagewindow.h +++ b/kuickshow/src/imagewindow.h @@ -37,7 +37,7 @@ class KuickFile; class ImageWindow : public ImlibWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 530875e8..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 } } @@ -320,7 +320,7 @@ bool ImlibWidget::autoRotate( KuickImage *kuim ) switch ( metaitem.value().toInt() ) { - // Qt::Orientation: + // Orientation: // 1: normal // 2: flipped horizontally // 3: ROT 180 @@ -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/imlibwidget.h b/kuickshow/src/imlibwidget.h index abbd1345..6a4cfb71 100644 --- a/kuickshow/src/imlibwidget.h +++ b/kuickshow/src/imlibwidget.h @@ -36,7 +36,7 @@ class KuickImage; class ImageCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -75,7 +75,7 @@ class TQColor; class ImlibWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/kuickconfigdlg.h b/kuickshow/src/kuickconfigdlg.h index c9261b8f..59a54202 100644 --- a/kuickshow/src/kuickconfigdlg.h +++ b/kuickshow/src/kuickconfigdlg.h @@ -32,7 +32,7 @@ class ImageWindow; class KuickConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/kuickfile.h b/kuickshow/src/kuickfile.h index 78901ca7..9f8f0129 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -23,7 +23,7 @@ namespace TDEIO { class KuickFile : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/kuickimage.cpp b/kuickshow/src/kuickimage.cpp index db8065f9..1c68bdab 100644 --- a/kuickshow/src/kuickimage.cpp +++ b/kuickshow/src/kuickimage.cpp @@ -213,8 +213,8 @@ bool KuickImage::smoothResize( int newWidth, int newHeight ) // tqDebug("-- smoothResize: %i x %i", newWidth, newHeight); TQImage *image = newTQImage(); - // Note: TQ_ScaleMin seems to have a bug (off-by-one, sometimes results in width being 1 pixel too small) - TQImage scaledImage = image->smoothScale(newWidth, newHeight, TQ_ScaleFree); + // Note: TQImage::ScaleMin seems to have a bug (off-by-one, sometimes results in width being 1 pixel too small) + TQImage scaledImage = image->smoothScale(newWidth, newHeight, TQImage::ScaleFree); delete image; diff --git a/kuickshow/src/kuickimage.h b/kuickshow/src/kuickimage.h index 540df361..10c5d375 100644 --- a/kuickshow/src/kuickimage.h +++ b/kuickshow/src/kuickimage.h @@ -27,7 +27,7 @@ class KuickImage : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index f6260aae..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( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ), + TDEAction *open = KStdAction::open( this, TQ_SLOT( slotOpenURL() ), coll, "openURL" ); - TDEAction *print = KStdAction::print( TQT_TQOBJECT(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(), - TQT_TQOBJECT(this), TQT_SLOT( configuration() ), + this, TQ_SLOT( configuration() ), coll, "kuick_configure" ); TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide", TDEShortcut( Key_F2 ), - TQT_TQOBJECT(this), TQT_SLOT( startSlideShow() ), + this, TQ_SLOT( startSlideShow() ), coll, "kuick_slideshow" ); TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about", TDEShortcut(), - TQT_TQOBJECT(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(), - TQT_TQOBJECT(this), TQT_SLOT( slotShowInOtherWindow() ), + this, TQ_SLOT( slotShowInOtherWindow() ), coll, "kuick_showInOtherWindow" ); TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotShowInSameWindow() ), + this, TQ_SLOT( slotShowInSameWindow() ), coll, "kuick_showInSameWindow" ); TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"), - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ), + TDEShortcut(), this, TQ_SLOT( slotShowFullscreen() ), coll, "kuick_showFullscreen" ); - TDEAction *quit = KStdAction::quit( TQT_TQOBJECT(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(); } @@ -880,7 +880,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e ) int eventType = e->type(); TQKeyEvent *k = 0L; if ( eventType == TQEvent::KeyPress ) - k = TQT_TQKEYEVENT( e ); + k = static_cast<TQKeyEvent*>( e ); if ( k ) { if ( TDEStdAccel::quit().contains( KKey( k ) ) ) { @@ -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; @@ -1036,8 +1036,8 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e ) // and shows browser when last window closed via doubleclick else if ( eventType == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->button() == Qt::LeftButton ) + TQMouseEvent *ev = static_cast<TQMouseEvent*>( e ); + if ( ev->button() == TQt::LeftButton ) { if ( s_viewers.count() == 1 ) { @@ -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,19 +1294,19 @@ 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 - eventFilter( TQT_TQOBJECT(e->viewer), TQT_TQEVENT(e->event) ); + eventFilter( e->viewer, static_cast<TQEvent*>(e->event) ); delete e; // ### WORKAROUND for TQIconView bug in TQt <= 3.0.3 at least if ( fileWidget && fileWidget->view() ) { TQWidget *widget = fileWidget->view()->widget(); - if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) || widget->child(0, TQICONVIEW_OBJECT_NAME_STRING ) ){ + if ( widget->inherits( "TQIconView" ) || widget->child(0, "TQIconView" ) ){ fileWidget->setSorting( fileWidget->sorting() ); } } @@ -1320,7 +1320,7 @@ void KuickShow::replayAdvance(DelayedRepeatEvent *event) // rely on sorting to be correct before the TQIconView has been show()n. if ( fileWidget && fileWidget->view() ) { TQWidget *widget = fileWidget->view()->widget(); - if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) || widget->child(0, TQICONVIEW_OBJECT_NAME_STRING ) ){ + if ( widget->inherits( "TQIconView" ) || widget->child(0, "TQIconView" ) ){ fileWidget->setSorting( fileWidget->sorting() ); } } @@ -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/kuickshow.h b/kuickshow/src/kuickshow.h index 79d05889..dd8e34f2 100644 --- a/kuickshow/src/kuickshow.h +++ b/kuickshow/src/kuickshow.h @@ -81,7 +81,7 @@ public: class KuickShow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: 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/kurlwidget.h b/kuickshow/src/kurlwidget.h index 95ea073b..85ebd498 100644 --- a/kuickshow/src/kurlwidget.h +++ b/kuickshow/src/kurlwidget.h @@ -23,7 +23,7 @@ class KURLWidget : public KURLLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/mainwidget.h b/kuickshow/src/mainwidget.h index f9f64690..ca89c082 100644 --- a/kuickshow/src/mainwidget.h +++ b/kuickshow/src/mainwidget.h @@ -27,7 +27,7 @@ class FileView; class MainWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index 2f1fd700..3146370e 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -93,7 +93,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer, // Black & white print? if ( printer.option( "app-kuickshow-blackwhite" ) != f) { - image = image.convertDepth( 1, Qt::MonoOnly | Qt::ThresholdDither | Qt::AvoidDither ); + image = image.convertDepth( 1, TQt::MonoOnly | TQt::ThresholdDither | TQt::AvoidDither ); } int filenameOffset = 0; @@ -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/kuickshow/src/printing.h b/kuickshow/src/printing.h index 1bed7310..b2f38d5e 100644 --- a/kuickshow/src/printing.h +++ b/kuickshow/src/printing.h @@ -49,7 +49,7 @@ private: class KuickPrintDialogPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuickshow/src/slideshowwidget.h b/kuickshow/src/slideshowwidget.h index d24deea0..7f3fcd3a 100644 --- a/kuickshow/src/slideshowwidget.h +++ b/kuickshow/src/slideshowwidget.h @@ -26,7 +26,7 @@ class KIntNumInput; class SlideShowWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SlideShowWidget( TQWidget *parent, const char *name ); @@ -22,7 +22,7 @@ around with internals like the presenter plugin does. - This would make preloading (and caching) the images possible. - Caching: currently the canvas doesn't do anything with files while the - viewer only calls QImage( QByteArray ) or QImage( filename ). Therefor the + viewer only calls TQImage( QByteArray ) or TQImage( filename ). Therefor the Viewer has to cache the loading of images while the canvas would have to cache the zoomed images and pixmaps. It would be no problem to make the canvas work on files and bytearrays @@ -36,12 +36,12 @@ Something like: class Effect { - QString dialogTitle() const = 0; - QWidget * dialogWidget() = 0; + TQString dialogTitle() const = 0; + TQWidget * dialogWidget() = 0; /* @returns whether @ref applyEffect() would create the same image as * last time or a changed one */ bool changed() const = 0; - void applyEffect( QImage & ) = 0; + void applyEffect( TQImage & ) = 0; }; - Brightness Adjustment - Greyscale conversion 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/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index e1cc5047..57db099d 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -25,7 +25,7 @@ class TQVButtonGroup; class KViewGeneralConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KViewGeneralConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index f326be83..6666f35d 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -25,7 +25,7 @@ class TDEConfig; class KViewPluginsConfig : public KSettings::PluginPage { - Q_OBJECT + TQ_OBJECT public: KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h index 81417c9f..b697c01e 100644 --- a/kview/kimageviewer/canvas.h +++ b/kview/kimageviewer/canvas.h @@ -29,7 +29,7 @@ class TQPoint; class TQWidget; #include <tqstring.h> -#include <tqobjdefs.h> +#include <tqobjectdefs.h> #include <kdemacros.h> namespace KImageViewer { @@ -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/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index 46e1a548..7334c16b 100644 --- a/kview/kimageviewer/viewer.h +++ b/kview/kimageviewer/viewer.h @@ -47,7 +47,7 @@ namespace KImageViewer */ class KDE_EXPORT Viewer : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: Viewer( TQObject * parent = 0, const char * name = 0 ); diff --git a/kview/kview.cpp b/kview/kview.cpp index 063a0e14..34dd83ee 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -59,12 +59,12 @@ KView::KView() : KParts::MainWindow( 0, "KView" ) , m_pViewer( 0 ) , m_pCanvas( 0 ) - , m_pWinModule( new KWinModule( TQT_TQOBJECT(this), KWinModule::INFO_DESKTOP ) ) + , m_pWinModule( new KWinModule( this, KWinModule::INFO_DESKTOP ) ) , m_bImageSizeChangedBlocked( false ) , m_bFullscreen( false ) { KParts::ReadWritePart * part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( - "libkviewviewer", this, "KViewViewer Widget", TQT_TQOBJECT(this), "KImageViewer Part" ); + "libkviewviewer", this, "KViewViewer Widget", this, "KImageViewer Part" ); if( part ) { m_pViewer = static_cast<KImageViewer::Viewer *>( part ); @@ -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(), TQT_TQOBJECT(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() ) ); } } @@ -251,7 +251,7 @@ void KView::readSettings() // TDEConfig * config ) bool KView::eventFilter( TQObject * obj, TQEvent * ev ) { - if( ev->type() == TQEvent::Resize && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) ) + if( ev->type() == TQEvent::Resize && obj == m_pViewer->widget() ) { if( m_nResizeMode == ResizeImage ) handleResize(); @@ -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( TQT_TQOBJECT(this), TQT_SLOT( slotOpenFile() ), actionCollection() ); - m_paRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); - TDEAction * aClose = KStdAction::close( TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); // Edit - TDEAction * aCopy = KStdAction::copy( TQT_TQOBJECT(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( TQT_TQOBJECT(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, TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + m_paShowMenubar = KStdAction::showMenubar( this, TQ_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); - m_paShowStatusBar = ::tqqt_cast<TDEToggleAction*>( action( "options_show_statusbar" ) ); + 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( TQT_TQOBJECT(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( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); } void KView::handleResize() @@ -595,7 +595,7 @@ void KView::fitWindowToImage() TQSize winsize = sizeForCentralWidgetSize( imagesize ); TQRect workarea = m_pWinModule->workArea(); - TQScrollBar * sb = new TQScrollBar( Qt::Horizontal, this ); + TQScrollBar * sb = new TQScrollBar( TQt::Horizontal, this ); int scrollbarwidth = sb->height(); delete sb; diff --git a/kview/kview.h b/kview/kview.h index 017a3132..c0749718 100644 --- a/kview/kview.h +++ b/kview/kview.h @@ -42,7 +42,7 @@ class KProgress; class KView : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KView(); 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/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index 3d3b9e7f..8458c6b7 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -28,7 +28,7 @@ class TDEConfig; class KViewCanvasConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index 8c203478..95406913 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -71,19 +71,19 @@ 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(), TQT_TQOBJECT(this), - TQT_SLOT( loadSettings() ) ); + KImageCanvasFactory::instance(), this, + TQ_SLOT( loadSettings() ) ); viewport()->setFocusProxy( this ); clear(); TQWidget::setMouseTracking( true ); viewport()->setMouseTracking( true ); - m_cursor.setShape( Qt::CrossCursor ); + m_cursor.setShape( TQt::CrossCursor ); viewport()->setCursor( m_cursor ); m_pTimer->start( MOUSECURSORHIDETIME, true ); @@ -326,8 +326,8 @@ TQString KImageCanvas::blendEffectDescription( unsigned int idx ) const bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev ) { - if( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_client) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_oldClient) ) && ev->type() == TQEvent::MouseMove ) - mouseMoveEvent( TQT_TQMOUSEEVENT( ev ) ); + if( ( obj == m_client || obj == m_oldClient ) && ev->type() == TQEvent::MouseMove ) + mouseMoveEvent( static_cast<TQMouseEvent*>( ev ) ); return TQScrollView::eventFilter( obj, ev ); } @@ -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; } @@ -589,7 +589,7 @@ void KImageCanvas::mouseMoveEvent( TQMouseEvent * ) { if( m_cursor.shape() == TQt::BlankCursor ) { - m_cursor.setShape( Qt::CrossCursor ); + m_cursor.setShape( TQt::CrossCursor ); viewport()->setCursor( m_cursor ); if( m_client ) m_client->setCursor( m_cursor ); @@ -607,7 +607,7 @@ void KImageCanvas::resizeEvent( TQResizeEvent * ev ) void KImageCanvas::contentsMousePressEvent( TQMouseEvent * ev ) { - if ( ev->button() == Qt::RightButton ) + if ( ev->button() == TQt::RightButton ) emit contextPress( ev->globalPos() ); TQScrollView::contentsMousePressEvent( ev ); } @@ -772,7 +772,7 @@ void KImageCanvas::timerEvent( TQTimerEvent * ev ) void KImageCanvas::hideCursor() { kdDebug( 4620 ) << k_funcinfo << endl; - m_cursor.setShape( Qt::BlankCursor ); + m_cursor.setShape( TQt::BlankCursor ); viewport()->setCursor( m_cursor ); if( m_client ) m_client->setCursor( m_cursor ); @@ -935,15 +935,15 @@ KImageHolder * KImageCanvas::createNewClient() client->setMouseTracking( true ); client->installEventFilter( this ); setFocusProxy( client ); - client->setFocusPolicy( TQ_StrongFocus ); + client->setFocusPolicy( TQWidget::StrongFocus ); client->setFocus(); 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/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index 77cd4e19..f9ea3e73 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -41,7 +41,7 @@ class KPixmap; */ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas { - Q_OBJECT + TQ_OBJECT public: /** @@ -147,7 +147,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas /** * @return a pointer to the TQWidget interface of this object */ - TQWidget * widget() { return static_cast<TQWidget *>( this ); } + TQWidget * widget() { return this; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index 62eaeea2..7a0e35ba 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -64,7 +64,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) { //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; // if the right mouse button is pressed emit the contextPress signal - if ( ev->button() == Qt::RightButton ) + if ( ev->button() == TQt::RightButton ) { emit contextPress( mapToGlobal( ev->pos() ) ); return; @@ -73,7 +73,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) if( m_pPixmap == 0 ) return; - if( ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton ) + if( ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton ) { m_scrollpos = ev->globalPos(); m_selectionStartPoint = ev->pos(); @@ -83,13 +83,13 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) { //FIXME: when scrolling the cursorpos shouldn't change - if( TQT_TQRECT_OBJECT(this->rect()).contains( ev->pos(), false ) ) + if( this->rect().contains( ev->pos(), false ) ) emit cursorPos( ev->pos() ); //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; - if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) + if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton ) { // scroll when a modifier and left button or the middle button is pressed - if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & Qt::MidButton ) + if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & TQt::MidButton ) { TQPoint difference = m_scrollpos - ev->globalPos(); emit wannaScroll( difference.x(), difference.y() ); @@ -181,7 +181,7 @@ void KImageHolder::mouseReleaseEvent( TQMouseEvent * ev ) m_scrollTimerId = 0; } } - if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) + if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton ) if( m_bSelecting ) m_bSelecting = false; else diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index 347d9c74..ef28ad3b 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -34,7 +34,7 @@ class TQPoint; */ class KImageHolder : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KImageHolder( TQWidget *parent = 0, const char * name = 0 ); diff --git a/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h index e88ebd15..18dace8b 100644 --- a/kview/kviewcanvas/test/test.h +++ b/kview/kviewcanvas/test/test.h @@ -12,7 +12,7 @@ namespace KImageViewer { class Canvas; }; class KImageViewerTest : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KImageViewerTest(); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 492e5607..6beff0df 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -25,7 +25,7 @@ class TDEConfig; class KViewViewerPluginsConfig : public KSettings::PluginPage { - Q_OBJECT + TQ_OBJECT public: KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index 683de123..9e48ff61 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -25,7 +25,7 @@ class TQCheckBox; class ImageSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: ImageSettings( TQWidget * parent = 0, const char * name = 0 ); diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index ca1c6ca3..e87c214a 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -80,7 +80,7 @@ void KViewKonqExtension::print() TQImage imagetoprint; if( printer.option( "app-kviewviewer-fitimage" ) == "1" ) - imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin ); + imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin ); else imagetoprint = *m_pCanvas->image(); diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h index ed4ba750..d73622aa 100644 --- a/kview/kviewviewer/kviewkonqextension.h +++ b/kview/kviewviewer/kviewkonqextension.h @@ -28,7 +28,7 @@ class KViewViewer; class KViewKonqExtension: public KParts::BrowserExtension { friend class KViewViewer; // it can emit our signals - Q_OBJECT + TQ_OBJECT public: KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 ); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index dcafd750..a51d29e3 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, KImageIO::registerFormats(); TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( - "KImageViewer/Canvas", TQString(), TQT_TQOBJECT(m_pParentWidget) ); + "KImageViewer/Canvas", TQString(), m_pParentWidget ); m_pCanvas = static_cast<KImageViewer::Canvas *>( widget->tqt_cast( "KImageViewer::Canvas" ) ); kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl; if( ! ( widget && m_pCanvas ) ) @@ -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( 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, TQT_SIGNAL( dirty( const TQString & ) ), - this, TQT_SLOT( slotFileDirty( const TQString & ) ) ); + connect( m_pFileWatch, TQ_SIGNAL( dirty( const TQString & ) ), + this, TQ_SLOT( slotFileDirty( const TQString & ) ) ); - KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); + 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) @@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( TDEIO::Job *job ) else { emit completed(); - TDEIO::CopyJob * cjob = ::tqqt_cast<TDEIO::CopyJob*>( job ); + TDEIO::CopyJob * cjob = ::tqt_cast<TDEIO::CopyJob*>( job ); if( cjob ) { m_url = cjob->destURL(); @@ -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/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index fa80a255..691b40c4 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -44,7 +44,7 @@ class TQCache; class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface { - Q_OBJECT + TQ_OBJECT friend class KViewKonqExtension; diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h index 608ca4e9..189017bb 100644 --- a/kview/kviewviewer/test/test.h +++ b/kview/kviewviewer/test/test.h @@ -12,7 +12,7 @@ namespace KParts { class ReadWritePart; } class Test : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: Test(); 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/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index 24aa3770..cb0a5c69 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/kview/modules/browser/kviewbrowser.h @@ -32,7 +32,7 @@ class KMyFileItemList; class KViewBrowser : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewBrowser( TQObject* parent, const char* name, const TQStringList & ); 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/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 93088317..ae817157 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/kview/modules/effects/kvieweffects.h @@ -12,7 +12,7 @@ namespace KImageViewer { class Viewer; } class KViewEffects : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewEffects( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/modules/presenter/DESIGN b/kview/modules/presenter/DESIGN index 3b187e78..034a3032 100644 --- a/kview/modules/presenter/DESIGN +++ b/kview/modules/presenter/DESIGN @@ -27,15 +27,15 @@ Presenter Plugin: - keep local copy of downloaded files - delete local copy on destruction - API: - QImage * image(); + TQImage * image(); KURL url(); - QString file(); //returns local filename or QString::null + TQString file(); //returns local filename or TQString::null - when loading an item from the playlist first ask for a - QImage, if that's not available ask for a local file, if + TQImage, if that's not available ask for a local file, if that's also not available take the url. - API: - QImage * image(); - QString file(); + TQImage * image(); + TQString file(); KURL url(); void setRandom(bool); void randomizeList(); 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/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index 8aaf462f..73742259 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -25,7 +25,7 @@ class TQCheckBox; class KViewPresenterConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index 26e03b01..1f7a2435 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -270,10 +270,10 @@ <forwards> <forward>class KURL</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="private" specifier="non virtual">init()</slot> <slot specifier="non virtual">noSort()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index c05490bb..96b3abbb 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -60,7 +60,6 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri , m_pSlideshowTimer( new TQTimer( this ) ) { kdDebug( 4630 ) << k_funcinfo << endl; - m_imagelist.setAutoDelete( true ); TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); @@ -68,18 +67,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 +88,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 +139,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,19 +148,19 @@ 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() ) ); } } bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) { - if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView->viewport()) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) ) + if( obj == m_pImageList || obj == m_pImageList->m_pListView || obj == m_pImageList->m_pListView->viewport() || obj == m_pViewer->widget() ) { switch( ev->type() ) { @@ -190,14 +189,12 @@ bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) { for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { - ImageInfo * info = new ImageInfo( KURL( *it ) ); + ImageInfo info = ImageInfo( KURL( *it ) ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); ( void )new ImageListItem( m_pImageList->m_pListView, KURL( *it ) ); } - else - delete info; } return true; } @@ -217,15 +214,13 @@ void KViewPresenter::slotImageOpened( const KURL & url ) if( ! m_bDontAdd ) { kdDebug( 4630 ) << k_funcinfo << "imagelist:" << endl; - ImageInfo * info = new ImageInfo( url ); + ImageInfo info = ImageInfo( url ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url ); makeCurrent( item ); } - else - delete info; } } @@ -247,14 +242,12 @@ void KViewPresenter::slotOpenFiles() m_pViewer->openURL( *it ); for( ++it; it != urls.end(); ++it ) { - ImageInfo * info = new ImageInfo( *it ); + ImageInfo info = ImageInfo( *it ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); ( void )new ImageListItem( m_pImageList->m_pListView, *it ); } - else - delete info; } } @@ -265,7 +258,7 @@ void KViewPresenter::slotClose() next = 0; ImageInfo info( m_pCurrentItem->url() ); - m_imagelist.remove( &info ); + m_imagelist.remove( info ); delete m_pCurrentItem; m_pCurrentItem = 0; @@ -285,7 +278,7 @@ void KViewPresenter::changeItem( TQListViewItem * qitem ) { kdDebug( 4630 ) << "file doesn't exist. removed." << endl; ImageInfo info( item->url() ); - m_imagelist.remove( &info ); + m_imagelist.remove( info ); if( m_pCurrentItem == item ) { TQListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); @@ -430,14 +423,12 @@ void KViewPresenter::loadList() while( ! t.eof() ) { KURL url ( t.readLine() ); - ImageInfo * info = new ImageInfo( url ); + ImageInfo info = ImageInfo( url ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); ( void )new ImageListItem( m_pImageList->m_pListView, url ); } - else - delete info; } } else diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index 4159abc5..865c9f86 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/kview/modules/presenter/kviewpresenter.h @@ -24,7 +24,7 @@ #include <tdeparts/plugin.h> #include <kurl.h> -#include <tqsortedlist.h> +#include <tqvaluelist.h> namespace KImageViewer { class Viewer; } @@ -37,7 +37,7 @@ class TDEAction; class KViewPresenter : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewPresenter( TQObject* parent, const char* name, const TQStringList & ); @@ -47,6 +47,11 @@ protected: struct ImageInfo { KURL url; + + ImageInfo() + : url() + { + } ImageInfo( const KURL & url ) : url( url ) { @@ -57,7 +62,7 @@ protected: } bool operator!=( const ImageInfo & i1 ) { - return url.prettyURL() == i1.url.prettyURL(); + return url.prettyURL() != i1.url.prettyURL(); } bool operator>( const ImageInfo & i1 ) { @@ -94,7 +99,7 @@ private: TDEAction * m_paFileOpen; TDEAction * m_paFileClose; - TQSortedList<ImageInfo> m_imagelist; + TQValueList<ImageInfo> m_imagelist; bool m_bDontAdd; ImageListItem * m_pCurrentItem; TQTimer * m_pSlideshowTimer; diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h index c4bd52e0..5787541f 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.h +++ b/kview/modules/presenter/kviewpresenterconfmodule.h @@ -27,7 +27,7 @@ class TQCheckBox; class KViewPresenterConfModule : public KPreferencesModule { - Q_OBJECT + TQ_OBJECT public: KViewPresenterConfModule( TQObject * parent ); 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/kfloatspinbox.h b/kview/modules/scale/kfloatspinbox.h index 7a84a06f..35c5ffd1 100644 --- a/kview/modules/scale/kfloatspinbox.h +++ b/kview/modules/scale/kfloatspinbox.h @@ -25,7 +25,7 @@ class KFloatSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent = 0, const char * name = 0 ); 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/kview_scale.h b/kview/modules/scale/kview_scale.h index 71550df1..af0d66e6 100644 --- a/kview/modules/scale/kview_scale.h +++ b/kview/modules/scale/kview_scale.h @@ -30,7 +30,7 @@ namespace KImageViewer { class KViewScale : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewScale( TQObject* parent, const char* name, const TQStringList & ); 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/scale/scaledlg.h b/kview/modules/scale/scaledlg.h index 6b7d6dcd..66b352c5 100644 --- a/kview/modules/scale/scaledlg.h +++ b/kview/modules/scale/scaledlg.h @@ -32,7 +32,7 @@ class TQSize; class ScaleDlg : public TQObject { - Q_OBJECT + TQ_OBJECT public: ScaleDlg( const TQSize & originalsize, TQVBox * parent, const char * name = 0 ); 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/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index 09ac2dc7..59c335b8 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/kview/modules/scanner/kviewscanner.h @@ -30,7 +30,7 @@ namespace KImageViewer { class Viewer; } class KViewScanner : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewScanner( TQObject* parent, const char* name, const TQStringList & ); 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/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index 6130d50d..ab67e408 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/kview/modules/template/kviewtemplate.h @@ -11,7 +11,7 @@ namespace KImageViewer { class Viewer; } class KViewTemplate : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewTemplate( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index ed21f123..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() @@ -167,7 +167,7 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) { KService::Ptr service = *i; mViewer = KParts::ComponentFactory:: - createPartInstanceFromService<KParts::ReadOnlyPart>( service, this, 0, TQT_TQOBJECT(this) ); + createPartInstanceFromService<KParts::ReadOnlyPart>( service, this, 0, this ); // is this the correct way to get the supported mimetypes? if (mViewer) @@ -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(TQT_TQOBJECT(bv), TQT_SLOT(next()), actionCollection(), "next"); - m_pPreviousAction = KStdAction::prior(TQT_TQOBJECT(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/kview/photobook/photobook.h b/kview/photobook/photobook.h index e931ecf8..ab133808 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -52,7 +52,7 @@ class PhotoBookPart; class PhotoBook : public TQSplitter { -Q_OBJECT +TQ_OBJECT Previews *mList; TDEAction *mFit; @@ -73,7 +73,7 @@ signals: class Previews : public KFileIconView { - Q_OBJECT + TQ_OBJECT KDirLister mDirLister; @@ -107,7 +107,7 @@ private slots: class PhotoBookPart : public KParts::ReadOnlyPart { -Q_OBJECT +TQ_OBJECT PhotoBook *bv; TDEAction *m_pPreviousAction; @@ -133,7 +133,7 @@ typedef KParts::GenericFactory<PhotoBookPart> PhotoBookFactory; class PhotoBookBrowserExtension : public KParts::BrowserExtension { -Q_OBJECT +TQ_OBJECT public: PhotoBookBrowserExtension(PhotoBookPart *p); diff --git a/kviewshell/documentPageCache.h b/kviewshell/documentPageCache.h index 0218addd..7c7ee657 100644 --- a/kviewshell/documentPageCache.h +++ b/kviewshell/documentPageCache.h @@ -25,7 +25,7 @@ class RenderedDocumentPage; class DocumentPageCache: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h index b94f0d9a..eea0cd16 100644 --- a/kviewshell/documentRenderer.h +++ b/kviewshell/documentRenderer.h @@ -49,7 +49,7 @@ thread-safe. class DocumentRenderer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 619135df..90533c26 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -83,9 +83,9 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache scrollGuide = -1; setMouseTracking(true); - setFocusPolicy(TQ_ClickFocus); + 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() @@ -450,7 +450,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e ) } // Check if the mouse is pressed on a regular hyperlink - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (pageData->hyperLinkList.size() > 0) for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) { if (pageData->hyperLinkList[i].box.contains(e->pos())) { @@ -464,7 +464,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e ) setCursor(TQt::IbeamCursor); } - if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton)) + if (e->button() == TQt::RightButton || (!moveTool && e->button() == TQt::LeftButton)) { setCursor(TQt::IbeamCursor); // If Shift is not pressed clear the current selection, @@ -486,7 +486,7 @@ void DocumentWidget::mouseReleaseEvent ( TQMouseEvent *e ) // otherwise the mouse cursor in the centeringScrollview is wrong e->ignore(); - if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton)) + if (e->button() == TQt::RightButton || (!moveTool && e->button() == TQt::LeftButton)) { // If the selectedRectangle is empty then there was only a single right click. if (firstSelectedPoint == e->pos()) @@ -589,7 +589,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e ) clearStatusBarTimer.start(200, true); // clear the statusbar after 200 msec. // Left mouse button pressed -> Text scroll function - if ((e->state() & Qt::LeftButton) != 0 && moveTool) + if ((e->state() & TQt::LeftButton) != 0 && moveTool) { // Pass the mouse event on to the owner of this widget ---under // normal circumstances that is the centeringScrollView which will @@ -598,7 +598,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e ) } // Right mouse button pressed -> Text copy function - if ((e->state() & Qt::RightButton) != 0 || (!moveTool && (e->state() & Qt::LeftButton != 0))) + if ((e->state() & TQt::RightButton) != 0 || (!moveTool && (e->state() & TQt::LeftButton != 0))) { if (selectedRectangle.isEmpty()) { firstSelectedPoint = e->pos(); diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h index 911d3c9d..194bcdcd 100644 --- a/kviewshell/documentWidget.h +++ b/kviewshell/documentWidget.h @@ -28,7 +28,7 @@ class TQPaintEvent; class DocumentWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/emptyRenderer.h b/kviewshell/emptyRenderer.h index 3c8a3f8e..895f1de4 100644 --- a/kviewshell/emptyRenderer.h +++ b/kviewshell/emptyRenderer.h @@ -27,7 +27,7 @@ class RenderedDocumentPage; class EmptyRenderer : public DocumentRenderer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h index 753cdaba..6bcf770f 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -28,7 +28,7 @@ class EmptyMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/history.h b/kviewshell/history.h index 791e39be..c35d5531 100644 --- a/kviewshell/history.h +++ b/kviewshell/history.h @@ -32,7 +32,7 @@ bool operator!=(const HistoryItem& lhs, const HistoryItem& rhs) class History : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index c9d2b63f..a370bc76 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -68,11 +68,11 @@ 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); - mainWidget->setFocusPolicy(TQ_StrongFocus); + mainWidget->setFocusPolicy(TQWidget::StrongFocus); setWidget(mainWidget); // Setup part manager @@ -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 @@ -122,7 +122,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Try to load the multiPage int error; - multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, TQT_TQOBJECT(mainWidget), + multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, mainWidget, service->name().utf8(), TQStringList(), &error )); // If the loading of the MultiPage failed report and error and abort. @@ -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) @@ -800,7 +800,7 @@ bool KViewPart::openFile() // Try to load the multiPage int error; - multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, TQT_TQOBJECT(mainWidget), + multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, mainWidget, service->name().utf8(), TQStringList(), &error )); if (multiPage.isNull()) { @@ -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/kviewpart.h b/kviewshell/kviewpart.h index aaa0240b..3f3c9bbe 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -29,7 +29,7 @@ class TQSize; class KViewPart : public KViewPart_Iface { - Q_OBJECT + TQ_OBJECT public: @@ -238,7 +238,7 @@ private: class KViewPartExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class KViewPart; diff --git a/kviewshell/kviewpart_iface.h b/kviewshell/kviewpart_iface.h index 78dd9cec..83e0dbd5 100644 --- a/kviewshell/kviewpart_iface.h +++ b/kviewshell/kviewpart_iface.h @@ -8,7 +8,7 @@ class TQStringList; class KViewPart_Iface : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KViewPart_Iface(TQObject *parent, const char *name) diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 1a29eb71..12d56b73 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -55,13 +55,13 @@ KViewShell::KViewShell(const TQString& defaultMimeType) if (factory) { if (defaultMimeType == TQString()) { - view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart"); + view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart"); } else { TQStringList args; args << defaultMimeType; - view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart", args); + view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart", args); } if (!view) ::exit(-1); @@ -73,33 +73,33 @@ KViewShell::KViewShell(const TQString& defaultMimeType) setCentralWidget(view->widget()); // file menu - KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection()); - recent = KStdAction::openRecent (TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit (TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); + fullScreenAction = KStdAction::fullScreen(this, TQ_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); // settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(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/kviewshell.h b/kviewshell/kviewshell.h index 43876bcd..4a6b7a93 100644 --- a/kviewshell/kviewshell.h +++ b/kviewshell/kviewshell.h @@ -14,7 +14,7 @@ class TQLabel; class KViewShell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/kviewshell.kcfg b/kviewshell/kviewshell.kcfg index b292b1ec..9a025e8a 100644 --- a/kviewshell/kviewshell.kcfg +++ b/kviewshell/kviewshell.kcfg @@ -81,7 +81,7 @@ </group> <group name="Accessibility" > <entry key="PaperColor" type="Color" > - <default code="true" >Qt::white</default> + <default code="true" >TQt::white</default> </entry> <entry key="ChangeColors" type="Bool" > <default>false</default> diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 798f4559..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; } @@ -181,7 +181,7 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag TQBoxLayout* bottomLayout = new TQHBoxLayout(layout); checkBox = new TQCheckBox(TQString(), this ); - checkBox->setFocusPolicy(TQ_NoFocus); + checkBox->setFocusPolicy(TQWidget::NoFocus); TQToolTip::add(checkBox, i18n("Select for printing")); bottomLayout->addWidget(checkBox, 0, TQt::AlignAuto); @@ -258,11 +258,11 @@ bool MarkListWidget::isVisible() void MarkListWidget::mousePressEvent(TQMouseEvent* e) { // Select Page - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit selected(pageNumber); } - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) { emit showPopupMenu(pageNumber, e->globalPos()); } @@ -277,8 +277,8 @@ MarkList::MarkList(TQWidget* parent, const char* name) { currentPage = PageNumber::invalidPage; widgetList.setAutoDelete(true); - setFocusPolicy( TQ_StrongFocus ); - //viewport()->setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::StrongFocus ); + //viewport()->setFocusPolicy( TQWidget::WheelFocus ); setResizePolicy(TQScrollView::Manual); setVScrollBarMode(TQScrollView::AlwaysOn); @@ -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); @@ -502,7 +502,7 @@ void MarkList::updateWidgetSize(const PageNumber& pageNumber) void MarkList::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { // We call showPopupMenu with an invalid pageNumber to indicate that // the mouse does not point at a thumbnailWidget. diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index d844934a..9375b73d 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -41,7 +41,7 @@ class MarkListWidget; class ThumbnailWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -72,7 +72,7 @@ private: class MarkListWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -124,7 +124,7 @@ private: class MarkList: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageSize.h b/kviewshell/pageSize.h index d7f31146..270d12a0 100644 --- a/kviewshell/pageSize.h +++ b/kviewshell/pageSize.h @@ -39,7 +39,7 @@ The main difference to the SimplePageSize class are the following. class pageSize : public TQObject, public SimplePageSize { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/pageSizeDialog.h b/kviewshell/pageSizeDialog.h index 8c651d55..00300105 100644 --- a/kviewshell/pageSizeDialog.h +++ b/kviewshell/pageSizeDialog.h @@ -27,7 +27,7 @@ class pageSize; class pageSizeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index 52e52237..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,23 +42,23 @@ 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 // range. - widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "widthValidator")); - heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "heightValidator")); + widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "widthValidator")); + heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "heightValidator")); } diff --git a/kviewshell/pageSizeWidget.h b/kviewshell/pageSizeWidget.h index 4834883f..dbbfe269 100644 --- a/kviewshell/pageSizeWidget.h +++ b/kviewshell/pageSizeWidget.h @@ -17,7 +17,7 @@ class TQDoubleValidator; class pageSizeWidget : public pageSizeWidget_base { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index 2be0a51a..028522f1 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -36,7 +36,7 @@ PageView::PageView( TQWidget* parent, const char* name ) moveTool = true; widgetList = 0; - viewport()->setFocusPolicy(TQ_StrongFocus); + viewport()->setFocusPolicy(TQWidget::StrongFocus); setResizePolicy(TQScrollView::Manual); @@ -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))); } @@ -195,7 +195,7 @@ void PageView::keyPressEvent( TQKeyEvent* e ) void PageView::contentsMousePressEvent( TQMouseEvent* e ) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { if (moveTool) { @@ -222,7 +222,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent* e ) { TQPoint newPos = e->globalPos(); - if (e->state() == Qt::LeftButton && moveTool) + if (e->state() == TQt::LeftButton && moveTool) { TQPoint delta = dragGrabPos - newPos; scrollBy(delta.x(), delta.y()); diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h index 6b15b1f7..2664f4f9 100644 --- a/kviewshell/pageView.h +++ b/kviewshell/pageView.h @@ -35,7 +35,7 @@ class PageNumber; */ class PageView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: 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/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index 2bbc6f4a..83cf8ff1 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -86,7 +86,7 @@ required. class DjVuMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/djvurenderer.h b/kviewshell/plugins/djvu/djvurenderer.h index ff615033..8dd61e68 100644 --- a/kviewshell/plugins/djvu/djvurenderer.h +++ b/kviewshell/plugins/djvu/djvurenderer.h @@ -50,7 +50,7 @@ with 10 empty pages of A4 size and a few anchors and bookmarks. class DjVuRenderer : public DocumentRenderer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h index 54c91e83..2fc77cbb 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h @@ -151,10 +151,10 @@ public: special cases. \end{description} */ int mode; - /**Qt::Horizontal page alignment. Possible values are #ALIGN_LEFT#, + /** Horizontal page alignment. Possible values are #ALIGN_LEFT#, #ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */ alignment hor_align; - /**Qt::Vertical page alignment. Possible values are #ALIGN_TOP#, + /** Vertical page alignment. Possible values are #ALIGN_TOP#, #ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */ alignment ver_align; /** List of defined map areas. They may be just areas of highlighting diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp index 152efa2c..fc69e154 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp @@ -87,7 +87,7 @@ static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; } //******************************** DjVuTXT ********************************** //*************************************************************************** -const char DjVuTXT::end_of_column = 013; // VT:Qt::Vertical Tab +const char DjVuTXT::end_of_column = 013; // VT: Vertical Tab const char DjVuTXT::end_of_region = 035; // GS: Group Separator const char DjVuTXT::end_of_paragraph = 037; // US: Unit Separator const char DjVuTXT::end_of_line = 012; // LF: Line Feed diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h index abd57a62..6f23c3b3 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h @@ -171,13 +171,13 @@ public: control character: \begin{tabular}{lll} {\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\ - {\tt DjVuText::end_of_column} & 013 & VT,Qt::Vertical Tab \\ + {\tt DjVuText::end_of_column} & 013 & VT, Vertical Tab \\ {\tt DjVuText::end_of_region} & 035 & GS, Group Separator \\ {\tt DjVuText::end_of_paragraph} & 037 & US, Unit Separator \\ {\tt DjVuText::end_of_line} & 012 & LF: Line Feed \end{tabular} */ GUTF8String textUTF8; - static const char end_of_column ; // VT:Qt::Vertical Tab + static const char end_of_column ; // VT: Vertical Tab static const char end_of_region ; // GS: Group Separator static const char end_of_paragraph ; // US: Unit Separator static const char end_of_line ; // LF: Line Feed diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h index 67c0ce94..518691ea 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.h +++ b/kviewshell/plugins/djvu/libdjvu/GRect.h @@ -131,7 +131,7 @@ namespace DJVU { class GRect { public: - /** #Qt::OrientationBits# defines 3 mutually exclusive + /** #OrientationBits# defines 3 mutually exclusive bits to indicate the image orientation. There are four possible rotation values for an image @@ -149,7 +149,7 @@ public: }; /** #Orientations# defines all 8 possible orientations, using - the three \Ref{Qt::OrientationBits}. + the three \Ref{OrientationBits}. \begin{itemize} \item {\em TDLRNR} for Top Down, Left to Right, No Rotation. \item {\em BULRNR} for Bottom Up, Left to Right, No Rotation. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h index d3f2acaa..4619445e 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h @@ -196,9 +196,9 @@ class ByteStream; class JB2Blit { public: - /**Qt::Horizontal coordinate of the blit. */ + /** Horizontal coordinate of the blit. */ unsigned short left; - /**Qt::Vertical coordinate of the blit. */ + /** Vertical coordinate of the blit. */ unsigned short bottom; /** Index of the shape to blit. */ unsigned int shapeno; diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp index add09e3b..3dced77a 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp @@ -602,7 +602,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) b1 += *pr++; break; } - /*Qt::Horizontal Mode */ + /* Horizontal Mode */ case H: { // First run @@ -616,7 +616,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) *xr = rle; xr++; rle = 0; break; } - /*Qt::Vertical Modes */ + /* Vertical Modes */ case V0: case VR3: case VR2: 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/plugins/djvu/pageRangeWidget.h b/kviewshell/plugins/djvu/pageRangeWidget.h index 1aaf0c48..4f353b10 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.h +++ b/kviewshell/plugins/djvu/pageRangeWidget.h @@ -28,7 +28,7 @@ class PageRangeWidget : public PageRangeWidget_base { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/renderedDocumentPage.h b/kviewshell/renderedDocumentPage.h index 2de1f992..18b67d07 100644 --- a/kviewshell/renderedDocumentPage.h +++ b/kviewshell/renderedDocumentPage.h @@ -65,7 +65,7 @@ class TextSelection; class RenderedDocumentPage : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/renderedDocumentPagePixmap.h b/kviewshell/renderedDocumentPagePixmap.h index 19c69567..1fc497ec 100644 --- a/kviewshell/renderedDocumentPagePixmap.h +++ b/kviewshell/renderedDocumentPagePixmap.h @@ -20,7 +20,7 @@ // about a certain page. class RenderedDocumentPagePixmap: public RenderedDocumentPage, public TQPixmap { - Q_OBJECT + TQ_OBJECT public: 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/searchWidget.h b/kviewshell/searchWidget.h index f01b66bc..13c1590e 100644 --- a/kviewshell/searchWidget.h +++ b/kviewshell/searchWidget.h @@ -32,7 +32,7 @@ class TQString; class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/sizePreview.h b/kviewshell/sizePreview.h index f5cddb50..768306aa 100644 --- a/kviewshell/sizePreview.h +++ b/kviewshell/sizePreview.h @@ -17,7 +17,7 @@ class SimplePageSize; class SizePreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/tableOfContents.h b/kviewshell/tableOfContents.h index 3e878ae3..9eaeb610 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -44,7 +44,7 @@ private: class TableOfContents : public TDEListView { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index 8135cd83..49294609 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -49,7 +49,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject searchInProgress = false; TQVBox* verticalBox = new TQVBox(parentWidget); - verticalBox->setFocusPolicy(TQ_StrongFocus); + verticalBox->setFocusPolicy(TQWidget::StrongFocus); setWidget(verticalBox); splitterWidget = new TQSplitter(verticalBox, widgetName); @@ -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/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h index f41ff94f..e5363ef9 100644 --- a/kviewshell/tdemultipage.h +++ b/kviewshell/tdemultipage.h @@ -35,7 +35,7 @@ class SearchWidget; // TODO remove virtual inheritance for KDE 4. It's the reason for the strange DCOPObject construction class KMultiPage : public KParts::ReadOnlyPart, virtual public tdemultipageInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/zoom.h b/kviewshell/zoom.h index 2ceb5f59..a71b3430 100644 --- a/kviewshell/zoom.h +++ b/kviewshell/zoom.h @@ -16,7 +16,7 @@ class Zoom : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/libkscan/TODO b/libkscan/TODO index 5dd0a652..9ce04461 100644 --- a/libkscan/TODO +++ b/libkscan/TODO @@ -12,7 +12,7 @@ Our TODO List: - the gui functionality KDE 2.x - features. - KDE-features at all ! The whole stuff does not use any KDE-funcitonality, only Qt. What about having a Version which compiles without KDE ? .o0( Good idea to think about ? ) - - attention to drop QString where possible, and I think, its possible where SANE-stuff is + - attention to drop TQString where possible, and I think, its possible where SANE-stuff is used. - I18N-functions. In resource.h, I defined a macro I18N which does not much by now. I tried to place it around strings to prepare for real I18N treatment. How is that done ? diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index 542b975b..cff05d14 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -59,7 +59,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, label->resize( 100, 350 ); topLayout->addWidget( label ); - selectBox = new TQButtonGroup( 1,Qt::Horizontal, i18n( "Select Scan Device" ), + selectBox = new TQButtonGroup( 1,TQt::Horizontal, i18n( "Select Scan Device" ), page, "ButtonBox"); TQ_CHECK_PTR( selectBox ); selectBox->setExclusive( true ); diff --git a/libkscan/devselector.h b/libkscan/devselector.h index 0389cd67..98a0fce9 100644 --- a/libkscan/devselector.h +++ b/libkscan/devselector.h @@ -53,7 +53,7 @@ class TQCheckBox; class DeviceSelector: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libkscan/dispgamma.h b/libkscan/dispgamma.h index e3073697..6f6ca917 100644 --- a/libkscan/dispgamma.h +++ b/libkscan/dispgamma.h @@ -34,7 +34,7 @@ extern "C"{ */ class DispGamma : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DispGamma( TQWidget *parent ); 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/gammadialog.h b/libkscan/gammadialog.h index 1d3926d7..a4e6d01c 100644 --- a/libkscan/gammadialog.h +++ b/libkscan/gammadialog.h @@ -40,7 +40,7 @@ class KGammaTable; class GammaDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT // FIXME: Doesn't compile with TQt 3 (malte) // TQ_PROPERTY( KGammaTable *gt READ getGt WRITE setGt ) diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index d673b284..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 ); @@ -457,7 +457,7 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev) { if( ! acquired || ! image ) return; - if(ev->button()==Qt::LeftButton ) + if(ev->button()==TQt::LeftButton ) { int cx = contentsX(), cy = contentsY(); @@ -486,7 +486,7 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev) void ImageCanvas::viewportMouseReleaseEvent(TQMouseEvent *ev) { - if(ev->button()!=Qt::LeftButton || !acquired ) return; + if(ev->button()!=TQt::LeftButton || !acquired ) return; //// debug( "Mouse Release at %d/%d", ev->x(), ev->y()); if(moving!=MOVE_NONE) { @@ -783,7 +783,7 @@ void ImageCanvas::drawHAreaBorder(TQPainter &p,int x1,int x2,int y,int r) } else if(!acquired) p.setPen(TQPen(TQColor(150,150,150))); for(;;) { - if(TQT_TQRECT_OBJECT(rect()).contains(TQPoint(x1,y))) { + if(rect().contains(TQPoint(x1,y))) { if( r && acquired ) { int re_x1, re_y; inv_scale_matrix.map( x1+cx, y+cy, &re_x1, &re_y ); @@ -826,7 +826,7 @@ void ImageCanvas::drawVAreaBorder(TQPainter &p, int x, int y1, int y2, int r ) if( !acquired ) p.setPen( TQPen( TQColor(150,150,150) ) ); for(;;) { - if(TQT_TQRECT_OBJECT(rect()).contains( TQPoint(x,y1) )) { + if(rect().contains( TQPoint(x,y1) )) { if( r && acquired ) { int re_y1, re_x; inv_scale_matrix.map( x+cx, y1+cy, &re_x, &re_y1 ); diff --git a/libkscan/img_canvas.h b/libkscan/img_canvas.h index 86d3ba46..346c1ebf 100644 --- a/libkscan/img_canvas.h +++ b/libkscan/img_canvas.h @@ -73,7 +73,7 @@ extern int max_dpi; class ImageCanvas: public TQScrollView { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( PopupIDs ) TQ_PROPERTY( int brightness READ getBrightness WRITE setBrightness ) diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp index d7841339..05ccc8ec 100644 --- a/libkscan/imgscaledialog.cpp +++ b/libkscan/imgscaledialog.cpp @@ -40,13 +40,13 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel, // (void) new TQLabel( , main, "Page"); // // makeMainWidget(); - TQButtonGroup *radios = new TQButtonGroup ( 2, Qt::Horizontal, this ); + TQButtonGroup *radios = new TQButtonGroup ( 2, TQt::Horizontal, this ); setMainWidget(radios); 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/imgscaledialog.h b/libkscan/imgscaledialog.h index 8bf76c05..142aab2d 100644 --- a/libkscan/imgscaledialog.h +++ b/libkscan/imgscaledialog.h @@ -31,7 +31,7 @@ */ class ImgScaleDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int selected READ getSelected WRITE setSelValue ) diff --git a/libkscan/kgammatable.h b/libkscan/kgammatable.h index 3dd503cc..9166ddb7 100644 --- a/libkscan/kgammatable.h +++ b/libkscan/kgammatable.h @@ -29,7 +29,7 @@ extern "C" { class KGammaTable: public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int g READ getGamma WRITE setGamma ) 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/kscandevice.h b/libkscan/kscandevice.h index bd2610e7..e3c29606 100644 --- a/libkscan/kscandevice.h +++ b/libkscan/kscandevice.h @@ -63,7 +63,7 @@ typedef enum { class KScanDevice : public TQObject { - Q_OBJECT + TQ_OBJECT /* Hmmm - No TQ_PROPS ? */ 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/kscanoption.h b/libkscan/kscanoption.h index d4139c52..6722f2cb 100644 --- a/libkscan/kscanoption.h +++ b/libkscan/kscanoption.h @@ -59,7 +59,7 @@ class KGammaTable; class KScanOption : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp index 6d64f213..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 )); @@ -58,7 +58,7 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text, hb->addSpacing( 4 ); } - slider = new TQSlider( (int) min, (int)max, 1, (int)min, Qt::Horizontal, this, "AUTO_SLIDER_" ); + slider = new TQSlider( (int) min, (int)max, 1, (int)min, TQt::Horizontal, this, "AUTO_SLIDER_" ); slider->setTickmarks( TQSlider::Below ); slider->setTickInterval( int(TQMAX( (max-min)/10, 1 )) ); slider->setSteps( int(TQMAX( (max-min)/20, 1) ), int(TQMAX( (max-min)/10, 1) ) ); @@ -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/kscanslider.h b/libkscan/kscanslider.h index 0ecf73af..a1d8be1a 100644 --- a/libkscan/kscanslider.h +++ b/libkscan/kscanslider.h @@ -44,7 +44,7 @@ class TQLabel; */ class KScanSlider : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int slider_val READ value WRITE slSetSlider ) @@ -117,7 +117,7 @@ private: */ class KScanEntry : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString text READ text WRITE slSetEntry ) @@ -171,7 +171,7 @@ private: */ class KScanCombo : public TQHBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString cbEntry READ currentText WRITE slSetEntry ) 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/massscandialog.h b/libkscan/massscandialog.h index d17ce7fd..f7b65c09 100644 --- a/libkscan/massscandialog.h +++ b/libkscan/massscandialog.h @@ -32,7 +32,7 @@ class TQLabel; class MassScanDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: MassScanDialog( TQWidget *parent); diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index 2925d50f..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, - TQT_TQOBJECT(this), TQT_SLOT( slScaleToWidth()), TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT( slScaleToHeight()), TQT_TQOBJECT(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 ); @@ -200,7 +200,7 @@ Previewer::Previewer(TQWidget *parent, const char *name ) /** Autoselection Box **/ - d->m_autoSelGroup = new TQGroupBox( 1,Qt::Horizontal, i18n("Auto-Selection"), frame); + d->m_autoSelGroup = new TQGroupBox( 1,TQt::Horizontal, i18n("Auto-Selection"), frame); TQHBox *hbox = new TQHBox(d->m_autoSelGroup); d->m_cbAutoSel = new TQCheckBox( i18n("Active on"), hbox ); @@ -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, Qt::Horizontal, + 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" @@ -236,8 +236,8 @@ 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, Qt::Horizontal, grBox ); - connect( d->m_sliderDust, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelDustsize(int))); + d->m_sliderDust = new TQSlider( 0, 50, 5, d->m_dustsize, TQt::Horizontal, grBox ); + connect( d->m_sliderDust, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slSetAutoSelDustsize(int))); #endif /* disable Autoselbox as long as no scanner is connected */ @@ -246,15 +246,15 @@ Previewer::Previewer(TQWidget *parent, const char *name ) left->addWidget(d->m_autoSelGroup); /* Labels for the dimension */ - TQGroupBox *gbox = new TQGroupBox( 1,Qt::Horizontal, i18n("Selection"), frame, "GROUPBOX" ); + TQGroupBox *gbox = new TQGroupBox( 1,TQt::Horizontal, i18n("Selection"), frame, "GROUPBOX" ); 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/previewer.h b/libkscan/previewer.h index c1891b7e..7dfe0471 100644 --- a/libkscan/previewer.h +++ b/libkscan/previewer.h @@ -42,7 +42,7 @@ class TQHBoxLayout; class Previewer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Previewer(TQWidget *parent=0, const char *name=0); diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index bd38caa1..8c852bea 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -74,18 +74,18 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) { TQVBox *page = addVBoxPage( i18n("&Scanning") ); - splitter = new TQSplitter(Qt::Horizontal, page, "splitter" ); + splitter = new TQSplitter(TQt::Horizontal, page, "splitter" ); TQ_CHECK_PTR( splitter ); m_scanParams = 0; - m_device = new KScanDevice( TQT_TQOBJECT(this) ); - connect(m_device, TQT_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)), - this, TQT_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())); + m_device = new KScanDevice( this ); + connect(m_device, TQ_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)), + this, TQ_SLOT(slotFinalImage(TQImage *, ImgScanInfo *))); + + 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() @@ -110,7 +110,7 @@ void ScanDialog::createOptionsTab( void ) TQVBox *page = addVBoxPage( i18n("&Options")); setMainWidget(page); - TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" ); + TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" ); TQLabel *label = new TQLabel( i18n( "Note: changing these options will affect the scan plugin on next start." ), gb ); label->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); @@ -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/scandialog.h b/libkscan/scandialog.h index 5457f857..a28f3941 100644 --- a/libkscan/scandialog.h +++ b/libkscan/scandialog.h @@ -31,7 +31,7 @@ class TQSplitter; class ScanDialog : public KScanDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index cd9325d9..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 */ @@ -662,10 +662,10 @@ void ScanParams::virtualScannerParams( void ) TQWidget *w = 0; /* Selection if virt. Scanner or SANE Debug */ - bg_virt_scan_mode = new TQButtonGroup( 2, Qt::Horizontal, + 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/scanparams.h b/libkscan/scanparams.h index 4269cdcc..082bd027 100644 --- a/libkscan/scanparams.h +++ b/libkscan/scanparams.h @@ -46,7 +46,7 @@ typedef enum { ID_SANE_DEBUG, ID_TQT_IMGIO, ID_SCAN } ScanMode; class ScanParams : public TQVBox { - Q_OBJECT + TQ_OBJECT public: ScanParams( TQWidget *parent, const char *name = 0); 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/libkscan/scansourcedialog.h b/libkscan/scansourcedialog.h index 35cc3d5e..ac6f2e31 100644 --- a/libkscan/scansourcedialog.h +++ b/libkscan/scansourcedialog.h @@ -36,7 +36,7 @@ class TQButtonGroup; class ScanSourceDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ScanSourceDialog( TQWidget *parent, const TQStrList, ADF_BEHAVE ); diff --git a/libkscan/sizeindicator.h b/libkscan/sizeindicator.h index df940b03..98d69edd 100644 --- a/libkscan/sizeindicator.h +++ b/libkscan/sizeindicator.h @@ -39,7 +39,7 @@ class TQPainter; class SizeIndicator: public TQLabel { - Q_OBJECT + TQ_OBJECT // TQ_PROPERTY( KGammaTable *gt READ getGt WRITE setGt ) diff --git a/tdefile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS index 70a3b519..9bf09559 100644 --- a/tdefile-plugins/RETURNED_ITEMS +++ b/tdefile-plugins/RETURNED_ITEMS @@ -50,7 +50,7 @@ String Camera make String Camera model String Date/time Size Dimensions Width x Height in pixels -int Qt::Orientation 1 - "The 0th row is at the visual top of the image, +int Orientation 1 - "The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side." 2 - "The 0th row is at the visual top of the image, and the 0th column is the visual right-hand side." @@ -115,7 +115,7 @@ String JPG quality 1 - "basic" default: unknown String User comment String Comment -QImage Thumbnail +TQImage Thumbnail gif plugin: diff --git a/tdefile-plugins/bmp/tdefile_bmp.h b/tdefile-plugins/bmp/tdefile_bmp.h index ce4f03eb..c598f6fb 100644 --- a/tdefile-plugins/bmp/tdefile_bmp.h +++ b/tdefile-plugins/bmp/tdefile_bmp.h @@ -26,7 +26,7 @@ class TQStringList; class KBmpPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/dds/tdefile_dds.h b/tdefile-plugins/dds/tdefile_dds.h index 5a638a9d..418c6e43 100644 --- a/tdefile-plugins/dds/tdefile_dds.h +++ b/tdefile-plugins/dds/tdefile_dds.h @@ -26,7 +26,7 @@ class TQStringList; class KDdsPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index def19529..99a48c8e 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -6,38 +6,14 @@ else( ) tde_message_fatal( "poppler is required, but was not found on your system" ) endif( ) -tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) -set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS}) -set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ${POPPLER_LDFLAGS} ) -check_cxx_source_compiles(" - #include <PSOutputDev.h> - int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, (XRef*)0, (Catalog*)0, NULL, 0, 0, psModePS, a, b); } " - HAVE_POPPLER_016 ) -check_cxx_source_compiles(" - #include <PSOutputDev.h> - int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, 0, 0, psModePS, a, b); } " - HAVE_POPPLER_020 ) -check_cxx_source_compiles(" - #include <vector> - #include <PSOutputDev.h> - int main(int, char**) { int a; int b; std::vector<int> p; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, p, psModePS, a, b); } " - HAVE_POPPLER_030 ) -tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" + POPPLER_VERSION_SPLIT ${POPPLER_VERSION} ) +set( POPPLER_VERSION_MAJOR ${CMAKE_MATCH_1} ) +set( POPPLER_VERSION_MINOR ${CMAKE_MATCH_2} ) +set( POPPLER_VERSION_PATCH ${CMAKE_MATCH_3} ) +math( EXPR POPPLER_VERSION_C "(${POPPLER_VERSION_MAJOR}*1000000) + (${POPPLER_VERSION_MINOR}*1000) + ${POPPLER_VERSION_PATCH}" ) +set( POPPLER_VERSION_C ${POPPLER_VERSION_C} CACHE INTERNAL "Poppler library version as code number" ) -foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 22.03 ) - string( REPLACE "." "" _poppler_str "${_poppler_ver}" ) - if( NOT DEFINED HAVE_POPPLER_${_poppler_str} ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" ) - if( NOT POPPLER_VERSION VERSION_LESS "${_poppler_ver}" ) - set( HAVE_POPPLER_${_poppler_str} 1 CACHE INTERNAL "" FORCE ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str} - Success" ) - else( ) - set( HAVE_POPPLER_${_poppler_str} "" CACHE INTERNAL "" FORCE ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str} - Failed" ) - endif( ) - endif( ) -endforeach( ) - -if( HAVE_POPPLER_2112 ) +if( NOT POPPLER_VERSION_C LESS 21012000 ) set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" ) endif() diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp index 86e831ee..5ed02af6 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp @@ -33,7 +33,7 @@ #include <DateInfo.h> #include "poppler-private.h" -#if !defined(HAVE_POPPLER_071) +#if (POPPLER_VERSION_C < 71000) #undef bool #endif @@ -43,14 +43,14 @@ Document *Document::load(const TQString &filePath) { if (!globalParams) { globalParams = -#if defined(HAVE_POPPLER_083) +#if (POPPLER_VERSION_C >= 83000) std::make_unique<GlobalParams>(); #else new GlobalParams(); #endif } -# if defined(HAVE_POPPLER_2203) +# if (POPPLER_VERSION_C >= 22003000) DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {}); # else DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL); @@ -88,7 +88,7 @@ bool Document::unlock(const TQCString &password) { if (data->locked) { /* racier then it needs to be */ -# if defined(HAVE_POPPLER_2203) +# if (POPPLER_VERSION_C >= 22003000) DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()), GooString(password.data())); # else @@ -143,15 +143,13 @@ bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) con { FONTS_LIST_TYPE items = data->m_fontInfoScanner->scan( numPages ); -#if !defined(HAVE_POPPLER_082) +#if (POPPLER_VERSION_C < 82000) if ( NULL == items ) return false; #endif -#if !defined(HAVE_POPPLER_076) +#if (POPPLER_VERSION_C < 76000) if ( FONTS_LIST_IS_EMPTY(items) ) { -# if !defined(HAVE_POPPLER_082) delete items; -# endif return false; } #endif @@ -168,16 +166,16 @@ bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) con (Poppler::FontInfo::Type)(fontInfo->getType())); fontList->append(font); } -# if defined(HAVE_POPPLER_082) +# if (POPPLER_VERSION_C >= 82000) for (auto entry : items) { delete entry; } -# elif defined(HAVE_POPPLER_076) +# elif (POPPLER_VERSION_C >= 76000) for (auto entry : *items) { delete entry; } delete items; -# elif defined(HAVE_POPPLER_070) +# elif (POPPLER_VERSION_C >= 70000) deleteGooList<::FontInfo>(items); # else deleteGooList(items, ::FontInfo); @@ -193,7 +191,7 @@ TQString Document::getInfo( const TQString & type ) const if ( data->locked ) return NULL; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) info = data->doc.getDocInfo(); # else data->doc.getDocInfo( &info ); @@ -209,7 +207,7 @@ TQString Document::getInfo( const TQString & type ) const int i; Dict *infoDict = info.getDict(); -#if defined(HAVE_POPPLER_058) +#if (POPPLER_VERSION_C >= 58000) obj = infoDict->lookup( (char*)type.latin1() ); #else infoDict->lookup( (char*)type.latin1(), &obj ); @@ -241,13 +239,13 @@ TQString Document::getInfo( const TQString & type ) const } result += unicodeToTQString( &u, 1 ); } -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif return result; } -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif @@ -262,13 +260,13 @@ TQDateTime Document::getDate( const TQString & type ) const return TQDateTime(); Object info; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) info = data->doc.getDocInfo(); # else data->doc.getDocInfo( &info ); # endif if ( !info.isDict() ) { -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) info.free(); # endif return TQDateTime(); @@ -280,14 +278,14 @@ TQDateTime Document::getDate( const TQString & type ) const Dict *infoDict = info.getDict(); TQString result; -#if defined(HAVE_POPPLER_058) +#if (POPPLER_VERSION_C >= 58000) obj = infoDict->lookup( (char*)type.latin1() ); #else infoDict->lookup( (char*)type.latin1(), &obj ); #endif if (!obj.isNull() && obj.isString()) { -# if defined(HAVE_POPPLER_2108) +# if (POPPLER_VERSION_C >= 21008000) const GooString *s = obj.getString(); # else TQString tqs = UnicodeParsedString(obj.getString()); @@ -299,7 +297,7 @@ TQDateTime Document::getDate( const TQString & type ) const TQDate d( year, mon, day ); //CHECK: it was mon-1, Jan->0 (??) TQTime t( hour, min, sec ); if ( d.isValid() && t.isValid() ) { -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif @@ -307,7 +305,7 @@ TQDateTime Document::getDate( const TQString & type ) const } } } -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif @@ -390,16 +388,16 @@ bool Document::print(const TQString &fileName, TQValueList<int> pageList, double bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight) { -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) +#if (POPPLER_VERSION_C >= 30000) std::vector<int> pages; TQValueList<int>::iterator it; for (it = pageList.begin(); it != pageList.end(); ++it ) { pages.push_back(*it); } PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, pages, psModePS, paperWidth, paperHeight); -#elif defined(HAVE_POPPLER_020) +#elif (POPPLER_VERSION_C >= 20000) PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); -#elif defined(HAVE_POPPLER_016) +#elif (POPPLER_VERSION_C >= 16000) PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); #else PSOutputDev *psOut = new PSOutputDev(file.latin1(), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp index 99cd8cc9..3ba58505 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp @@ -35,7 +35,7 @@ namespace Poppler { if ( data.namedDest && !ld ) { deleteDest = true; -# if defined(HAVE_POPPLER_086) +# if (POPPLER_VERSION_C >= 86000) ld = data.doc->doc.findDest( data.namedDest ).get(); # else ld = data.doc->doc.findDest( data.namedDest ); @@ -81,7 +81,7 @@ namespace Poppler { m_right = rightAux; m_bottom = bottomAux; -# if !defined(HAVE_POPPLER_086) +# if (POPPLER_VERSION_C < 86000) if (deleteDest) delete ld; # endif } diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp index 9b4f6208..54f198e9 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp @@ -129,7 +129,7 @@ TQString Page::getText(const Rectangle &r) const TQString result; ::Page *p; -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if (POPPLER_VERSION_C >= 20000) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -164,7 +164,7 @@ TQValueList<TextBox*> Page::textList() const TQValueList<TextBox*> output_list; -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if (POPPLER_VERSION_C >= 20000) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -173,7 +173,7 @@ TQValueList<TextBox*> Page::textList() const data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72, 0, false, false, false, -1, -1, -1, -1); -# if defined(HAVE_POPPLER_2111) +# if (POPPLER_VERSION_C >= 21011000) std::unique_ptr<TextWordList> word_list = output_dev->makeWordList(); # else TextWordList *word_list = output_dev->makeWordList(); @@ -197,7 +197,7 @@ TQValueList<TextBox*> Page::textList() const output_list.append(text_box); } -# if !defined(HAVE_POPPLER_2111) +# if (POPPLER_VERSION_C < 21011000) delete word_list; # endif delete output_dev; @@ -211,14 +211,14 @@ PageTransition *Page::getTransition() const { Object o; PageTransitionParams params; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) o = data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(); # else data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(&o); # endif params.dictObj = &o; data->transition = new PageTransition(params); -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) o.free(); # endif } diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp index 059bf1c0..42ec0899 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp @@ -93,7 +93,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, O { // iterate over every object in 'items' OutlineItem * outlineItem = -#ifdef HAVE_POPPLER_076 +#if (POPPLER_VERSION_C >= 76000) (*items)[i]; #else (OutlineItem *)items->get( i ); @@ -101,9 +101,15 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, O // 1. create element using outlineItem's title as tagName TQString name; +#if (POPPLER_VERSION_C >= 24002000) + const std::vector<Unicode> &uVec = outlineItem->getTitle(); + name = unicodeToTQString( uVec.data(), uVec.size() ); +#else CONST_064 Unicode * uniChar = outlineItem->getTitle(); int titleLength = outlineItem->getTitleLength(); name = unicodeToTQString(uniChar, titleLength); +#endif + if ( name.isEmpty() ) continue; diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h index f1096ceb..d3487ef1 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h @@ -39,27 +39,27 @@ #else class SplashOutputDev; #endif -#if defined(HAVE_POPPLER_064) +#if (POPPLER_VERSION_C >= 64000) #define CONST_064 const #else #define CONST_064 #endif -#if defined(HAVE_POPPLER_071) +#if (POPPLER_VERSION_C >= 71000) #define GBool bool #define gTrue true #define gFalse false #endif -#if defined(HAVE_POPPLER_072) +#if (POPPLER_VERSION_C >= 72000) #define GOO_GET_CSTR c_str #else #define GOO_GET_CSTR getCString #endif -#if defined(HAVE_POPPLER_076) +#if (POPPLER_VERSION_C >= 76000) #include <vector> class OutlineItem; #define OUTLINE_ITEMS_TYPE const std::vector<OutlineItem*> #define OUTLINE_ITEMS_LENGTH(goo) goo->size() -# if defined(HAVE_POPPLER_082) +# if (POPPLER_VERSION_C >= 82000) #define FONTS_LIST_TYPE std::vector<::FontInfo*> #define FONTS_LIST_LENGTH(goo) goo.size() #define FONTS_LIST_IS_EMPTY(goo) goo.empty() @@ -104,7 +104,7 @@ class LinkDestinationData { class DocumentData { public: -# if defined(HAVE_POPPLER_2203) +# if (POPPLER_VERSION_C >= 22003000) DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {} # else DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {} diff --git a/tdefile-plugins/dvi/tdefile_dvi.h b/tdefile-plugins/dvi/tdefile_dvi.h index 034ddced..36e715b9 100644 --- a/tdefile-plugins/dvi/tdefile_dvi.h +++ b/tdefile-plugins/dvi/tdefile_dvi.h @@ -27,7 +27,7 @@ class TQStringList; class KDviPlugin : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: KDviPlugin ( TQObject * parent, const char * name, const TQStringList & preferredItems ); diff --git a/tdefile-plugins/exr/tdefile_exr.h b/tdefile-plugins/exr/tdefile_exr.h index 11a3a86b..6d71aebf 100644 --- a/tdefile-plugins/exr/tdefile_exr.h +++ b/tdefile-plugins/exr/tdefile_exr.h @@ -28,7 +28,7 @@ class TQStringList; class KExrPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/gif/tdefile_gif.h b/tdefile-plugins/gif/tdefile_gif.h index acaa17d4..39cf789e 100644 --- a/tdefile-plugins/gif/tdefile_gif.h +++ b/tdefile-plugins/gif/tdefile_gif.h @@ -26,7 +26,7 @@ class TQStringList; class KGifPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/ico/tdefile_ico.h b/tdefile-plugins/ico/tdefile_ico.h index 5e1331c9..37da8326 100644 --- a/tdefile-plugins/ico/tdefile_ico.h +++ b/tdefile-plugins/ico/tdefile_ico.h @@ -26,7 +26,7 @@ class TQStringList; class KIcoPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/jpeg/tdefile_jpeg.h b/tdefile-plugins/jpeg/tdefile_jpeg.h index c6eae8b1..4b825a45 100644 --- a/tdefile-plugins/jpeg/tdefile_jpeg.h +++ b/tdefile-plugins/jpeg/tdefile_jpeg.h @@ -25,7 +25,7 @@ class KJpegPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/pcx/tdefile_pcx.h b/tdefile-plugins/pcx/tdefile_pcx.h index bf567792..195e82ec 100644 --- a/tdefile-plugins/pcx/tdefile_pcx.h +++ b/tdefile-plugins/pcx/tdefile_pcx.h @@ -72,7 +72,7 @@ struct PCXHEADER class KPcxPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/pdf/tdefile_pdf.h b/tdefile-plugins/pdf/tdefile_pdf.h index e06e3a12..7fa842e0 100644 --- a/tdefile-plugins/pdf/tdefile_pdf.h +++ b/tdefile-plugins/pdf/tdefile_pdf.h @@ -28,7 +28,7 @@ class TQStringList; class KPdfPlugin: public KFilePlugin { -Q_OBJECT +TQ_OBJECT public: KPdfPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems ); diff --git a/tdefile-plugins/png/tdefile_png.h b/tdefile-plugins/png/tdefile_png.h index 5b02d3fc..6588d754 100644 --- a/tdefile-plugins/png/tdefile_png.h +++ b/tdefile-plugins/png/tdefile_png.h @@ -28,7 +28,7 @@ class TQStringList; class KPngPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/pnm/tdefile_pnm.h b/tdefile-plugins/pnm/tdefile_pnm.h index 0948d1a7..2c76ed2a 100644 --- a/tdefile-plugins/pnm/tdefile_pnm.h +++ b/tdefile-plugins/pnm/tdefile_pnm.h @@ -26,7 +26,7 @@ class TQStringList; class KPnmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/ps/tdefile_ps.h b/tdefile-plugins/ps/tdefile_ps.h index 16f3c56a..4beff5ba 100644 --- a/tdefile-plugins/ps/tdefile_ps.h +++ b/tdefile-plugins/ps/tdefile_ps.h @@ -29,7 +29,7 @@ class TQStringList; class KPSPlugin: public KFilePlugin, public KDSCCommentHandler { - Q_OBJECT + TQ_OBJECT public: KPSPlugin( TQObject *parent, const char *name, diff --git a/tdefile-plugins/raw/kcamerarawplugin.h b/tdefile-plugins/raw/kcamerarawplugin.h index d16446e8..7d8cc414 100644 --- a/tdefile-plugins/raw/kcamerarawplugin.h +++ b/tdefile-plugins/raw/kcamerarawplugin.h @@ -25,7 +25,7 @@ class TQImage; class KCameraRawPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/raw/parse.c b/tdefile-plugins/raw/parse.c index 467b0577..4f7e8dc1 100644 --- a/tdefile-plugins/raw/parse.c +++ b/tdefile-plugins/raw/parse.c @@ -284,7 +284,7 @@ int parse_tiff_ifd (int base, int level) case 0x111: /* StripOffset */ if (!offset || is_dng) offset = val; break; - case 0x112: /* Qt::Orientation */ + case 0x112: /* Orientation */ flip = flip_map[(val-1) & 7]; break; case 0x117: /* StripByteCounts */ diff --git a/tdefile-plugins/rgb/tdefile_rgb.h b/tdefile-plugins/rgb/tdefile_rgb.h index 72c46d10..35947fb4 100644 --- a/tdefile-plugins/rgb/tdefile_rgb.h +++ b/tdefile-plugins/rgb/tdefile_rgb.h @@ -26,7 +26,7 @@ class TQStringList; class KRgbPlugin : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/tga/tdefile_tga.h b/tdefile-plugins/tga/tdefile_tga.h index ae0489b1..633f17e5 100644 --- a/tdefile-plugins/tga/tdefile_tga.h +++ b/tdefile-plugins/tga/tdefile_tga.h @@ -26,7 +26,7 @@ class TQStringList; class KTgaPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/tiff/tdefile_tiff.h b/tdefile-plugins/tiff/tdefile_tiff.h index ab8560bf..fc489533 100644 --- a/tdefile-plugins/tiff/tdefile_tiff.h +++ b/tdefile-plugins/tiff/tdefile_tiff.h @@ -26,7 +26,7 @@ class KTiffPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/xbm/tdefile_xbm.h b/tdefile-plugins/xbm/tdefile_xbm.h index 0b844c1c..ffb0c77c 100644 --- a/tdefile-plugins/xbm/tdefile_xbm.h +++ b/tdefile-plugins/xbm/tdefile_xbm.h @@ -26,7 +26,7 @@ class TQStringList; class KXbmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/xpm/tdefile_xpm.h b/tdefile-plugins/xpm/tdefile_xpm.h index a16ca7fe..0b545856 100644 --- a/tdefile-plugins/xpm/tdefile_xpm.h +++ b/tdefile-plugins/xpm/tdefile_xpm.h @@ -33,7 +33,7 @@ class TQStringList; class xpmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeiconedit/kcolorgrid.h b/tdeiconedit/kcolorgrid.h index a116f74b..b311d157 100644 --- a/tdeiconedit/kcolorgrid.h +++ b/tdeiconedit/kcolorgrid.h @@ -40,7 +40,7 @@ public: class KColorGrid : public TQWidget { private: - Q_OBJECT + TQ_OBJECT public: KColorGrid( TQWidget * parent = 0, const char *name = 0, int spacing = 0); 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/knew.h b/tdeiconedit/knew.h index faae9684..f3176f9c 100644 --- a/tdeiconedit/knew.h +++ b/tdeiconedit/knew.h @@ -63,7 +63,7 @@ private: class TDEIconListBox : public TQListBox { - Q_OBJECT + TQ_OBJECT public: TDEIconListBox( TQWidget *parent ) : TQListBox(parent) {} ; @@ -96,7 +96,7 @@ private: class NewSelect : public TQWidget { - Q_OBJECT + TQ_OBJECT public: NewSelect(TQWidget *parent); @@ -116,7 +116,7 @@ protected: class NewFromTemplate : public TQWidget { - Q_OBJECT + TQ_OBJECT public: NewFromTemplate(TQWidget *parent); @@ -135,7 +135,7 @@ protected: class KNewIcon : public KWizard { - Q_OBJECT + TQ_OBJECT public: KNewIcon(TQWidget *parent); diff --git a/tdeiconedit/kresize.cpp b/tdeiconedit/kresize.cpp index b7007238..4a46ae31 100644 --- a/tdeiconedit/kresize.cpp +++ b/tdeiconedit/kresize.cpp @@ -34,7 +34,7 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name, TQHBoxLayout* genLayout = new TQHBoxLayout( this ); TQGroupBox* group = new TQGroupBox( i18n( "Size" ), this ); - group->setColumnLayout( 0, Qt::Horizontal ); + group->setColumnLayout( 0, TQt::Horizontal ); genLayout->addWidget( group ); TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 ); diff --git a/tdeiconedit/kresize.h b/tdeiconedit/kresize.h index fcfb18c3..a9d1e67a 100644 --- a/tdeiconedit/kresize.h +++ b/tdeiconedit/kresize.h @@ -28,7 +28,7 @@ class KIntSpinBox; class KResizeWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ private: class KResizeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeiconedit/palettetoolbar.cpp b/tdeiconedit/palettetoolbar.cpp index 04914f2b..879acdb7 100644 --- a/tdeiconedit/palettetoolbar.cpp +++ b/tdeiconedit/palettetoolbar.cpp @@ -35,7 +35,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) { TQWidget *base = new TQWidget( this ); - TQBoxLayout::Direction d = orientation() == Qt::Horizontal? + TQBoxLayout::Direction d = orientation() == TQt::Horizontal? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom; m_layout = new TQBoxLayout( base, d, 2, 6 ); @@ -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,22 +76,22 @@ 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 ); setMovingEnabled( false ); } -void PaletteToolBar::setOrientation( Qt::Orientation o ) +void PaletteToolBar::setOrientation( TQt::Orientation o ) { if( barPos() == Floating ) - o = o == Qt::Vertical ? Qt::Horizontal : Qt::Vertical; + o = o == TQt::Vertical ? TQt::Horizontal : TQt::Vertical; - TQBoxLayout::Direction d = o == Qt::Horizontal? TQBoxLayout::LeftToRight + TQBoxLayout::Direction d = o == TQt::Horizontal? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom; m_layout->setDirection( d ); diff --git a/tdeiconedit/palettetoolbar.h b/tdeiconedit/palettetoolbar.h index 42281551..254d49d0 100644 --- a/tdeiconedit/palettetoolbar.h +++ b/tdeiconedit/palettetoolbar.h @@ -31,7 +31,7 @@ class KCustomColors; class PaletteToolBar : public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: @@ -41,7 +41,7 @@ class PaletteToolBar : public TDEToolBar void newColor( uint c ); public slots: - virtual void setOrientation( Qt::Orientation o ); + virtual void setOrientation( TQt::Orientation o ); void previewChanged( const TQPixmap &p ); void addColors( uint n, uint *c ); void addColor( uint color ); diff --git a/tdeiconedit/tdeicon.cpp b/tdeiconedit/tdeicon.cpp index cd3ab63a..7a1eb3d9 100644 --- a/tdeiconedit/tdeicon.cpp +++ b/tdeiconedit/tdeicon.cpp @@ -155,7 +155,7 @@ bool TDEIconEditIcon::promptForFile(const TQImage *img) KURL url = KFileDialog::getOpenURL( TQString(), filter ); */ bool loaded = false; - KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(parent()) ); + KURL url = KFileDialog::getImageOpenURL( TQString(), static_cast<TQWidget*>(parent()) ); if( !url.isEmpty() ) { @@ -174,7 +174,7 @@ bool TDEIconEditIcon::saveAs(const TQImage *image) TQString file; //Get list of file types.. - KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_TQWIDGET(parent()), "file dialog", true); + KFileDialog *dialog=new KFileDialog(TQString(), TQString(), static_cast<TQWidget*>(parent()), "file dialog", true); dialog->setCaption( i18n("Save Icon As") ); dialog->setKeepLocation( true ); dialog->setMimeFilter( KImageIO::mimeTypes(KImageIO::Writing), "image/png" ); @@ -206,7 +206,7 @@ bool TDEIconEditIcon::saveAs(const TQImage *image) if(TQFile::exists(file)) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(file), i18n( "Overwrite File?" ), diff --git a/tdeiconedit/tdeicon.h b/tdeiconedit/tdeicon.h index ede75f71..7c2082d7 100644 --- a/tdeiconedit/tdeicon.h +++ b/tdeiconedit/tdeicon.h @@ -45,7 +45,7 @@ class TQImage; class TDEIconEditIcon : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDEIconEditIcon(TQObject*, const TQImage*, KURL url = KURL() ); diff --git a/tdeiconedit/tdeiconcolors.h b/tdeiconedit/tdeiconcolors.h index 6e12d810..f304f125 100644 --- a/tdeiconedit/tdeiconcolors.h +++ b/tdeiconedit/tdeiconcolors.h @@ -30,7 +30,7 @@ class KDrawColors : public KColorGrid { - Q_OBJECT + TQ_OBJECT public: KDrawColors(TQWidget *parent); @@ -49,7 +49,7 @@ protected: class KCustomColors : public KDrawColors { - Q_OBJECT + TQ_OBJECT public: KCustomColors(TQWidget *parent); @@ -70,7 +70,7 @@ protected: class KSysColors : public KDrawColors { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp index 0fb4639a..3763f4db 100644 --- a/tdeiconedit/tdeiconconfig.cpp +++ b/tdeiconedit/tdeiconconfig.cpp @@ -59,19 +59,19 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) TQFrame *frame = makeMainWidget(); TQVBoxLayout *ml = new TQVBoxLayout(frame); TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame); - grp->setColumnLayout(0, Qt::Vertical); + grp->setColumnLayout(0, TQt::Vertical); grp->layout()->setSpacing(spacingHint()); grp->layout()->setMargin(marginHint()); 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); @@ -119,13 +119,13 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) btadd = btremove = btedit = 0L; TQGroupBox* grp = new TQGroupBox( i18n( "Templates" ), this ); - grp->setColumnLayout( 0, Qt::Horizontal ); + 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 ); @@ -245,7 +245,7 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent ) TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this ); - grp1->setColumnLayout(0, Qt::Vertical ); + grp1->setColumnLayout(0, TQt::Vertical ); grp1->layout()->setSpacing( KDialog::spacingHint() ); grp1->layout()->setMargin( KDialog::marginHint() ); mainLayout->addWidget( grp1 ); @@ -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/tdeiconconfig.h b/tdeiconedit/tdeiconconfig.h index 62f7938c..8ea41045 100644 --- a/tdeiconedit/tdeiconconfig.h +++ b/tdeiconedit/tdeiconconfig.h @@ -40,7 +40,7 @@ class TQComboBox; class KTemplateEditDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KTemplateEditDlg(TQWidget *); @@ -61,7 +61,7 @@ protected: class KTemplateConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KTemplateConfig(TQWidget*); @@ -82,7 +82,7 @@ protected: class KBackgroundConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KBackgroundConfig(TQWidget *parent); @@ -109,7 +109,7 @@ protected: class KMiscConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMiscConfig(TQWidget *parent); @@ -136,7 +136,7 @@ protected: class TDEIconConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp index b4fe1d49..b72320ac 100644 --- a/tdeiconedit/tdeiconedit.cpp +++ b/tdeiconedit/tdeiconedit.cpp @@ -64,7 +64,7 @@ void TDEIconEdit::init() gridview = new KGridView(&img, history, this); grid = gridview->grid(); - icon = new TDEIconEditIcon(TQT_TQOBJECT(this), &grid->image()); + icon = new TDEIconEditIcon(this, &grid->image()); setAcceptDrops(true); @@ -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, - TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(this), - TQT_SLOT(slotOpenRecent(const KURL&)), actionCollection()); + m_actRecent = KStdAction::openRecent(this, + TQ_SLOT(slotOpenRecent(const KURL&)), actionCollection()); m_actRecent->setMaxItems(15); // FIXME should be configurable! m_actRecent->loadEntries(kapp->config()); - action = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection()); + action = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection()); action->setWhatsThis(i18n("Save\n\nSave the current icon")); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), actionCollection()); - action = KStdAction::print(TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection()); // Edit Menu - m_actCut = KStdAction::cut(TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(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" @@ -284,29 +284,29 @@ void TDEIconEdit::setupActions() "(Tip: Select \"Paste transparent pixels\" in the configuration dialog" " if you also want to paste transparency.)")); - m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid), - TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" ); + m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, grid, + TQ_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" ); - KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection()); - KStdAction::selectAll(TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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/tdeiconedit.h b/tdeiconedit/tdeiconedit.h index 90a21d9f..42c3e35a 100644 --- a/tdeiconedit/tdeiconedit.h +++ b/tdeiconedit/tdeiconedit.h @@ -58,7 +58,7 @@ class PaletteToolBar; */ class TDEIconEdit : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: TDEIconEdit( KURL url = KURL(), const char *name = "tdeiconedit"); diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp index b441035b..c4caedc3 100644 --- a/tdeiconedit/tdeicongrid.cpp +++ b/tdeiconedit/tdeicongrid.cpp @@ -112,12 +112,12 @@ KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, _corner = new TQFrame(this); _corner->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - _hruler = new KRuler(Qt::Horizontal, this); + _hruler = new KRuler(TQt::Horizontal, this); _hruler->setEndLabel(i18n("width")); _hruler->setOffset( -2 ); _hruler->setRange(0, 1000); - _vruler = new KRuler(Qt::Vertical, this); + _vruler = new KRuler(TQt::Vertical, this); _vruler->setEndLabel(i18n("height")); _vruler->setOffset( -2 ); _vruler->setRange(0, 1000); @@ -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(); @@ -710,7 +710,7 @@ void TDEIconEditGrid::paintForeground(TQPainter* p, TQPaintEvent* e) void TDEIconEditGrid::mousePressEvent( TQMouseEvent *e ) { - if(!e || (e->button() != Qt::LeftButton)) + if(!e || (e->button() != TQt::LeftButton)) return; int row = findRow( e->pos().y() ); @@ -886,7 +886,7 @@ void TDEIconEditGrid::mouseMoveEvent( TQMouseEvent *e ) void TDEIconEditGrid::mouseReleaseEvent( TQMouseEvent *e ) { - if(!e || (e->button() != Qt::LeftButton)) + if(!e || (e->button() != TQt::LeftButton)) return; int row = findRow( e->pos().y() ); @@ -1909,7 +1909,7 @@ void TDEIconEditGrid::drawPointArray(TQPointArray a, DrawAction action) int x = a[i].x(); int y = a[i].y(); - if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).contains(a[ i ])) + if(img->valid(x, y) && a.boundingRect().contains(a[ i ])) { //kdDebug(4640) << "x: " << x << " - y: " << y << endl; switch( action ) diff --git a/tdeiconedit/tdeicongrid.h b/tdeiconedit/tdeicongrid.h index 9f41084f..170edad1 100644 --- a/tdeiconedit/tdeicongrid.h +++ b/tdeiconedit/tdeicongrid.h @@ -89,7 +89,7 @@ class RepaintCommand : public KCommand { class KGridView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KGridView( TQImage *image, KCommandHistory* history, TQWidget * parent = 0, const char *name = 0); @@ -131,7 +131,7 @@ protected: */ class TDEIconEditGrid : public KColorGrid { - Q_OBJECT + TQ_OBJECT public: TDEIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * parent = 0, const char *name = 0); diff --git a/translations/desktop_files/kcoloredit-desktops/ru.po b/translations/desktop_files/kcoloredit-desktops/ru.po index f73fbcab..8dea5a23 100644 --- a/translations/desktop_files/kcoloredit-desktops/ru.po +++ b/translations/desktop_files/kcoloredit-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 22:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kcoloredit-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kcolorchooser.desktop:8 @@ -23,9 +25,8 @@ msgstr "Выбор цвета" #. Name #: kcolorchooser.desktop:9 -#, fuzzy msgid "KColorChooser" -msgstr "Выбор цвета" +msgstr "KColorChooser" #. GenericName #: kcoloredit.desktop:8 @@ -34,6 +35,5 @@ msgstr "Редактор палитры" #. Name #: kcoloredit.desktop:9 -#, fuzzy msgid "KColorEdit" -msgstr "Редактор палитры" +msgstr "KColorEdit" diff --git a/translations/desktop_files/kdvi-desktops/ru.po b/translations/desktop_files/kdvi-desktops/ru.po index 6771b6ee..0144bdc2 100644 --- a/translations/desktop_files/kdvi-desktops/ru.po +++ b/translations/desktop_files/kdvi-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:05+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kdvi-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kdvi.desktop:2 @@ -24,14 +26,14 @@ msgstr "Просмотр файлов DVI" #. Name #: kdvi.desktop:3 msgid "KDVI" -msgstr "" +msgstr "KDVI" #. Comment #: kdvimultipage.desktop:3 msgid "DVI" -msgstr "" +msgstr "DVI" #. Name #: kdvimultipage.desktop:4 msgid "KDVIMultiPage" -msgstr "" +msgstr "KDVIMultiPage" diff --git a/translations/desktop_files/kfax.desktop/ru.po b/translations/desktop_files/kfax.desktop/ru.po index 1832e82f..fd8aefea 100644 --- a/translations/desktop_files/kfax.desktop/ru.po +++ b/translations/desktop_files/kfax.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:09+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kfax-kfaxdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kfax.desktop:3 @@ -24,4 +26,4 @@ msgstr "Просмотр факсов" #. Name #: kfax.desktop:4 msgid "KFax" -msgstr "" +msgstr "KFax" diff --git a/translations/desktop_files/kfaxview-desktops/ru.po b/translations/desktop_files/kfaxview-desktops/ru.po index c05d50ce..36615fed 100644 --- a/translations/desktop_files/kfaxview-desktops/ru.po +++ b/translations/desktop_files/kfaxview-desktops/ru.po @@ -1,35 +1,37 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kfaxview-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kfaxmultipage.desktop:2 msgid "kfaxview" -msgstr "" +msgstr "kfaxview" #. Comment #: kfaxmultipage.desktop:5 kfaxmultipage_tiff.desktop:5 msgid "KViewShell plugin for fax files" -msgstr "Компонент просмотра факсов" +msgstr "Компонент KViewShel для файлов факса" #. Name #: kfaxmultipage_tiff.desktop:2 msgid "kfaxview_tiff" -msgstr "" +msgstr "kfaxview_tiff" #. GenericName #: kfaxview.desktop:2 @@ -38,6 +40,5 @@ msgstr "Просмотр факсов" #. Name #: kfaxview.desktop:3 -#, fuzzy msgid "KFaxView" -msgstr "Просмотр факсов" +msgstr "KFaxView" diff --git a/translations/desktop_files/kghostview-desktops/ru.po b/translations/desktop_files/kghostview-desktops/ru.po index 29b0a101..cde568b5 100644 --- a/translations/desktop_files/kghostview-desktops/ru.po +++ b/translations/desktop_files/kghostview-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kghostview-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kghostview.desktop:2 kghostview_part.desktop:2 msgid "KGhostView" -msgstr "" +msgstr "KGhostView" #. GenericName #: kghostview.desktop:3 diff --git a/translations/desktop_files/kmrml-desktops/af.po b/translations/desktop_files/kmrml-desktops/af.po deleted file mode 100644 index 75e01c80..00000000 --- a/translations/desktop_files/kmrml-desktops/af.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: af\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Soektog vir Soortgelyk Beelde..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Onttrekking Opmerk Taal Dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/ar.po b/translations/desktop_files/kmrml-desktops/ar.po deleted file mode 100644 index 77f3d0f7..00000000 --- a/translations/desktop_files/kmrml-desktops/ar.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ar\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "فهرس الصور" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "اعدادات لاستخدام أداة GNU للبحث عن الصور" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "صور;بحث;استعلام;Find;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "بحث عن الصور المتشابهه..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "مستند لغة ترميز استرجاع الوسائط المتعددة" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "برنامج MRML View" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "مراقب KDED KMRML Daemon" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/bg.po b/translations/desktop_files/kmrml-desktops/bg.po deleted file mode 100644 index 84c6e161..00000000 --- a/translations/desktop_files/kmrml-desktops/bg.po +++ /dev/null @@ -1,59 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: bg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Графичен индекс" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Настройване на програмата за индексиране и търсене на изображения" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"изображения; търсене; заявка; картинка; картинки; снимки; Images; Search; " -"Query; Find; Gift; kmrml; mrml; CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Търсене на подобни изображения..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Стартиране на демоните при заявка и рестартиране на демони при грешка" diff --git a/translations/desktop_files/kmrml-desktops/br.po b/translations/desktop_files/kmrml-desktops/br.po deleted file mode 100644 index 527fb05a..00000000 --- a/translations/desktop_files/kmrml-desktops/br.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: br\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Meneger ar skeudenn" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Gwel MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/bs.po b/translations/desktop_files/kmrml-desktops/bs.po deleted file mode 100644 index b9e27513..00000000 --- a/translations/desktop_files/kmrml-desktops/bs.po +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: bs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Indeks slika" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Podešavanje za upotrebu GNU Alata za pronalaženje slika" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;slike;pretraga;upit;nađi;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Traženje sličnih slika..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML nadzor demona" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Pokreće demone po potrebi i restartuje ih ako se sruše" diff --git a/translations/desktop_files/kmrml-desktops/ca.po b/translations/desktop_files/kmrml-desktops/ca.po deleted file mode 100644 index f6cbf5fc..00000000 --- a/translations/desktop_files/kmrml-desktops/ca.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Índex d'imatge" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configuració per a l'ús de l'eina de cerca d'imatges GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Imatges;Cerca;Consulta;Busca;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Cerca imatges similars..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Document de llenguatge de marcatge de recuperació multimèdia" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Vista MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Dimoni vigilant KDED KMRL" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Engega els dimonis sota petició i els torna a engegar si fallen" diff --git a/translations/desktop_files/kmrml-desktops/cs.po b/translations/desktop_files/kmrml-desktops/cs.po deleted file mode 100644 index b0088f87..00000000 --- a/translations/desktop_files/kmrml-desktops/cs.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Rejstřík obrázků" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Konfigurace používání nástroje GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Obrázky;Hledat;Dotaz;Najít;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Hledat podobný obrázek..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML pohled" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Sledovač KMRML démonů" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Spouští démony na požádání a restartuje je při selhání" diff --git a/translations/desktop_files/kmrml-desktops/cy.po b/translations/desktop_files/kmrml-desktops/cy.po deleted file mode 100644 index eb23589c..00000000 --- a/translations/desktop_files/kmrml-desktops/cy.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: cy\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Mynegai Delweddau" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Ffurfweddiad am ddefnyddio'r Erfyn Canfod Delweddau GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Delweddau;Chwilio;Canfod;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Chwilio am Ddelweddau Tebyg..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dogfen Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Gwelydd MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Gwyliwr Ellyll KMRML KDED" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/da.po b/translations/desktop_files/kmrml-desktops/da.po deleted file mode 100644 index d7d28bf6..00000000 --- a/translations/desktop_files/kmrml-desktops/da.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Billedindeks" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Indstilling for brug af GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Billeder;Søgning;Forespørgsel;Find;Gave;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Søg efter lignende filer..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language-dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-visning" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML-dæmon-overvåger" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Starter dæmoner ved forespørgsel og genstarter dem ved fejl" diff --git a/translations/desktop_files/kmrml-desktops/de.po b/translations/desktop_files/kmrml-desktops/de.po deleted file mode 100644 index 3d8e169c..00000000 --- a/translations/desktop_files/kmrml-desktops/de.po +++ /dev/null @@ -1,59 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Bildindex" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" -"Einrichtung für die Benutzung des GNU Bildersuchwerkzeugs (GNU Image Finding " -"Tool)" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Bilder;Suche;Anfrage;finden;Geschenk;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Nach ähnlichen Bildern suchen ..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Suche- und Beschreibungssprache-Dokument (MRML-Dokument)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-Ansicht" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Überwachung der KDE-Bildersuche" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Startet KMRML-Dienste bei Bedarf und im Fehlerfall neu" diff --git a/translations/desktop_files/kmrml-desktops/el.po b/translations/desktop_files/kmrml-desktops/el.po deleted file mode 100644 index 73d2cca2..00000000 --- a/translations/desktop_files/kmrml-desktops/el.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Ευρετήριο εικόνων" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Ρύθμιση για τη χρήση του εργαλείου αναζήτησης εικόνων GIFT" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Εικόνες;Αναζήτηση;Ερώτηση;Αναζήτηση;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Αναζήτηση για παρόμοιες εικόνες..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Έγγραφο Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Προβολή MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Επόπτης δαίμονα KMRML KDED" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Εκκινεί δαίμονες όταν ζητηθεί και τους επανεκκινεί κατά την αποτυχία" diff --git a/translations/desktop_files/kmrml-desktops/eo.po b/translations/desktop_files/kmrml-desktops/eo.po deleted file mode 100644 index b85b4592..00000000 --- a/translations/desktop_files/kmrml-desktops/eo.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: eo\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Bildindekso" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Serĉi Similajn Bildojn..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-Rigardo" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/es.po b/translations/desktop_files/kmrml-desktops/es.po deleted file mode 100644 index 62d02c4e..00000000 --- a/translations/desktop_files/kmrml-desktops/es.po +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Índice de imágenes" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" -"Configuración para utilizar la herramienta de búsqueda de imágenes de GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Imágenes;Búsqueda;Consulta;Buscar;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Búsqueda de imágenes similares..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Documento de lenguaje de descripción de descargas multimedia" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Vista de MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Guardián del demonio KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Inicia los demonios bajo demanda y los reinicia si fallan" diff --git a/translations/desktop_files/kmrml-desktops/et.po b/translations/desktop_files/kmrml-desktops/et.po deleted file mode 100644 index 847a20db..00000000 --- a/translations/desktop_files/kmrml-desktops/et.po +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: et\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Pildiindeks" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Seadistused GNU pildileidmisrakenduse kasutamiseks" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "pildid;otsing;päring;leia;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Otsi sarnaseid pilte..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimeedia otsingu märgistuskeele (MRML) dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML vaade" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML deemoni jälgija" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" -"Käivitab nõudmisel deemoneid ja taaskäivitab neid ebaõnnestumise korral" diff --git a/translations/desktop_files/kmrml-desktops/eu.po b/translations/desktop_files/kmrml-desktops/eu.po deleted file mode 100644 index e96f179d..00000000 --- a/translations/desktop_files/kmrml-desktops/eu.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: eu\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Irudiaren indizea" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU irudi aurkitzailea erabiltzeko konfigurazioa" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Irudiak;Bilaketa;Bilatu;Galdetu;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Bilatu antzeko irudiak..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language dokumentua" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML ikuspegia" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML deabru behatzailea" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Demonioak hasi eta bukau egiten ditu eskatzen zaionean" diff --git a/translations/desktop_files/kmrml-desktops/fa.po b/translations/desktop_files/kmrml-desktops/fa.po deleted file mode 100644 index c12bf113..00000000 --- a/translations/desktop_files/kmrml-desktops/fa.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: fa\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "نمایۀ تصویر" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "پیکربندی برای استفاده از ابزار یافتن تصویر GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "تصاویر، جستجو، پرسوجو، یافتن، Gift،kmrml،mrml،CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "جستجو برای تصاویر مشابه..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "سند زبان نشانگذاری بازیابی چند رسانهای" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "نمای MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "پایشگر شبح KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "شبحها را بر اساس نیاز آغاز میکند و هنگام خرابی آنها را بازآغازی میکند" diff --git a/translations/desktop_files/kmrml-desktops/fi.po b/translations/desktop_files/kmrml-desktops/fi.po deleted file mode 100644 index 45d6b20a..00000000 --- a/translations/desktop_files/kmrml-desktops/fi.po +++ /dev/null @@ -1,59 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: fi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Kuvahakemisto" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Asetukset GNU Image Finding Tool -ohjelman käyttöä varten" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Kuvat;Haku;Etsi;Lahja;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Etsi samankaltaisia kuvia..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedianhakuasiakirja" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-näkymä" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML-palvelimen tarkkailija" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" -"Käynnistää palvelimia tarpeen mukaan ja uudelleenkäynnistää ne virheen " -"yhteydessä" diff --git a/translations/desktop_files/kmrml-desktops/fr.po b/translations/desktop_files/kmrml-desktops/fr.po deleted file mode 100644 index c7b5f780..00000000 --- a/translations/desktop_files/kmrml-desktops/fr.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Indexation des images" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configuration pour l'utilisation du GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Images;Recherche;Requête;Chercher;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Recherche d'images semblables..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Document en langage Multimedia Retrieval Markup (MRML)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Affichage MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Observateur KDE du démon KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Lance les démons à la demande et les redémarre en cas d'échec" diff --git a/translations/desktop_files/kmrml-desktops/ga.po b/translations/desktop_files/kmrml-desktops/ga.po deleted file mode 100644 index bddfa9fa..00000000 --- a/translations/desktop_files/kmrml-desktops/ga.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ga\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Amharc MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/gl.po b/translations/desktop_files/kmrml-desktops/gl.po deleted file mode 100644 index 6759179b..00000000 --- a/translations/desktop_files/kmrml-desktops/gl.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: gl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Índice imaxe" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configuración para empregar a «GNU Image Finding Tool»" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR; imaxes; procura;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Procurar imaxes semellantes..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Visor MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Vixiante do daemon de KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Iniciar daemons cando sexa preciso e reinicialos se fallan." diff --git a/translations/desktop_files/kmrml-desktops/he.po b/translations/desktop_files/kmrml-desktops/he.po deleted file mode 100644 index f4955366..00000000 --- a/translations/desktop_files/kmrml-desktops/he.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: he\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "אינדקס תמונות" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "שינוי הגדרות כלי חיפוש התמונות של GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "תמונות;חיפוש;שאילתה;Gift;kmrml;mrml;CBIR; Images;Search;Query;Find;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "חיפוש תמונות דומות..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "מסמך שפת סימון לאחזור מולטימדיה" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "תצוגת MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "צופה תהליכי הרקע של KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "מפעיל תהליכי רקע לפי דרישה ומפעיל אותם מחדש במקרה של כשל" diff --git a/translations/desktop_files/kmrml-desktops/hi.po b/translations/desktop_files/kmrml-desktops/hi.po deleted file mode 100644 index 071b4bbc..00000000 --- a/translations/desktop_files/kmrml-desktops/hi.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: hi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "छवि सूची" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "ग्नू छवि खोज औज़ार को उपयोग करने के लिए कॉन्फ़िगरेशन" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "छवि; खोज;ढूंढ;तलाश;उपहार;केएमआरएमएल;एमआरएमएल;सीबीआईआर;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "एक जैसे छवियों के लिए ढूंढें..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "मल्टीमीडिया रिट्राइवल मार्कअप लैंग्वेज दस्तावेज़" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML दृश्य" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML डेमन वाचर" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/hu.po b/translations/desktop_files/kmrml-desktops/hu.po deleted file mode 100644 index 39c8ab1d..00000000 --- a/translations/desktop_files/kmrml-desktops/hu.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: hu\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Képkereső" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "A GIFT képkereső szolgáltatás beállításai" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "képek;keresés;lekérdezés;találat;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Ehhez hasonló képek keresése..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "MRML-fájl" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-nézet" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML szolgáltatásfigyelő" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Szükség esetén elindítja, hiba esetén újraindítja a szolgáltatásokat" diff --git a/translations/desktop_files/kmrml-desktops/is.po b/translations/desktop_files/kmrml-desktops/is.po deleted file mode 100644 index cbfe1a8c..00000000 --- a/translations/desktop_files/kmrml-desktops/is.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: is\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Myndayfirlit" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Stillingar til þess að nota GNU myndleitartólið" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Leita að svipuðum myndum..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language skjal" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML sýn" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Eftirlit með KDED KMRML þjóninum" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Ræsir þjóna þegar þarf og endurræsir þá ef þeir bregðast" diff --git a/translations/desktop_files/kmrml-desktops/it.po b/translations/desktop_files/kmrml-desktops/it.po deleted file mode 100644 index 52b4f7f6..00000000 --- a/translations/desktop_files/kmrml-desktops/it.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Indice di immagini" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configurazione della ricerca delle immagini" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "immagini;ricerca;trovare;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Cerca immagini simili..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Documento MRML" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Visione MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Controllo del demone KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Avvia i demoni su richiesta e li riavvia in caso di problemi" diff --git a/translations/desktop_files/kmrml-desktops/ja.po b/translations/desktop_files/kmrml-desktops/ja.po deleted file mode 100644 index 9a444042..00000000 --- a/translations/desktop_files/kmrml-desktops/ja.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "画像インデックス" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GIFT (GNU Image Finding Tool) を使用するための設定" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "画像;検索;クエリ;検索;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "同じような画像を検索..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language ドキュメント" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML ビュー" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML デーモンウォッチャー" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "デーモンをオンデマンドで起動し、失敗したときは再起動します。" diff --git a/translations/desktop_files/kmrml-desktops/kk.po b/translations/desktop_files/kmrml-desktops/kk.po deleted file mode 100644 index fcb00e11..00000000 --- a/translations/desktop_files/kmrml-desktops/kk.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: kk\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Кескіндер индексі" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU Image Finding Tool кескінді табу құралын пайдалану баптаулары" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Ұқсас кескіндерді іздеу..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "MRML (Multimedia Retrieval Markup Language) құжаты" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML файлдарды қарау" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML қызметі" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Талап бойынша қызметті жегу, жаңылса қайта жегу" diff --git a/translations/desktop_files/kmrml-desktops/km.po b/translations/desktop_files/kmrml-desktops/km.po deleted file mode 100644 index 139fab81..00000000 --- a/translations/desktop_files/kmrml-desktops/km.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: km\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "លិបិក្រមរូបភាព" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "ការកំណត់រចនាសម្ព័ន្ធដើម្បីប្រើឧបករណ៍ស្វែងរករូបភាពរបស់ GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "រូបភាព;ស្វែងរក;សួរ;រក;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "ស្វែងរករូបភាពស្រដៀងគ្នា..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "ឯកសារ Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "ទិដ្ឋភាព MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "កម្មវិធីឃ្លាំមើលដេមិន KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "ចាប់ផ្ដើមដេមិននៅពេលត្រូវការ ហើយចាប់ផ្ដើមពួកវាឡើងវិញនៅពេលបរាជ័យ" diff --git a/translations/desktop_files/kmrml-desktops/kmrml-desktops.pot b/translations/desktop_files/kmrml-desktops/kmrml-desktops.pot deleted file mode 100644 index 17babdf7..00000000 --- a/translations/desktop_files/kmrml-desktops/kmrml-desktops.pot +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/lt.po b/translations/desktop_files/kmrml-desktops/lt.po deleted file mode 100644 index ae81ebf7..00000000 --- a/translations/desktop_files/kmrml-desktops/lt.po +++ /dev/null @@ -1,60 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Paveikslėlių rodyklė" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU paveikslėlių paieškos įrankio konfigūracija" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"Images;Search;Query;Find;Gift;kmrml;mrml;CBIR; paveikslėliai;paieška;" -"paklausimas;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Panašių paveikslėlių paieška..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup kalbos dokumentas" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML peržiūra" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML tarnybos stebėtojas" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" -"Paleidžia tarnybas pagal pareikalavimą ir paleidžia iš naujo nesėkmės atveju" diff --git a/translations/desktop_files/kmrml-desktops/ms.po b/translations/desktop_files/kmrml-desktops/ms.po deleted file mode 100644 index 908a516a..00000000 --- a/translations/desktop_files/kmrml-desktops/ms.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ms\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Indeks Imej" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Konfigurasi untuk mengguna Alat Carian Imej GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Cari Imej Serupa..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dokumen Bahasa Capaian Tandatas Multimedia" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Paparan MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Pemerhati Daemon KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Mulakan daemons atas permintaan dan mula semula atas kegagalan" diff --git a/translations/desktop_files/kmrml-desktops/nb.po b/translations/desktop_files/kmrml-desktops/nb.po deleted file mode 100644 index 8896899b..00000000 --- a/translations/desktop_files/kmrml-desktops/nb.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: nb\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Bildeindeks" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Tilpass GNU bildesøkingsverktøy" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Bilder;Søk;Spørringer;Finn;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Søk etter liknende bilder …" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "«Multimedia Retrieval Markup Language»-dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML nisseovervåker" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Starter nisser på forespørsler og starter dem igjen ved feil." diff --git a/translations/desktop_files/kmrml-desktops/nds.po b/translations/desktop_files/kmrml-desktops/nds.po deleted file mode 100644 index 2eda29e0..00000000 --- a/translations/desktop_files/kmrml-desktops/nds.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: nds\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Bildindex" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Inrichten för dat GNU-Bildsöökwarktüüch" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Biller;Söök;Anfraag;söken;Gaav;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Na lieke Biller söken..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dokment in de Affraag-Utteekspraak för Multimedia-Dokmenten" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-Ansicht" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KMRML-Luerdämoon för KDED" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Start Achtergrundperzessen op Nafraag un bi Fehlers nieg" diff --git a/translations/desktop_files/kmrml-desktops/ne.po b/translations/desktop_files/kmrml-desktops/ne.po deleted file mode 100644 index bcd9555f..00000000 --- a/translations/desktop_files/kmrml-desktops/ne.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ne\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "छवि अनुक्रमणिका" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU छवि फेला पार्ने उपकरण प्रयोगका लागि कन्फिगरेसन" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "उस्तै छविका लागि खोजी गर्नुहोस्..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "मल्टिमिडिया पुन: प्राप्ति मार्कअप भाषा कागजात" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML दृश्य" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML डेइमन दर्शक" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "माग गरेको बेलामा डेइमन सुरु गर्दछ र अफफल भएमा फेरि सुरु गर्दछ" diff --git a/translations/desktop_files/kmrml-desktops/nl.po b/translations/desktop_files/kmrml-desktops/nl.po deleted file mode 100644 index 7906db03..00000000 --- a/translations/desktop_files/kmrml-desktops/nl.po +++ /dev/null @@ -1,59 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: nl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Afbeeldingenindex" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configuratie voor het gebruik van de GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"illustraties;figuren;figuur;afbeeldingen;plaatjes;zoeken;find;gift;kmrml;" -"mrml;CBIR;images;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Zoeken naar vergelijkbare afbeeldingen..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language-document" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-weergave" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML-daemonbeheer" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Start achtergrondprogramma's op en herstart deze indien nodig" diff --git a/translations/desktop_files/kmrml-desktops/nn.po b/translations/desktop_files/kmrml-desktops/nn.po deleted file mode 100644 index c44476b9..00000000 --- a/translations/desktop_files/kmrml-desktops/nn.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: nn\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Biletindeks" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Oppsett av GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "bilete;søk;spørjing;finn;gåve;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Søk etter liknande bilete …" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "«Multimedia Retrieval Markup Language»-dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML-nisseovervaking" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Startar nissar når dei trengst og startar dei om att ved feil" diff --git a/translations/desktop_files/kmrml-desktops/nso.po b/translations/desktop_files/kmrml-desktops/nso.po deleted file mode 100644 index c42742db..00000000 --- a/translations/desktop_files/kmrml-desktops/nso.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: nso\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Palo ya Ponagalo" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Diponagalo;Nyaka;Kgokgonego;Hwetsa;Mpho;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Nyako ya Diponagalo tseo di Swanago..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Tokomane ya Leleme la Peakanyo ya Kutullo ya Multimedia" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Pono ya MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/pa.po b/translations/desktop_files/kmrml-desktops/pa.po deleted file mode 100644 index 8716598a..00000000 --- a/translations/desktop_files/kmrml-desktops/pa.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pa\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML ਝਲਕ" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/pl.po b/translations/desktop_files/kmrml-desktops/pl.po deleted file mode 100644 index 7b8a9ebe..00000000 --- a/translations/desktop_files/kmrml-desktops/pl.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Spis obrazków" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Konfiguracja Gifta (narzędzia do szukania obrazków GNU)" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Obrazki;Szukanie;Zapytanie;Szukaj;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Szukaj podobnych obrazków" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dokument MRML (Język Znacznikowy Pozyskiwania Multimediów)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Widok MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Monitor usług KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Uruchamia usługi na żądanie i wznawia je po awarii" diff --git a/translations/desktop_files/kmrml-desktops/pt.po b/translations/desktop_files/kmrml-desktops/pt.po deleted file mode 100644 index 0b568fb8..00000000 --- a/translations/desktop_files/kmrml-desktops/pt.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Índice de Imagens" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configuração da Ferramenta de Procura de Imagens da GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Imagens;Procurar;Pesquisar;Encontrar;Prenda;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Procurar por Imagens Semelhantes..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Documento de Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Janela de MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Monitor KMRML de Servidores KDED" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Inicia os servidores a pedido e reinicia-os em caso de falha" diff --git a/translations/desktop_files/kmrml-desktops/pt_BR.po b/translations/desktop_files/kmrml-desktops/pt_BR.po deleted file mode 100644 index cd5eb6f4..00000000 --- a/translations/desktop_files/kmrml-desktops/pt_BR.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Índice de Imagens" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configuração para o uso da Ferramenta de Procura de Imagens GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Imagens;Busca;Consulta;Procurar;Presente;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Procurar por Imagens Parecidas..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Documento da Linguagem de Marcação de Recuperação Multimídia " - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Visualização de MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Sentinela de Serviços KDED" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Inicia serviços sob demanda e reinicia-os em caso de falha" diff --git a/translations/desktop_files/kmrml-desktops/ro.po b/translations/desktop_files/kmrml-desktops/ro.po deleted file mode 100644 index 49275648..00000000 --- a/translations/desktop_files/kmrml-desktops/ro.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ro\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Index imagini" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Configurare pentru GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "imagini;căutare;caută;interogare;găseşte;dar;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Caută imagini similare..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Document MRML (limbaj de marcare pentru căutări multimedia)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Vizualizare MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Demon KDED pentru MRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Porneşte demonii la cerere şi îi reporneşte în caz de eroare" diff --git a/translations/desktop_files/kmrml-desktops/ru.po b/translations/desktop_files/kmrml-desktops/ru.po deleted file mode 100644 index a7f9afd5..00000000 --- a/translations/desktop_files/kmrml-desktops/ru.po +++ /dev/null @@ -1,60 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# Alexander Golubev <fatzer2@gmail.com>, 2021. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: 2021-01-21 09:11+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" -"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" -"projects/tdegraphics/kmrml-desktop-files/ru/>\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.4.2\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Индексирование изображений" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" -"Настройка использования программы поиска изображений GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "изображения;поиск;запрос;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Поиск похожих изображений..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Документ MRML (Multimedia Retrieval Markup Language)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Просмотр MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Служба наблюдения за демоном KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Поддержка протокола MRML" diff --git a/translations/desktop_files/kmrml-desktops/se.po b/translations/desktop_files/kmrml-desktops/se.po deleted file mode 100644 index dd0db4d6..00000000 --- a/translations/desktop_files/kmrml-desktops/se.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: se\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Govvaindeaksa" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Heivet GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Oza seammalágana govaid …" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "«Multimedia Retrieval Markup Language»-dokumeanta" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML-čájeheapmi" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML-duogášprográmmagoziheaddji" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/sk.po b/translations/desktop_files/kmrml-desktops/sk.po deleted file mode 100644 index 7df0200b..00000000 --- a/translations/desktop_files/kmrml-desktops/sk.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: sk\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Katalóg obrázkov" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Konfigurácia pre GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Obrázky;Hľadanie;Dotazy;Nájsť;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Hľadať podobné obrázky..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dokument Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Prehliadač MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Sledovanie démona KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Spustí démonov podľa požiadaviek a pri zlyhaní ich reštartuje" diff --git a/translations/desktop_files/kmrml-desktops/sl.po b/translations/desktop_files/kmrml-desktops/sl.po deleted file mode 100644 index 5239c30b..00000000 --- a/translations/desktop_files/kmrml-desktops/sl.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: sl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Seznam slik" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Nastavitve za uporabo orodja GNU za iskanje slik" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "slike;iskanje;povpraševanje;išči;najdi;gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Išči podobne slike ..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dokument Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Pregledovalnik MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Opazovalnik demona KMRML za KDED" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Na zahtevo zažene demone in jih ob napaki znova zažene" diff --git a/translations/desktop_files/kmrml-desktops/sr.po b/translations/desktop_files/kmrml-desktops/sr.po deleted file mode 100644 index c0abd1ac..00000000 --- a/translations/desktop_files/kmrml-desktops/sr.po +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Индекс слика" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Подешавање коришћења GNU-овог алата за тражење слика" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;слике;тражи;упит;нађи;поклон;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Потражи сличне слике..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Документ у обележивачком језику за добављање мултимедије (MRML)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML приказивач" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML демон за праћење" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "На захтев покреће демоне и поново их покреће ако се сруше" diff --git a/translations/desktop_files/kmrml-desktops/sr@Latn.po b/translations/desktop_files/kmrml-desktops/sr@Latn.po deleted file mode 100644 index 1e6ad7cf..00000000 --- a/translations/desktop_files/kmrml-desktops/sr@Latn.po +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: sr@Latn\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Indeks slika" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Podešavanje korišćenja GNU-ovog alata za traženje slika" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;slike;traži;upit;nađi;poklon;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Potraži slične slike..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Dokument u obeleživačkom jeziku za dobavljanje multimedije (MRML)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML prikazivač" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML demon za praćenje" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Na zahtev pokreće demone i ponovo ih pokreće ako se sruše" diff --git a/translations/desktop_files/kmrml-desktops/sv.po b/translations/desktop_files/kmrml-desktops/sv.po deleted file mode 100644 index 8340f205..00000000 --- a/translations/desktop_files/kmrml-desktops/sv.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: sv\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Bildindex" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Inställning för att använda GNU:s bildsökverktyg" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Bilder;Sök;Förfrågan;Hitta;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Sök efter liknande bilder..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language-dokument" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML-demonbevakare" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Starta demoner vid behov och starta om dem vid fel" diff --git a/translations/desktop_files/kmrml-desktops/ta.po b/translations/desktop_files/kmrml-desktops/ta.po deleted file mode 100644 index c8d68029..00000000 --- a/translations/desktop_files/kmrml-desktops/ta.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ta\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "பிம்ப அட்டவணை" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU பிம்ப தேடுதல் கருவியை பயன்படுத்துவதற்கான அமைப்பு" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "பிம்பங்கள்; தேடு; கேள்வி; கண்டுபிடி;பரிசு;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "இதே போன்ற பிம்பங்களை தேடுக..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "பல் ஊடக திரும்பப்பெறு அடையாள மொழி ஆவணம்" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML காட்சி" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED டிமென் வாட்சர்" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "அவசிய நேரத்தில் டிமென்னை துவக்குகிறது. இயலாதபோது திரும்ப துவக்குகிறது" diff --git a/translations/desktop_files/kmrml-desktops/tg.po b/translations/desktop_files/kmrml-desktops/tg.po deleted file mode 100644 index 16b268ad..00000000 --- a/translations/desktop_files/kmrml-desktops/tg.po +++ /dev/null @@ -1,59 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: tg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Индексатсия кардани тасвирот" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" -"Танзимоти истифодабарии барномаиҷустуҷӯи тасвироти GNU Image Finding Tool" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "тасвирот;ҷустуҷӯӣ;дархост;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Ҷустуҷӯи тасвироти якхела..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Санади MRML (Multimedia Retrieval Markup Language)" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Намоиши MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Мудири демони KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" -"Оғози демон аз рӯи дархост ва ҳангоми нуқсони он аз сари нав оғоз намудан." diff --git a/translations/desktop_files/kmrml-desktops/th.po b/translations/desktop_files/kmrml-desktops/th.po deleted file mode 100644 index 417ed14a..00000000 --- a/translations/desktop_files/kmrml-desktops/th.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: th\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "ดัชนีรูปภาพ" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "ค้นหาภาพที่เหมือนกัน..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "เอกสาร Multimedia Retrieval Markup Language" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "ดู MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "ตัวเฝ้าดูแดมอน KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/tr.po b/translations/desktop_files/kmrml-desktops/tr.po deleted file mode 100644 index 4e290d03..00000000 --- a/translations/desktop_files/kmrml-desktops/tr.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: tr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Resim İndeksi" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU Resim Bulma Aracı yapılandırması" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Resimler;Ara;Arama;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Benzer Resimleri Ara..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Multimedia Retrieval Markup Language Belgesi" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML Görünümü" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML Aracı İzleyici" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "İstek halinde programı başlatır ve hata durumunda yeniden başlatır." diff --git a/translations/desktop_files/kmrml-desktops/uk.po b/translations/desktop_files/kmrml-desktops/uk.po deleted file mode 100644 index fe6fba11..00000000 --- a/translations/desktop_files/kmrml-desktops/uk.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: uk\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Індекс зображень" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Налаштування засобу пошуку зображень GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "зображення;пошук;запит;знайти;подарунок;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Пошук схожих зображень..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Документ формату зберігання мультимедіа" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Перегляд MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "Спостерігач демону KDED KMRML" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "Запускає демони при потребі та перезапускає їх при аварії" diff --git a/translations/desktop_files/kmrml-desktops/uz.po b/translations/desktop_files/kmrml-desktops/uz.po deleted file mode 100644 index e42f9335..00000000 --- a/translations/desktop_files/kmrml-desktops/uz.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: uz\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Rasm indeksi" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Oʻxshash rasmlarni qidirish" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/uz@cyrillic.po b/translations/desktop_files/kmrml-desktops/uz@cyrillic.po deleted file mode 100644 index ec6f347d..00000000 --- a/translations/desktop_files/kmrml-desktops/uz@cyrillic.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: uz@cyrillic\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Расм индекси" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Ўхшаш расмларни қидириш" - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/ven.po b/translations/desktop_files/kmrml-desktops/ven.po deleted file mode 100644 index 2e045d76..00000000 --- a/translations/desktop_files/kmrml-desktops/ven.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: ven\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Index ya tshifanyiso" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Nzudzanyo yau shumisa tshishumiswa tshau toda tshifanyiso tsha GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Zwifanyiso;Toda;Mbudziso;Wana;Mpho;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Todani zwifanyiso zwielanaho..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Manwalwa a luambo lwau humbula zwa khasho nnzhi" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Mbonalelo ya MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/wa.po b/translations/desktop_files/kmrml-desktops/wa.po deleted file mode 100644 index bdf5607e..00000000 --- a/translations/desktop_files/kmrml-desktops/wa.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: wa\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Indecse des imådjes" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Apontiaedje po-z eployî l' usteye di cweraedje d' imådjes di GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Imådjes;Cweri;Cweraedje;Trover;Gift;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Cweri après des rshonnantès imådjes..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/xh.po b/translations/desktop_files/kmrml-desktops/xh.po deleted file mode 100644 index 147e2dcd..00000000 --- a/translations/desktop_files/kmrml-desktops/xh.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: xh\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Isalathisi Somfanekiso" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Uqwalaselo lokusebenzisa Isixhobo Sokufumana Umfanekiso we GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Imifanekiso;Uphendlo;Ubuzo;fumana;Isiphiwo;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Phendla Imifanekiso Efanayo..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Uxwebhu Lolwimi Lophawulo phezulu Lokufumana i Multimedia" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML Imbono" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kmrml-desktops/zh_CN.po b/translations/desktop_files/kmrml-desktops/zh_CN.po deleted file mode 100644 index 669ee44d..00000000 --- a/translations/desktop_files/kmrml-desktops/zh_CN.po +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "图像索引" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "使用 GNU 图像查找工具的配置" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "" -"Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;图像;搜索;查询;查找;礼物;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "搜索类似图像..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "多媒体检索标记语言文档" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML 查看器" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML 守护程序监视器" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "按需启动守护程序并在失败时重新启动" diff --git a/translations/desktop_files/kmrml-desktops/zh_HK.po b/translations/desktop_files/kmrml-desktops/zh_HK.po deleted file mode 100644 index cf409cf4..00000000 --- a/translations/desktop_files/kmrml-desktops/zh_HK.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_HK\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "圖像索引" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU 圖像搜尋工具的設定" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;圖像;搜尋;查詢;尋找;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "尋找類似的圖像..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "多媒體取得標記語言文件" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML 檢視" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML 系統程式監察器" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "依要求啟動系統程式並在失敗時重新啟動它們。" diff --git a/translations/desktop_files/kmrml-desktops/zh_TW.po b/translations/desktop_files/kmrml-desktops/zh_TW.po deleted file mode 100644 index 86aed715..00000000 --- a/translations/desktop_files/kmrml-desktops/zh_TW.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_TW\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "影像索引" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "GNU 影像搜尋工具組態" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;影像;搜尋;查詢;尋找;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "尋找類似的影像..." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "多媒體補償標記語言文件" - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "MRML 檢視器" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "KDED KMRML 伺服程式監看器" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "需要時啟動守護程式，失敗的話重新啟動" diff --git a/translations/desktop_files/kmrml-desktops/zu.po b/translations/desktop_files/kmrml-desktops/zu.po deleted file mode 100644 index 29d4f74b..00000000 --- a/translations/desktop_files/kmrml-desktops/zu.po +++ /dev/null @@ -1,57 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-08 23:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zu\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Name -#: kcontrol/kcmkmrml.desktop:9 -msgid "Image Index" -msgstr "Isiqalo Sesithombe" - -#. Comment -#: kcontrol/kcmkmrml.desktop:11 -msgid "Configuration for using the GNU Image Finding Tool" -msgstr "Inhlanganiselo yokusebenzisa Ithuluzi Lokuthola Isithombe se-GNU" - -#. Keywords -#: kcontrol/kcmkmrml.desktop:13 -msgid "Images;Search;Query;Find;Gift;kmrml;mrml;CBIR;" -msgstr "Izithombe;Funa;Buza;Thola;Isipho;kmrml;mrml;CBIR;" - -#. Name -#: mrml-servicemenu.desktop:6 -msgid "Search for Similar Images..." -msgstr "Sesha ukuthola Izithombe Ezifanayo...." - -#. Comment -#: mrml.desktop:2 -msgid "Multimedia Retrieval Markup Language Document" -msgstr "Ushicilelo Lwe-Multimedia Retrieval Markup Language " - -#. Name -#: mrml_part.desktop:4 -msgid "MRML View" -msgstr "Umbukiso we-MRML" - -#. Name -#: server/daemonwatcher.desktop:3 -msgid "KDED KMRML Daemon Watcher" -msgstr "" - -#. Comment -#: server/daemonwatcher.desktop:4 -msgid "Starts daemons on demand and restarts them on failure" -msgstr "" diff --git a/translations/desktop_files/kolourpaint.desktop/ru.po b/translations/desktop_files/kolourpaint.desktop/ru.po index 5bee7fce..19a813ad 100644 --- a/translations/desktop_files/kolourpaint.desktop/ru.po +++ b/translations/desktop_files/kolourpaint.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kolourpaint-kolourpaintdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kolourpaint.desktop:3 msgid "KolourPaint" -msgstr "" +msgstr "KolourPaint" #. GenericName #: kolourpaint.desktop:4 diff --git a/translations/desktop_files/kooka.desktop/ru.po b/translations/desktop_files/kooka.desktop/ru.po index 58326c97..49e8fd5c 100644 --- a/translations/desktop_files/kooka.desktop/ru.po +++ b/translations/desktop_files/kooka.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:33+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kooka-kookadesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kooka.desktop:8 @@ -24,4 +26,4 @@ msgstr "Сканирование и распознавание текста" #. Name #: kooka.desktop:9 msgid "Kooka" -msgstr "" +msgstr "Kooka" diff --git a/translations/desktop_files/kpdf-desktops/ru.po b/translations/desktop_files/kpdf-desktops/ru.po index d133a377..e0c34902 100644 --- a/translations/desktop_files/kpdf-desktops/ru.po +++ b/translations/desktop_files/kpdf-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kpdf-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kpdf_part.desktop:3 shell/kpdf.desktop:4 msgid "KPDF" -msgstr "" +msgstr "KPDF" #. GenericName #: shell/kpdf.desktop:5 diff --git a/translations/desktop_files/kpovmodeler.desktop/ru.po b/translations/desktop_files/kpovmodeler.desktop/ru.po index 4ba486bc..26dfc0f2 100644 --- a/translations/desktop_files/kpovmodeler.desktop/ru.po +++ b/translations/desktop_files/kpovmodeler.desktop/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:37+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kpovmodeler-kpovmodelerdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kpovmodeler.desktop:6 -#, fuzzy msgid "KPovModeler" -msgstr "Редактор Povray" +msgstr "KPovModeler" #. GenericName #: kpovmodeler.desktop:7 diff --git a/translations/desktop_files/kruler.desktop/ru.po b/translations/desktop_files/kruler.desktop/ru.po index 8e6c45d4..3fd16d63 100644 --- a/translations/desktop_files/kruler.desktop/ru.po +++ b/translations/desktop_files/kruler.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kruler-krulerdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kruler.desktop:2 @@ -24,4 +26,4 @@ msgstr "Экранная линейка TDE" #. Name #: kruler.desktop:3 msgid "KRuler" -msgstr "" +msgstr "KRuler" diff --git a/translations/desktop_files/ksnapshot.desktop/cs.po b/translations/desktop_files/ksnapshot.desktop/cs.po index 014020f9..e45728aa 100644 --- a/translations/desktop_files/ksnapshot.desktop/cs.po +++ b/translations/desktop_files/ksnapshot.desktop/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:46+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-03-02 13:22+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdegraphics/ksnapshot-ksnapshotdesktop/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.15.2\n" #. GenericName #: ksnapshot.desktop:2 @@ -24,4 +25,4 @@ msgstr "Snímač obrazovky" #. Name #: ksnapshot.desktop:4 msgid "KSnapshot" -msgstr "" +msgstr "KSnapshot" diff --git a/translations/desktop_files/ksnapshot.desktop/ru.po b/translations/desktop_files/ksnapshot.desktop/ru.po index 06954d12..c4e3cdac 100644 --- a/translations/desktop_files/ksnapshot.desktop/ru.po +++ b/translations/desktop_files/ksnapshot.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:46+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/ksnapshot-ksnapshotdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: ksnapshot.desktop:2 @@ -24,4 +26,4 @@ msgstr "Создание снимков экрана" #. Name #: ksnapshot.desktop:4 msgid "KSnapshot" -msgstr "" +msgstr "KSnapshot" diff --git a/translations/desktop_files/ksvg-desktops/ru.po b/translations/desktop_files/ksvg-desktops/ru.po index c64f0db5..5ea5b383 100644 --- a/translations/desktop_files/ksvg-desktops/ru.po +++ b/translations/desktop_files/ksvg-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-08 23:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/ksvg-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: core/ksvgrenderer.desktop:5 @@ -44,7 +46,7 @@ msgstr "Старый движок отрисовки ksvg" #. Name #: plugin/ksvgplugin.desktop:2 msgid "KSVGPlugin" -msgstr "" +msgstr "KSVGPlugin" #. Comment #: plugin/ksvgplugin.desktop:3 diff --git a/translations/desktop_files/kuickshow.desktop/ru.po b/translations/desktop_files/kuickshow.desktop/ru.po index e88d4fae..ef4a92ee 100644 --- a/translations/desktop_files/kuickshow.desktop/ru.po +++ b/translations/desktop_files/kuickshow.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-09 00:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kuickshow-kuickshowdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kuickshow.desktop:2 msgid "Kuickshow" -msgstr "" +msgstr "Kuickshow" #. GenericName #: kuickshow.desktop:11 diff --git a/translations/desktop_files/kview-desktops/ru.po b/translations/desktop_files/kview-desktops/ru.po index 87fd0892..9e743575 100644 --- a/translations/desktop_files/kview-desktops/ru.po +++ b/translations/desktop_files/kview-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:19+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-03 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kview-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: config/kviewgeneralconfig.desktop:14 @@ -56,9 +58,8 @@ msgstr "Просмотр изображений" #. Name #: kview.desktop:10 -#, fuzzy msgid "KView" -msgstr "Просмотрщик" +msgstr "KView" #. Name #: kviewcanvas/config/kviewcanvasconfig.desktop:14 @@ -155,7 +156,7 @@ msgstr "А здесь должно быть описание модуля" #. Name #: photobook/photobook.desktop:2 photobook/photobook.desktop:6 msgid "Photobook" -msgstr "" +msgstr "Фотоальбом" #. Comment #: photobook/photobook.desktop:7 diff --git a/translations/desktop_files/kviewshell-desktops/ru.po b/translations/desktop_files/kviewshell-desktops/ru.po index f0b38212..907cdb1d 100644 --- a/translations/desktop_files/kviewshell-desktops/ru.po +++ b/translations/desktop_files/kviewshell-desktops/ru.po @@ -1,30 +1,32 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-09 15:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/kviewshell-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: emptymultipage.desktop:3 msgid "EmptyMultiPage" -msgstr "" +msgstr "EmptyMultiPage" #. Name #: plugins/djvu/djvumultipage.desktop:2 msgid "kdjview" -msgstr "" +msgstr "kdjview" #. Comment #: plugins/djvu/djvumultipage.desktop:5 diff --git a/translations/desktop_files/tdeiconedit.desktop/ru.po b/translations/desktop_files/tdeiconedit.desktop/ru.po index 8726db57..5721365e 100644 --- a/translations/desktop_files/tdeiconedit.desktop/ru.po +++ b/translations/desktop_files/tdeiconedit.desktop/ru.po @@ -1,28 +1,29 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-09 16:51+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-02 18:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegraphics/tdeiconedit-tdeiconeditdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: tdeiconedit.desktop:2 msgid "Icon Editor" -msgstr "Редактор пиктограмм" +msgstr "Редактор значков" #. Name #: tdeiconedit.desktop:3 -#, fuzzy msgid "TDEIconEdit" -msgstr "Редактор пиктограмм" +msgstr "TDEIconEdit" |