diff options
Diffstat (limited to 'kamera')
22 files changed, 55 insertions, 245 deletions
diff --git a/kamera/CMakeLists.txt b/kamera/CMakeLists.txt index 56e7c70d..efba5997 100644 --- a/kamera/CMakeLists.txt +++ b/kamera/CMakeLists.txt @@ -12,5 +12,4 @@ include( ConfigureChecks.cmake ) add_subdirectory( tdeioslave ) -add_subdirectory( kcontrol ) -add_subdirectory( pics ) +add_subdirectory( kcontrol )
\ No newline at end of file diff --git a/kamera/Makefile.am b/kamera/Makefile.am index e7776502..4310a2cc 100644 --- a/kamera/Makefile.am +++ b/kamera/Makefile.am @@ -1 +1 @@ -SUBDIRS = kcontrol tdeioslave pics +SUBDIRS = kcontrol tdeioslave diff --git a/kamera/kcontrol/CMakeL10n.txt b/kamera/kcontrol/CMakeL10n.txt index 75a9a1a7..d6ff2c57 100644 --- a/kamera/kcontrol/CMakeL10n.txt +++ b/kamera/kcontrol/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "kcmkamera" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kamera.desktop/" + SOURCES kamera.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kamera/kcontrol/CMakeLists.txt b/kamera/kcontrol/CMakeLists.txt index c901d4b4..e27ffccb 100644 --- a/kamera/kcontrol/CMakeLists.txt +++ b/kamera/kcontrol/CMakeLists.txt @@ -24,7 +24,7 @@ link_directories( #### other data ################################# -install( FILES kamera.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( kamera.desktop ) #### kamera (module) ############################ diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 0fc9c22b..f3c89149 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <kgenericfactory.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeaction.h> #include <kiconloader.h> #include <tdemessagebox.h> @@ -53,7 +53,7 @@ KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringL { m_devicePopup = new TDEPopupMenu(this); m_actions = new TDEActionCollection(this); - m_config = new KSimpleConfig(KProtocolInfo::config("camera")); + m_config = new TDESimpleConfig(KProtocolInfo::config("camera")); m_context = gp_context_new(); if (m_context) { @@ -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"), "camera_test", 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.desktop b/kamera/kcontrol/kamera.desktop index aea50041..0a4292e0 100644 --- a/kamera/kcontrol/kamera.desktop +++ b/kamera/kcontrol/kamera.desktop @@ -1,188 +1,7 @@ [Desktop Entry] +Name=Digital Camera Comment=Configure Kamera -Comment[af]=Konfigureer Kamera -Comment[ar]=إعداد Kamera -Comment[az]=Kameranı Quraşdır -Comment[bg]=Настройване на цифров фотоапарат -Comment[br]=Kefluniañ Kamera -Comment[bs]=Podesi kameru -Comment[ca]=Configura Kamera -Comment[cs]=Nastavení Kamery -Comment[cy]=Ffurfweddu Kamera -Comment[da]=Indstil kamera -Comment[de]=Kamera einrichten -Comment[el]=Ρύθμιση Kamera -Comment[eo]=Agordu fotilon -Comment[es]=Configura Kamera -Comment[et]=Kaamera seadistamine -Comment[eu]=Konfiguratu Kamera -Comment[fa]=پیکربندی Kamera -Comment[fi]=Kameran asetukset -Comment[fr]=Configuration de Kamera -Comment[ga]=Cumraigh Kamera -Comment[gl]=Configurar Kamera -Comment[he]=שינוי הגדרות Kamera -Comment[hi]=कॉन्फ़िगर केमरा -Comment[hr]=Podesi Kameru -Comment[hu]=A digitális fényképezőgépek beállításai -Comment[id]=Konfigurasi kamera -Comment[is]=Stilla samskiptaforrit stafrænna myndavéla (Kamera) -Comment[it]=Configura Kamera -Comment[ja]=カメラの設定 -Comment[kk]=Kamera баптаулары -Comment[km]=កំណត់រចនាសម្ព័ន្ធ Kamera -Comment[ko]=카메라 설정 -Comment[lt]=Konfigūruoti Kamera -Comment[mk]=Конфигурирајте ја Kamera -Comment[ms]=Konfigurasi Kamera -Comment[mt]=Ikkonfigura Kamera -Comment[nb]=Tilpass Kamera -Comment[nds]=Kamera instellen -Comment[ne]=क्यामेरा कन्फिगर गर्नुहोस् -Comment[nl]=Camera instellen -Comment[nn]=Set opp Kamera -Comment[nso]=Beakanya Kamera -Comment[pa]=ਕੈਮਰਾ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja Kamery -Comment[pt]=Configuração do Kamera -Comment[pt_BR]=Configurar Kamera -Comment[ro]=Configurează aparatul foto digital -Comment[ru]=Настройка камеры -Comment[se]=Heivet govvenapperáhta -Comment[sk]=Nastaviť program Kamera -Comment[sl]=Nastavitve fotoaparata -Comment[sr]=Подеси Kamera-у -Comment[sr@Latn]=Podesi Kamera-u -Comment[sv]=Anpassa kamera -Comment[ta]=காமிராவை அமை -Comment[tg]=Танзимоти камера -Comment[th]=ปรับแต่ง Kamera -Comment[tr]=Kamera'yı Yapılandır -Comment[uk]=Налаштувати Kamera -Comment[uz]=Fotoaparatni moslash -Comment[uz@cyrillic]=Фотоапаратни мослаш -Comment[ven]=Dzudzanya kamera -Comment[xh]=Qwalasela Umfoti -Comment[zh_CN]=配置 Kamera -Comment[zh_HK]=設定 Kamera -Comment[zh_TW]=設定照相機 -Comment[zu]=Hlanganisa ikhamera Keywords=gphoto;camera;digicam;webcam;kamera; -Keywords[ar]=gphoto;كاميرا;كاميرا رقمية;كاميرا ويب;kamera; -Keywords[az]=gphoto;kamera;digicam;veb kamera;Kamera;webcam; -Keywords[bg]=фото; апарат; фотоапарат; камера; цифров; цифрова; gphoto; camera; digicam; webcam; kamera; -Keywords[br]=gphoto;kamera;digicam;webcam;kamera; -Keywords[ca]=gphoto;càmera;digicam;webcam;kamera; -Keywords[cs]=gphoto;Kamera;Digitální kamera;Webová kamera;Foto; -Keywords[da]=gphoto;kamera;digicam;webcam; -Keywords[de]=gphoto;Kamera;Digicam;Webcam;Digitalkamera; -Keywords[el]=gphoto;κάμερα;digicam;webcam;kamera; -Keywords[eo]=gphoto;kamerao;fotilo;cifereca fotilo;TTT-fotilo; -Keywords[es]=gphoto;cámara;digicam;webcam;kamera; -Keywords[et]=gphoto;kaamera;digitaalkaamera;veebikaamera;kamera; -Keywords[eu]=gphoto;kamera;digicam;webcam;kamera; -Keywords[fa]=gphoto، دوربین، دوربین رقمی، دوربین وب، kamera; -Keywords[fi]=gphoto;kamera;digicam;webcam; -Keywords[fr]=gphoto;camera;digicam;webcam;kamera;caméscope;caméra;appareil photo; -Keywords[he]=gphoto;kamera;מצלמה;מצלמת רשת;מצלמה דיגיטלית; amera;digicam;webcam; -Keywords[hi]=जीफोटो;केमरा;डिजिकेम;वेबकेम;केमरा; -Keywords[hu]=gphoto;fényképezőgép;digitális fényképezőgép;webkamera;videókamera; -Keywords[is]=gphoto;myndavél;stafræn myndavél;webcam;kamera; -Keywords[it]=gphoto;fotocamera;macchina fotografica digitale;webcam;kamera; -Keywords[ja]=gphoto;カメラ;デジカム;ウェブカム;kamera; -Keywords[km]=gphoto;ម៉ាស៊ីនថតរូប;digicam;ម៉ាស៊ីនថតតាមបណ្ដាញ;kamera; -Keywords[ko]=gphoto;camera;digicam;webcam;kamera;사진;카메라;사진기;웹캠; -Keywords[lv]=gfoto;camera;digicam;webcam;kamera; -Keywords[nb]=gphoto;kamera;digicam;webcam;webkamera; -Keywords[nds]=gphoto;Kamera;Webcam;Kamera;Nettkamera; -Keywords[ne]=जी फोटो; क्यामेरा; डिजिक्याम; वेबक्याम; कामेरा; -Keywords[nl]=gphoto;camera;digicam;webcam;kamera;foto; -Keywords[nn]=gphoto;fotoapparat;digitalt kamera;webkamera;vevkamera;kamera; -Keywords[pl]=gphoto;kamera;kamera cyfrowa;kamera sieciowa; -Keywords[pt]=gphoto;câmara;digicam;webcam;kamera; -Keywords[pt_BR]=gphoto;câmera;câmera digital;webcam;kamera; -Keywords[ro]=gphoto;aparat;foto;digicam;webcam;camera;kamera; -Keywords[ru]=gphoto;camera;digicam;webcam;kamera;камера;фото; -Keywords[sl]=gphoto;kamera;digicam;webcam;foto;fotoaparat;spletna kamera; -Keywords[sr]=gphoto;camera;digicam;webcam;kamera;камера; -Keywords[sr@Latn]=gphoto;camera;digicam;webcam;kamera;kamera; -Keywords[sv]=gphoto;kamera;digital kamera;webbkamera;kamera; -Keywords[ta]=ஜிபோட்டோ; காமிரா; டிஜிகேம்;வலைதள காமிரா; காமிரா; -Keywords[tg]=gphoto;camera;digicam;webcam;kamera;камера;фото; -Keywords[tr]=gphoto;kamera;digicam;web kamera;Kamera;webcam; -Keywords[uk]=gphoto;камера;цифрова камера;камера Тенет;kamera; -Keywords[ven]=Tshinepe tsha g;Tshaudzhia zwifanyiso;digicam;webcam;Tshaudzhiazwifanyiso; -Keywords[xh]=gphoto;umfoti;digicam;webcam;umfoti; -Keywords[zh_CN]=gphoto;camera;digicam;webcam;kamera;照相机;数码相机;摄像头; -Keywords[zh_TW]=gphoto;camera;digicam;webcam;kamera;照相機; -Keywords[zu]=gphoto;ikhamera;digicam;webcam;ikhamera; -Name=Digital Camera -Name[af]=Digitaal Kamera -Name[ar]=كاميرا رقمية -Name[az]=Digital Kamera -Name[bg]=Фотоапарат -Name[br]=Kamera niverel -Name[bs]=Digitalna kamera -Name[ca]=Càmera digital -Name[cs]=Digitální fotoaparát -Name[cy]=Camera Digidol -Name[da]=Digitalt kamera -Name[de]=Digitalkamera -Name[el]=Ψηφιακή κάμερα -Name[eo]=Cifereca fotilo -Name[es]=Cámara digital -Name[et]=Digitaalkaamera -Name[eu]=Kamera digitala -Name[fa]=دوربین رقمی -Name[fi]=Digitaalikamera -Name[fr]=Appareil photo numérique -Name[ga]=Ceamara Digiteach -Name[gl]=Cámara dixital -Name[he]=מצלמה דיגיטלית -Name[hi]=डिजिटल कैमरा -Name[hr]=Digitalna kamera -Name[hu]=Digitális fényképezőgép -Name[is]=Stafræn myndavél -Name[it]=Macchina fotografica digitale -Name[ja]=デジタルカメラ -Name[kk]=Цифрлық камера -Name[km]=ម៉ាស៊ីនថតរូបឌីជីថល -Name[lt]=Skaitmeninė kamera -Name[lv]=Digitālā Kamera -Name[mk]=Дигитална камера -Name[ms]=Kamera Digital -Name[mt]=Kamera diġitali -Name[nb]=Digitalkamera -Name[nds]=Digitaalkamera -Name[ne]= डिजिटल क्यामेरा -Name[nl]=Digitale camera -Name[nn]=Digitalkamera -Name[nso]=Camera ya Digital -Name[pa]=ਡਿਜ਼ੀਟਲ ਕੈਮਰਾ -Name[pl]=Aparat cyfrowy -Name[pt]=Máquina Fotográfica Digital -Name[pt_BR]=Câmera Digital -Name[ro]=Aparat foto digital -Name[ru]=Цифровая камера -Name[se]=Digitalalaš govvenapperáhtta -Name[sk]=Digitálny fotoaparát -Name[sl]=Digitalni fotoaparat -Name[sr]=Дигитална камера -Name[sr@Latn]=Digitalna kamera -Name[sv]=Digitalkamera -Name[ta]= Digital Camera -Name[tg]=Камераи digital -Name[th]=กล้องดิจิตอล -Name[tr]=Sayısal Kamera -Name[uk]=Цифровий фотоапарат -Name[uz]=Fotoaparat -Name[uz@cyrillic]=Фотоапарат -Name[ven]=Tshau dzhia zwifanyiso tsha didzhithala -Name[xh]=Ikhamera Yesuntswana -Name[zh_CN]=数码相机 -Name[zh_HK]=數碼相機 -Name[zh_TW]=數位相機 -Name[zu]=Ikhamera ebonisa inani ngalinye Terminal=false Type=Application X-TDE-Library=kamera diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h index 1c4ef7a0..ce3b88d4 100644 --- a/kamera/kcontrol/kamera.h +++ b/kamera/kcontrol/kamera.h @@ -38,7 +38,7 @@ class TQIconViewItem; class KCamera; class KameraDeviceSelectDialog; -class KSimpleConfig; +class TDESimpleConfig; class TDEIconView; class TDEActionCollection; class TDEToolBar; @@ -46,7 +46,7 @@ class TDEPopupMenu; class KKameraConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT friend class KameraDeviceSelectDialog; @@ -92,7 +92,7 @@ private: private: typedef TQMap<TQString, KCamera *> CameraDevicesMap; - KSimpleConfig *m_config; + TDESimpleConfig *m_config; CameraDevicesMap m_devices; bool m_cancelPending; diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp index 9806ff65..67d4aa5b 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); @@ -183,7 +183,7 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget) { gp_widget_get_value(widget, &widget_value_string); - TQComboBox *comboBox = new TQComboBox(FALSE, parent); + TQComboBox *comboBox = new TQComboBox(false, parent); comboBox->clear(); for(int i = 0; i < gp_widget_count_choices(widget); ++i) { const char *widget_choice; 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..f1a4c295 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."), @@ -326,7 +326,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de TQGrid *grid = new TQGrid(2, m_settingsStack); grid->setSpacing(KDialog::spacingHint()); new TQLabel(i18n("Port:"), grid); - m_serialPortCombo = new TQComboBox(TRUE, grid); + m_serialPortCombo = new TQComboBox(true, grid); TQWhatsThis::add(m_serialPortCombo, i18n("Here you should choose the serial port you connect the camera to.")); m_settingsStack->addWidget(grid, INDEX_SERIAL); 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/kamera/pics/CMakeLists.txt b/kamera/pics/CMakeLists.txt deleted file mode 100644 index 34b473a7..00000000 --- a/kamera/pics/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -################################################# -# -# (C) 2010-2011 Calvin Morrison -# mutantturkey@gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -tde_install_icons( camera-photo ) -tde_install_icons( camera_test ) diff --git a/kamera/pics/Makefile.am b/kamera/pics/Makefile.am deleted file mode 100644 index 6fb78919..00000000 --- a/kamera/pics/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -KDE_ICON = camera-photo camera_test diff --git a/kamera/pics/cr16-action-camera_test.png b/kamera/pics/cr16-action-camera_test.png Binary files differdeleted file mode 100644 index c42dd048..00000000 --- a/kamera/pics/cr16-action-camera_test.png +++ /dev/null diff --git a/kamera/pics/cr16-app-camera-photo.png b/kamera/pics/cr16-app-camera-photo.png Binary files differdeleted file mode 100644 index c81e4875..00000000 --- a/kamera/pics/cr16-app-camera-photo.png +++ /dev/null diff --git a/kamera/pics/cr16-device-camera-photo.png b/kamera/pics/cr16-device-camera-photo.png Binary files differdeleted file mode 100644 index c81e4875..00000000 --- a/kamera/pics/cr16-device-camera-photo.png +++ /dev/null diff --git a/kamera/pics/cr22-device-camera-photo.png b/kamera/pics/cr22-device-camera-photo.png Binary files differdeleted file mode 100644 index b35632bd..00000000 --- a/kamera/pics/cr22-device-camera-photo.png +++ /dev/null diff --git a/kamera/pics/cr22-filesys-camera-photo.png b/kamera/pics/cr22-filesys-camera-photo.png Binary files differdeleted file mode 100644 index b35632bd..00000000 --- a/kamera/pics/cr22-filesys-camera-photo.png +++ /dev/null diff --git a/kamera/pics/cr32-device-camera-photo.png b/kamera/pics/cr32-device-camera-photo.png Binary files differdeleted file mode 100644 index ff8ed2d8..00000000 --- a/kamera/pics/cr32-device-camera-photo.png +++ /dev/null diff --git a/kamera/pics/cr32-filesys-camera-photo.png b/kamera/pics/cr32-filesys-camera-photo.png Binary files differdeleted file mode 100644 index ff8ed2d8..00000000 --- a/kamera/pics/cr32-filesys-camera-photo.png +++ /dev/null diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp index 96d65e9a..8810bcc5 100644 --- a/kamera/tdeioslave/kamera.cpp +++ b/kamera/tdeioslave/kamera.cpp @@ -33,10 +33,10 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kprotocolinfo.h> #include <tdeio/slaveconfig.h> @@ -53,7 +53,7 @@ using namespace TDEIO; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); #ifdef HAVE_GPHOTO2_5 static void frontendCameraStatus(GPContext *context, const char *status, void *data); @@ -95,7 +95,7 @@ m_camera(NULL) // (will init m_camera, since the m_camera's configuration is empty) m_camera = 0; m_file = NULL; - m_config = new KSimpleConfig(KProtocolInfo::config("camera")); + m_config = new TDESimpleConfig(KProtocolInfo::config("camera")); m_context = gp_context_new(); actiondone = true; cameraopen = false; diff --git a/kamera/tdeioslave/kamera.h b/kamera/tdeioslave/kamera.h index 1e015d0f..48d38165 100644 --- a/kamera/tdeioslave/kamera.h +++ b/kamera/tdeioslave/kamera.h @@ -27,7 +27,7 @@ #include <tdeio/slavebase.h> #include <gphoto2.h> -class KSimpleConfig; +class TDESimpleConfig; class KameraProtocol : public TDEIO::SlaveBase { @@ -49,7 +49,7 @@ public: private: Camera *m_camera; CameraAbilities m_abilities; - KSimpleConfig *m_config; + TDESimpleConfig *m_config; GPContext *m_context; |
