diff options
Diffstat (limited to 'parts/astyle')
| -rw-r--r-- | parts/astyle/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | parts/astyle/astyle_part.cpp | 28 | ||||
| -rw-r--r-- | parts/astyle/astyle_part.h | 2 | ||||
| -rw-r--r-- | parts/astyle/astyle_widget.cpp | 68 | ||||
| -rw-r--r-- | parts/astyle/astyle_widget.h | 2 | ||||
| -rw-r--r-- | parts/astyle/astyleconfig.ui | 4 | ||||
| -rw-r--r-- | parts/astyle/kdevastyle.desktop | 79 |
7 files changed, 64 insertions, 126 deletions
diff --git a/parts/astyle/CMakeLists.txt b/parts/astyle/CMakeLists.txt index bac3e50a..502f5543 100644 --- a/parts/astyle/CMakeLists.txt +++ b/parts/astyle/CMakeLists.txt @@ -28,7 +28,12 @@ link_directories( ##### other data ################################ -install( FILES kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevastyle.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) + install( FILES kdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/kdevastyle ) diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index f5b5e2e7..df911cc1 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -33,7 +33,7 @@ #include "astyle_widget.h" #include "astyle_adaptor.h" -static const KDevPluginInfo data("kdevastyle"); +static const KDevPluginInfo pluginData("kdevastyle"); namespace { const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; @@ -41,22 +41,22 @@ namespace { typedef KDevGenericFactory<AStylePart> AStyleFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) ) AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) - : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") + : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); setXMLFile("kdevpart_astyle.rc"); - formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); + formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQ_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); formatTextAction->setToolTip(i18n("Reformat source")); formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. " "Also available in <b>New Class</b> and <b>Subclassing</b> wizards.")); - formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); + formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQ_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); formatFileAction->setEnabled(false); formatFileAction->setToolTip(i18n("Format files")); formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. " @@ -68,11 +68,11 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) m_configProxy->createProjectConfigPage(i18n("Formatting"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQT_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQ_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); loadGlobal(); //use the globals first, project level will override later.. @@ -88,7 +88,7 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) void AStylePart::loadGlobal() { // kdDebug(9009) << "Load global"<<endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,"); m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions)); @@ -123,7 +123,7 @@ void AStylePart::saveGlobal() // kdDebug(9009) << "project before: " <<iter.key() << "="<< iter.data() << endl; // } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); config->writeEntry("Options",options); config->writeEntry("Extensions",m_globalExtensions.join(",")); @@ -249,13 +249,13 @@ void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsi case GLOBALDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -399,7 +399,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) if (context->hasType( Context::EditorContext )) { popup->insertSeparator(); - int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) ); + int id = popup->insertItem( i18n("Format selection"), this, TQ_SLOT(beautifySource()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible")); } else if ( context->hasType( Context::FileContext )){ @@ -407,7 +407,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) m_urls = ctx->urls(); popup->insertSeparator(); - int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) ); + int id = popup->insertItem( i18n("Format files"), this, TQ_SLOT(formatFiles()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible")); } diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index f5a79485..05f94bb7 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -22,7 +22,7 @@ class ConfigWidgetProxy; class AStylePart : public KDevSourceFormatter { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 6959fe7b..67cf8d5c 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -17,40 +17,40 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, con : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. - connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) ); - - connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(StyleGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(ConfigTabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(styleChanged()) ); + + connect(FillingGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_ForceTabs, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Fill_TabCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_SpaceCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(BracketGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Brackets_CloseHeaders, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Indent_Switches, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Cases, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Classes, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Brackets, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Namespaces, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Labels, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Preprocessors, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Continue_MaxStatement, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Continue_MinConditional, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(Block_Break, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_BreakAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_IfElse, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Pad_ParenthesesIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesUn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_Operators, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Keep_Statements, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Keep_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); TQStringVariantMap option; diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index 91963e54..5ebb70b0 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -9,7 +9,7 @@ class KDevPart; class AStyleWidget : public AStyleConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui index 73cf691a..28a3432e 100644 --- a/parts/astyle/astyleconfig.ui +++ b/parts/astyle/astyleconfig.ui @@ -1324,9 +1324,9 @@ multiple single-statement lines.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>allFiles()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/astyle/kdevastyle.desktop b/parts/astyle/kdevastyle.desktop index df9a694c..8fdadea7 100644 --- a/parts/astyle/kdevastyle.desktop +++ b/parts/astyle/kdevastyle.desktop @@ -1,79 +1,12 @@ [Desktop Entry] -Type=Service -Exec=blubb -Comment=A plugin for formatting of sourcecode according to a specified set of rules. When loaded it is found in the Tools menu. -Comment[ca]=Un connector per a donar format al codi font d'acord a una sèrie de regles especificades. Quan està carregat apareixerà en el menú Eines. -Comment[da]=Et plugin til at formatere kildekode ifølge et angivet sæt regler. Når det er indlæst er det i værktøjsmenuen. -Comment[de]=Ein Modul zur Formatierung der Quelltexte nach vorgegebenen Regeln. Ist das Modul geladen, kann es über das Menü "Werkzeuge" aufgerufen werden. -Comment[el]=Ένα πρόσθετο για τη μορφοποίηση του πηγαίου κώδικα σύμφωνα με το ορισμένο σύνολο κανόνων. Όταν φορτωθεί μπορεί να βρεθεί στο μενού εργαλείων. -Comment[es]=Un complemento para dar formato al código fuente de acuerdo una serie de reglas especificadas. Cuando está cargado, aparece en el menú Herramientas. -Comment[et]=Plugin lähtekoodi vormindamiseks vastavalt konkreetsetele reeglitele. Kasutamisel leiab selle tööriistade menüüst. -Comment[eu]=Iturburu kodea emandako arau sorten arabera formateatuko da. Kargatzean Tresnak menuan aurkituko duzu. -Comment[fa]=وصلهای برای قالببندی کد منبع طبق یک سری قوانین مشخصشده. در هنگام بارگذاری در گزینگان ابزار یافت میشود. -Comment[fr]=Un module externe pour le formatage du code source selon un ensemble de règles spécifié. Lorsqu'il est chargé, ce module externe se trouve dans le menu « Outils ». -Comment[gl]=Unha extensión para formatear código seguindo un conxunto de regras. Cando se carga atópase no menú Ferramentas. -Comment[hu]=Bővítőmodul forráskód formázásához, megadott szabályok alapján. Az Eszközök menüből érhető el, ha be van töltve. -Comment[it]=Un plugin per formattare il codice sorgente secondo uno specifico insieme di regole. Quando sarà caricato lo troverai nel menu Strumenti. -Comment[ja]=指定された規則にソースコードを書式化するためのプラグイン。読み込まれるとツールメニューで見つかります。 -Comment[ms]=Plugin untuk memformat kod sumber mengikut set peraturan yang ditetapkan. Apabila dimuatkan ia berada di menu Alatan. -Comment[nds]=En Moduul för't Borntextformateren na angeven Regeln. Wenn dat Moduul laadt is, lett sik dat binnen dat Warktüüchmenü finnen. -Comment[ne]=नियमको निर्दिष्ट सेट अनुसार स्रोतसङ्केतको ढाँचाबद्धताका लागि प्लगइन । लोड भएपछि यो उपकरण मेनुमा फेला पार्न सकिन्छ । -Comment[nl]=Een plugin om broncode te formatteren volgens een speciale set regels. Te vinden onder het menu Gereedschap. -Comment[pl]=Wtyczka do formatowania kodu źródłowego zgodnie z podanymi zasadami. Po wczytaniu pojawia się w menu Narzędzia. -Comment[pt]=Um 'plugin' para a formatação do código-fonte de acordo com um conjunto específico de regras. Quando é carregado, encontrar-se-á no menu Ferramentas. -Comment[pt_BR]=Um plug-in para formatação do código fonte de acordo com um conjunto específico de regras. Quando carregado é encontrado no menu Ferramentas. -Comment[ru]=Модуль для форматирования кода по установленным правилам. -Comment[sk]=Modul pre formátovanie zdrojového kódu podľa špecifických pravidiel.Po načítaní ho nájdete v menu Nástroje. -Comment[sr]=Прикључак за форматирање изворног кôда према прецизираном скупу правила. Када је учитан, налази се у менију „Алати“. -Comment[sr@Latn]=Priključak za formatiranje izvornog kôda prema preciziranom skupu pravila. Kada je učitan, nalazi se u meniju „Alati“. -Comment[sv]=Ett insticksprogram för att formatera källkod enligt en given uppsättning regler. När det laddats finns det i verktygsmenyn. -Comment[ta]=மூல குறிமுறை வடிவத்தை மாற்றும் சொருகிக்கு சில குறிப்பிட்ட விதிமுறைகள் உள்ளது. ஏற்றியபின் இதனை கருவிப்பட்டியில் காணலாம். -Comment[tg]=Модул барои қолабгузории код аз рӯи қонунҳои гузошта шуда. -Comment[tr]=Belli kurallara göre kaynak kodu biçimlendirmeye yarayan bir eklenti. Yüklendiğinde Araçlar menüsünde bulunabilir. -Comment[zh_CN]=一个按照指定规则格式化源代码的插件。启动后显示在工具菜单。 -Comment[zh_TW]=一個根據特定規則將程式源碼格式化的外掛程式。載入後可以在工具選單中找到。 Name=KDevAStyle -Name[da]=TDevelop en stil -Name[de]=Artistic-Style-Unterstützung (TDevelop) -Name[hi]=के-डेव-ए-स्टाइल -Name[nds]=Kodestil-Ünnerstütten för TDevelop -Name[pl]=KDevStylA -Name[sk]=KDev štýl -Name[sv]=TDevelop A-stil -Name[zh_TW]=TDevelop AStyle + GenericName=Source Code Formatter -GenericName[ca]=Formatador de codi font -GenericName[da]=Kildekode-formatering -GenericName[de]=Quelltext-Formatierer -GenericName[el]=Μορφοποιητής πηγαίου κώδικα -GenericName[es]=Formateador de código fuente -GenericName[et]=Lähtekoodi vormindaja -GenericName[eu]=Iturburu kode formateatzailea -GenericName[fa]=قالبدهندۀ کد منبع -GenericName[fr]=Formatage de code source -GenericName[gl]=Formateador de código -GenericName[hi]=स्रोत कोड फ़ॉर्मेटर -GenericName[hu]=Forráskód-formázó -GenericName[it]=Formattatore del codice sorgente -GenericName[ja]=ソースコードフォーマッタ -GenericName[ms]=Pemformat Kod Sumber -GenericName[nds]=Borntext-Formateren -GenericName[ne]=स्रोत सङ्केत ढाँचाबद्धक -GenericName[nl]=Broncode formatteren -GenericName[pl]=Formatowanie kodu źródłowego -GenericName[pt]=Formatador de Código Fonte -GenericName[pt_BR]=Formatador de Código Fonte -GenericName[ru]=Форматирование исходного кода -GenericName[sk]=Formátovač zdrojového kódu -GenericName[sl]=Oblikovalec izvorne kode -GenericName[sr]=Форматер изворног кода -GenericName[sr@Latn]=Formater izvornog koda -GenericName[sv]=Källkodsformatering -GenericName[ta]=மூல குறியை வடிவமைப்பவர் -GenericName[tg]=Қолабгузори коди берунӣ -GenericName[tr]=Kaynak Kodu Biçimlendirici -GenericName[zh_CN]=源代码格式化 -GenericName[zh_TW]=程式源碼格式器 + +Comment=A plugin for formatting of sourcecode according to a specified set of rules. When loaded it is found in the Tools menu. + +Type=Service +Exec=blubb Icon=tdevelop X-TDE-ServiceTypes=TDevelop/SourceFormatter X-TDE-Library=libkdevastyle |