diff options
Diffstat (limited to 'kommander/executor')
| -rw-r--r-- | kommander/executor/CMakeLists.txt | 63 | ||||
| -rw-r--r-- | kommander/executor/instance.cpp | 8 | ||||
| -rw-r--r-- | kommander/executor/instance.h | 2 | ||||
| -rw-r--r-- | kommander/executor/kmdr-executor.desktop | 79 | ||||
| -rw-r--r-- | kommander/executor/main.cpp | 2 |
5 files changed, 73 insertions, 81 deletions
diff --git a/kommander/executor/CMakeLists.txt b/kommander/executor/CMakeLists.txt new file mode 100644 index 00000000..f3095915 --- /dev/null +++ b/kommander/executor/CMakeLists.txt @@ -0,0 +1,63 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/widgets + ${CMAKE_SOURCE_DIR}/kommander/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### instance (static) + +tde_add_library( instance STATIC_PIC AUTOMOC + + SOURCES + instance.cpp + dcopkommanderif.skel + LINK + tdecore-shared + tdeui-shared + tdeio-shared + kommanderplugin-shared + kommanderwidget-shared +) + + +##### kmdr-executor (executable) + +tde_add_executable( kmdr-executor AUTOMOC + + SOURCES + main.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + instance-static + kommanderwidget-shared + kommanderwidgets-shared + kommanderfactory-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kmdr-executor.desktop + DESTINATION ${APPS_INSTALL_DIR}/.hidden + PO_DIR kommander-desktops +) diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index e23a206a..b746ec97 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -106,7 +106,7 @@ bool Instance::build(const KURL& fname) { TQFile inputFile; inputFile.open(IO_ReadOnly, stdin); - m_instance = KommanderFactory::create(TQT_TQIODEVICE(&inputFile)); + m_instance = KommanderFactory::create(&inputFile); } // check if build was successful @@ -121,7 +121,7 @@ bool Instance::build(const KURL& fname) window->setFileName(fname.path().local8Bit()); // FIXME : Should verify that all of the widgets in the dialog derive from KommanderWidget - m_textInstance = kommanderWidget(TQT_TQOBJECT(m_instance)); + m_textInstance = kommanderWidget(m_instance); if (!m_textInstance) // Main dialog/window is not a Kommander widget - look for one { @@ -437,7 +437,7 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObject* child = stringToWidget(parent); TQObjectList* widgets; if (!child) - child = TQT_TQOBJECT(m_instance); + child = m_instance; if (child->inherits("TQWidget")) { widgets = child->queryList("TQWidget", 0, false, recursive); @@ -606,7 +606,7 @@ void Instance::setGlobal(const TQString& variableName, const TQString& value) TQObject* Instance::stringToWidget(const TQString& name) { - return m_instance->child(name); + return m_instance->child(name.utf8()); } KommanderWidget* Instance::kommanderWidget(TQObject* object) diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h index f7af3103..f93c90de 100644 --- a/kommander/executor/instance.h +++ b/kommander/executor/instance.h @@ -42,7 +42,7 @@ class KommanderWidget; class Instance : public TQObject, virtual public DCOPKommanderIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/executor/kmdr-executor.desktop b/kommander/executor/kmdr-executor.desktop index 705c67f7..6a714063 100644 --- a/kommander/executor/kmdr-executor.desktop +++ b/kommander/executor/kmdr-executor.desktop @@ -1,81 +1,10 @@ [Desktop Entry] +Name=Kommander Executor + +Comment=Executor for Kommander dialogs + Type=Application Exec=kmdr-executor %F Icon=kommander -Comment=Executor for Kommander dialogs -Comment[bg]=Изпълнение на диалогови прозорци -Comment[ca]=Executor per a diàlegs de Kommander -Comment[cs]=Spouštěč dialogů Kommanderu -Comment[da]=Udfører Kommanders dialoger -Comment[de]=Stellt Kommander-Dialoge dar -Comment[el]=Εκτελεστής για διαλόγους Kommander -Comment[en_GB]=Executor for Kommander dialogues -Comment[es]=Lanzador de cuadros de diálogo de Kommander -Comment[et]=Kommanderi dialoogide rakendaja -Comment[eu]=Kommander-en elkarrizketen exekutatzailea -Comment[fa]=مجری محاورههای Kommander -Comment[fi]=Komentodialogien rakentaja -Comment[fr]=Exécuteur de boîtes de dialogue de Kommander -Comment[gl]=Executor para os diálogos de Kommander -Comment[hi]=कमांडर संवादों हेतु कार्यपालक -Comment[hu]=Megjelenítőprogram Kommander-párbeszédablakokhoz -Comment[is]=Executor fyrir Kommander glugga -Comment[it]=Esecutore per maschere di Kommander -Comment[ja]=Kommander ダイアログ用の Executor -Comment[ka]=Kommander-ის დიალოგის შემსრულებელნი -Comment[lt]=Kommander dialogų vykdyklė -Comment[ms]=Pelaksana untuk dialog Kommander -Comment[nds]=Föhrt Kommander-Dialogen ut -Comment[ne]=आदेश संवादका लागि निर्वाहक -Comment[nl]=Kommander-dialogen uitvoeren -Comment[pl]=Uruchamianie z okien dialogowych Kommandera -Comment[pt]=Executor dos diálogos do Kommander -Comment[pt_BR]=Executor para diálogos do Kommander -Comment[ru]=Выполнение диалогов Kommander -Comment[sk]=Spúštač pre Kommander dialógy -Comment[sl]=Izvajalnik za pogovorna okna Kommanderja -Comment[sr]=Извршавач за Kommander-ове дијалоге -Comment[sr@Latn]=Izvršavač za Kommander-ove dijaloge -Comment[sv]=Körning av Kommander-dialogrutor -Comment[ta]=Kகட்டளை உரையாடல் நிகழ்த்துபவர் -Comment[tg]=Иҷрокунанда барои диалогҳои Kommander -Comment[tr]=Kommander diyalogları için çalıştırıcı -Comment[uk]=Запускач для вікон Kommander -Comment[zh_CN]=Kommander 对话框执行器 -Comment[zh_HK]=Kommander 對話盒的運行程式 -Comment[zh_TW]=Kommander 對話盒的運行程式 Terminal=false -Name=Kommander Executor -Name[br]=Aozer Kommander -Name[ca]=Executor Kommander -Name[cs]=Spouštěč Kommanderu -Name[de]=Kommander-Exekutor -Name[el]=Εκτελεστής Kommander -Name[eu]=Kommander exekutatzailea -Name[fa]=مجری Kommander -Name[fi]=Komennon suorittaja -Name[fr]=Exécuteur de Kommander -Name[gl]=Executor de Kommander -Name[hi]=कमांडर कार्यपालक -Name[it]=Esecutore per Kommander -Name[lt]=Kommander vykdyklė -Name[ms]=Pelaksana Kommander -Name[nds]=Kommander-Executor -Name[ne]=आदेश निर्वाहक -Name[nl]=Kommander Uitvoerder -Name[pl]=Kommander: uruchamianie -Name[pt]=Executor do Kommander -Name[pt_BR]=Executor do Kommander -Name[ru]=Kommander -Name[sk]=Kommander spúštač -Name[sl]=Izvajalnik Kommander -Name[sr]=Kommander извршавач -Name[sr@Latn]=Kommander izvršavač -Name[ta]=Kகட்டளை நிகழ்த்துபவர் -Name[tg]=Иҷрокунандаи Kommander -Name[tr]=Kommander Çalıştırıcısı -Name[uk]=Запускач Kommander -Name[zh_CN]=Kommander 执行器 -Name[zh_HK]=Kommander 執行器 -Name[zh_TW]=Kommander 執行器 MimeType=application/x-kommander diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index ecd9bfac..f27ab90f 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) TDELocale::setMainCatalogue("kommander"); TDEApplication app; - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); if (!args->count()) { KMessageBox::sorry(0, i18n("Error: no dialog given. Use --stdin option to read dialog from standard input.\n")); |