From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp | 10 +++++----- languages/cpp/app_templates/kapp/appview.cpp | 4 ++-- languages/cpp/app_templates/kapp/pref.cpp | 10 +++++----- languages/cpp/app_templates/kateplugin2/plugin_app.cpp | 2 +- languages/cpp/app_templates/kcmodule/module.cpp | 2 +- languages/cpp/app_templates/kconfig35/appview.cpp | 2 +- languages/cpp/app_templates/kconfig35/prefs-base.ui | 6 +++--- languages/cpp/app_templates/kde4app/kapp4view_base.ui | 6 +++--- languages/cpp/app_templates/kde4app/prefs_base.ui | 10 +++++----- languages/cpp/app_templates/kioslave/slave.cpp | 2 +- languages/cpp/app_templates/kmake/mainview.ui | 2 +- languages/cpp/app_templates/kpartapp/app_part.cpp | 2 +- languages/cpp/app_templates/kscons_kmdi/app_part.cpp | 2 +- languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp | 6 +++--- languages/cpp/app_templates/kscons_kxt/appview.cpp | 2 +- languages/cpp/app_templates/kscons_kxt/prefs-base.ui | 6 +++--- languages/cpp/app_templates/kxt/appview.cpp | 2 +- languages/cpp/app_templates/kxt/prefs-base.ui | 6 +++--- languages/cpp/app_templates/noatunui/plugin_impl.cpp | 8 ++++---- languages/cpp/app_templates/noatunvisual/plugin_impl.cpp | 4 ++-- languages/cpp/app_templates/noatunvisual/plugin_impl.h | 2 +- languages/cpp/app_templates/opieapp/example.h | 2 +- languages/cpp/app_templates/opieapp/examplebase.ui | 2 +- languages/cpp/app_templates/opieinput/simpleimpl.cpp | 2 +- languages/cpp/app_templates/opienet/simmplemodule.h | 4 ++-- languages/cpp/app_templates/opienet/simpleiface.cpp | 4 ++-- languages/cpp/app_templates/opienet/simplemodule.h | 4 ++-- languages/cpp/app_templates/opietoday/exampleplugin.cpp | 2 +- languages/cpp/app_templates/opietoday/examplepluginwidget.h | 2 +- languages/cpp/app_templates/prc-tool/palmhello.c | 2 +- languages/cpp/app_templates/qmakeapp/qmakeapp.cpp | 10 +++++----- languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp | 10 +++++----- languages/cpp/app_templates/qtopia4app/examplebase.ui | 4 ++-- languages/cpp/app_templates/qtopiaapp/examplebase.ui | 2 +- 34 files changed, 73 insertions(+), 73 deletions(-) (limited to 'languages/cpp/app_templates') diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 4b78645a..9666125e 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").tqarg(filename), + statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } @@ -186,7 +186,7 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); } diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 5f9d906a..9cc3cec3 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}view.h" #include -#include +#include #include @@ -17,7 +17,7 @@ : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { - // setup our tqlayout manager to automatically add our widgets + // setup our layout manager to automatically add our widgets TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index 673df14e..87951c76 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include %{APPNAME}Preferences::%{APPNAME}Preferences() @@ -25,8 +25,8 @@ %{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } @@ -34,8 +34,8 @@ %{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 18595d10..d159d8f4 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include class PluginView : public KXMLGUIClient diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index bb15b923..3e0c0512 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include +#include #include #include diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 6123db0b..30d627fe 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui index 46a35473..03af967a 100644 --- a/languages/cpp/app_templates/kconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui @@ -66,7 +66,7 @@ Expanding - + 41 20 @@ -83,7 +83,7 @@ Expanding - + 41 20 @@ -111,7 +111,7 @@ Expanding - + 41 20 diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index c3780092..6738a789 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui @@ -15,7 +15,7 @@ true - + 11 @@ -196,7 +196,7 @@ true - + Qt::AlignCenter @@ -204,7 +204,7 @@ - + qPixmapFromMimeSource diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index f1e5fdfb..87a191f1 100644 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui @@ -9,7 +9,7 @@ 156 - + @@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Expanding - + 41 20 @@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Expanding - + 41 20 @@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Expanding - + 41 20 @@ -136,7 +136,7 @@ p, li { white-space: pre-wrap; } - + qPixmapFromMimeSource diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index ad5d7991..c8dc5d81 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) int remotePort = url.port(); kdDebug() << "myURL: " << url.prettyURL() << endl; - infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 94fb52fa..194d8ffe 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -45,7 +45,7 @@ true - + AlignCenter diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 1f3992af..6d9bf7ac 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include %{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 06a6409c..0094f5dd 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index 006b844e..a1cfb9f0 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} #include -#include +#include #include #include @@ -35,9 +35,9 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" ); + TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); part()->widget()->reparent( this, TQPoint(0, 0) ); - tqlayout->addWidget( part()->widget() ); + layout->addWidget( part()->widget() ); // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index f2dd28a3..2bcc9c6a 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui index a343c6cf..b1115e6f 100644 --- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui @@ -68,7 +68,7 @@ Expanding - + 41 20 @@ -85,7 +85,7 @@ Expanding - + 41 20 @@ -113,7 +113,7 @@ Expanding - + 41 20 diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 6123db0b..30d627fe 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 46a35473..03af967a 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -66,7 +66,7 @@ Expanding - + 41 20 @@ -83,7 +83,7 @@ Expanding - + 41 20 @@ -111,7 +111,7 @@ Expanding - + 41 20 diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 508f7cc9..b8654693 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -124,7 +124,7 @@ connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (TQPtrListIterator i(*tqchildren()); i.current(); ++i) + for (TQPtrListIterator i(*children()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -132,7 +132,7 @@ show(); // What it is now, stay. - setFixedSize(tqminimumSize()); + setFixedSize(minimumSize()); } %{APPNAME}UI::~%{APPNAME}UI() @@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text) void %{APPNAME}UI::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); + mapToGlobal(mPopup->geometry().bottomLeft()) ); } void %{APPNAME}UI::slotPlaying() diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp index f84a4fd3..5a5df025 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp @@ -117,7 +117,7 @@ void Bitmap::fadeStar() d++; x++; } - tqrepaint(); + repaint(); } } @@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void %{APPNAME}View::tqrepaint() +void %{APPNAME}View::repaint() { SDL_LockSurface(surface); TEST(); diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.h b/languages/cpp/app_templates/noatunvisual/plugin_impl.h index a95845c9..2a7de7b1 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.h +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.h @@ -58,7 +58,7 @@ protected: void setupPalette(double dummy=0.0); /** Draw everything. */ - void tqrepaint(); + void repaint(); private: /** used for pipelining */ diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 7da09f5a..92a4019f 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base public: static TQString appName() { - return TQString::tqfromLatin1("%{APPNAMELC}" ); + return TQString::fromLatin1("%{APPNAMELC}" ); } %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index 90d39d17..b6b81b11 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -7,7 +7,7 @@ %{APPNAME}Base - tqgeometry + geometry 0 0 diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index 6a7bef4f..a4c2e177 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){ /* * Send the key - * ke is the tqunicode + * ke is the unicode * _ke + 0x41 is the keycode * m_state Normally the state * down/up diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 5c928ec9..b19152b6 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,7 +12,7 @@ public: VirtualModule(); ~VirtualModule(); - const TQString type() {return TQString::tqfromLatin1("vpn" );} + const TQString type() {return TQString::fromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); @@ -21,7 +21,7 @@ public: void possibleNewInterfaces( TQMap& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: TQList m_interfaces; diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index e98148d2..bbabcbda 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() { void %{APPNAME}Interface::start() { // call pptp - settqStatus(true); + setStatus(true); refresh(); emit updateMessage("VPN started"); } void %{APPNAME}Interface::stop() { - settqStatus(false ); + setStatus(false ); refresh(); emit updateMessage("VPN halted"); } diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 327c1d43..6fce8b10 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,7 +12,7 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const TQString type() {return TQString::tqfromLatin1("vpn" );} + const TQString type() {return TQString::fromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); @@ -21,7 +21,7 @@ public: void possibleNewInterfaces( TQMap& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: TQList m_interfaces; diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index 12d702b6..3606927f 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const { // this sets the image that will be shown on the left side of the plugin TQString %{APPNAME}::pixmapNameWidget() const { - return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}"); + return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); } TQWidget* %{APPNAME}::widget( TQWidget * wid ) { diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index f079013e..ddb38793 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -1,7 +1,7 @@ #ifndef %{APPNAME}_PLUGIN_WIDGET_H #define %{APPNAME}_PLUGIN_WIDGET_H -#include +#include #include diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c index e0317932..0a34b6c4 100644 --- a/languages/cpp/app_templates/prc-tool/palmhello.c +++ b/languages/cpp/app_templates/prc-tool/palmhello.c @@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e) break; case menuEvent: - MenuErasetqStatus(NULL); + MenuEraseStatus(NULL); switch(e->data.menu.itemID) { } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 4b78645a..9666125e 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").tqarg(filename), + statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } @@ -186,7 +186,7 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); } diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp index f2178d9d..c3a8964f 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp @@ -223,8 +223,8 @@ void %{APPNAME}::loadFile(const TQString &fileName) if (!file.open(TQFile::ReadOnly | TQFile::Text)) { TQMessageBox::warning(this, tr("Application"), tr("Cannot read file %1:\n%2.") - .tqarg(fileName) - .tqarg(file.errorString())); + .arg(fileName) + .arg(file.errorString())); return; } @@ -243,8 +243,8 @@ bool %{APPNAME}::saveFile(const TQString &fileName) if (!file.open(TQFile::WriteOnly | TQFile::Text)) { TQMessageBox::warning(this, tr("Application"), tr("Cannot write file %1:\n%2.") - .tqarg(fileName) - .tqarg(file.errorString())); + .arg(fileName) + .arg(file.errorString())); return false; } @@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName) else shownName = strippedName(curFile); - setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application"))); + setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); } TQString %{APPNAME}::strippedName(const TQString &fullFileName) diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui index 76e7d49f..107d4e96 100644 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui @@ -15,7 +15,7 @@ %{APPNAME} - + 11 @@ -39,6 +39,6 @@ - + diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui index 90d39d17..b6b81b11 100644 --- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui +++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui @@ -7,7 +7,7 @@ %{APPNAME}Base - tqgeometry + geometry 0 0 -- cgit v1.2.1