diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/sql | |
parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/sql')
-rw-r--r-- | languages/sql/README.dox | 2 | ||||
-rw-r--r-- | languages/sql/sqlactions.cpp | 14 | ||||
-rw-r--r-- | languages/sql/sqlactions.h | 13 | ||||
-rw-r--r-- | languages/sql/sqlconfigwidget.ui | 30 | ||||
-rw-r--r-- | languages/sql/sqlconfigwidget.ui.h | 18 | ||||
-rw-r--r-- | languages/sql/sqloutputwidget.cpp | 28 | ||||
-rw-r--r-- | languages/sql/sqloutputwidget.h | 9 | ||||
-rw-r--r-- | languages/sql/sqlsupport_part.cpp | 60 | ||||
-rw-r--r-- | languages/sql/sqlsupport_part.h | 11 |
9 files changed, 93 insertions, 92 deletions
diff --git a/languages/sql/README.dox b/languages/sql/README.dox index bfa52e2e..e44edb43 100644 --- a/languages/sql/README.dox +++ b/languages/sql/README.dox @@ -6,7 +6,7 @@ This is a SQL support plugin \maintainer <a href="mailto:harry AT kdevelop.org">Harald Fernengel</a> \feature SQL language support -\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index df8ba309..8d533a9e 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -25,16 +25,14 @@ #include "kdevlanguagesupport.h" #include "sqlsupport_part.h" -SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, +SqlListAction::SqlListAction(STQLSupportPart *part, const TQString &text, const KShortcut& cut, const TQObject *receiver, const char *slot, - KActionCollection *parent, const char *name) - : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part) + KActionCollection *tqparent, const char *name) + : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, tqparent, name), m_part(part) { -#if (QT_VERSION >= 0x030100) m_combo->setEditable( false ); m_combo->setAutoCompletion( true ); -#endif m_combo->setMinimumWidth( 200 ); m_combo->setMaximumWidth( 400 ); @@ -51,7 +49,7 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, void SqlListAction::setCurrentConnectionName(const TQString &name) { - int idx = m_part->connections().findIndex( name ); + int idx = m_part->connections().tqfindIndex( name ); if ( idx < 0 ) m_combo->setCurrentItem( 0 ); else @@ -62,7 +60,7 @@ void SqlListAction::setCurrentConnectionName(const TQString &name) TQString SqlListAction::currentConnectionName() const { if ( m_combo->currentItem() <= 0 ) - return TQString::null; + return TQString(); return m_part->connections()[ m_combo->currentItem() - 1 ]; } @@ -88,7 +86,7 @@ void SqlListAction::refresh() TQSqlDatabase* db = TQSqlDatabase::database( (*it), false ); if ( !db ) { kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl; - m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").arg( *it ) ); + m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").tqarg( *it ) ); continue; } cName = db->driverName(); diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h index 8cc7b5df..ff71ae54 100644 --- a/languages/sql/sqlactions.h +++ b/languages/sql/sqlactions.h @@ -9,23 +9,24 @@ * * ***************************************************************************/ -#ifndef _SQLACTION_H_ -#define _SQLACTION_H_ +#ifndef _STQLACTION_H_ +#define _STQLACTION_H_ #include <kdeversion.h> #include <kxmlguiclient.h> #include <kaction.h> -class SQLSupportPart; +class STQLSupportPart; class KComboBox; class SqlListAction : public KWidgetAction { Q_OBJECT + TQ_OBJECT public: - SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut, + SqlListAction( STQLSupportPart *part, const TQString &text, const KShortcut& cut, const TQObject *receiver, const char *slot, - KActionCollection *parent, const char *name ); + KActionCollection *tqparent, const char *name ); void setCurrentConnectionName(const TQString &name); TQString currentConnectionName() const; void refresh(); @@ -34,7 +35,7 @@ private slots: void activated(int); private: - SQLSupportPart *m_part; + STQLSupportPart *m_part; KComboBox* m_combo; }; diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index e85b09d9..98be3606 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SqlConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SqlConfigWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable"> + <widget class="TQTable"> <column> <property name="text"> <string>Plugin</string> @@ -78,7 +78,7 @@ <enum>SingleRow</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -86,9 +86,9 @@ <string><i>Warning:</i> password will be saved with weak encryption.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -161,27 +161,27 @@ <include location="local" impldecl="in implementation">sqlconfigwidget.ui.h</include> </includes> <forwards> - <forward>class QDomDocument;</forward> + <forward>class TQDomDocument;</forward> </forwards> <variables> - <variable access="private">QDomDocument* doc;</variable> + <variable access="private">TQDomDocument* doc;</variable> <variable access="private">bool changed;</variable> </variables> -<signals> +<Q_SIGNALS> <signal>newConfigSaved()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>init()</slot> <slot>valueChanged( int, int )</slot> <slot>removeDb()</slot> <slot>updateButtons()</slot> <slot>testDb()</slot> <slot>accept()</slot> - <slot>setProjectDom( QDomDocument * doc )</slot> + <slot>setProjectDom( TQDomDocument * doc )</slot> <slot>loadConfig()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index b7725a49..877c1569 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -22,10 +22,10 @@ #include "sqlsupport_part.h" // displays a ComboBox on edit to let the user choose the plugin -class PluginTableItem: public QTableItem +class PluginTableItem: public TQTableItem { public: - PluginTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {} + PluginTableItem( TQTable* table, const TQString& text = TQString() ): TQTableItem( table, TQTableItem::OnTyping, text ) {} virtual TQWidget* createEditor() const { @@ -46,10 +46,10 @@ public: }; // uses a spinbox to let the user choose the port -class PortTableItem: public QTableItem +class PortTableItem: public TQTableItem { public: - PortTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {} + PortTableItem( TQTable* table, const TQString& text = TQString() ): TQTableItem( table, TQTableItem::OnTyping, text ) {} virtual TQWidget* createEditor() const { @@ -70,10 +70,10 @@ public: }; // uses a spinbox to let the user choose the port -class PasswordTableItem: public QTableItem +class PasswordTableItem: public TQTableItem { public: - PasswordTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {} + PasswordTableItem( TQTable* table, const TQString& text = TQString() ): TQTableItem( table, TQTableItem::OnTyping, text ) {} virtual TQWidget* createEditor() const { @@ -203,7 +203,7 @@ void SqlConfigWidget::accept() db << dbTable->text( i, 0 ) << dbTable->text( i, 1 ) << dbTable->text( i, 2 ) << dbTable->text( i, 3 ) << dbTable->text( i, 4 ) - << SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); + << STQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); DomUtil::writeListEntry( *doc, "/kdevsqlsupport/servers/server" + TQString::number( i ), @@ -235,7 +235,7 @@ void SqlConfigWidget::loadConfig() int row = dbTable->numRows() - 2; for ( int ii = 0; ii < 6; ii++ ) dbTable->setText( row, ii, db[ii] ); - ((PasswordTableItem*)dbTable->item( row, 5 ))->password = SQLSupportPart::cryptStr( db[5] ); + ((PasswordTableItem*)dbTable->item( row, 5 ))->password = STQLSupportPart::cryptStr( db[5] ); i++; } diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index f7d84fde..73228dd7 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -24,11 +24,11 @@ #include "sqloutputwidget.h" -class QCustomSqlCursor: public QSqlCursor +class TQCustomSqlCursor: public TQSqlCursor { public: - QCustomSqlCursor( const TQString & query = TQString::null, bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) : - TQSqlCursor( TQString::null, autopopulate, db ) + TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) : + TQSqlCursor( TQString(), autopopulate, db ) { exec( query ); if ( isSelect() && autopopulate ) { @@ -39,23 +39,23 @@ public: } setMode( TQSqlCursor::ReadOnly ); } - QCustomSqlCursor( const QCustomSqlCursor & other ): TQSqlCursor( other ) {} + TQCustomSqlCursor( const TQCustomSqlCursor & other ): TQSqlCursor( other ) {} bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return TQSqlIndex(); } - int insert( bool /*invalidate*/ = TRUE ) + int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } - int update( bool /*invalidate*/ = TRUE ) + int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } - int del( bool /*invalidate*/ = TRUE ) + int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} }; -SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) : - TQWidget( parent, name ) +SqlOutputWidget::SqlOutputWidget ( TQWidget* tqparent, const char* name ) : + TQWidget( tqparent, name ) { m_stack = new TQWidgetStack( this ); m_table = new TQDataTable( this ); @@ -67,8 +67,8 @@ SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) : m_stack->addWidget( m_textEdit ); m_stack->addWidget( m_table ); - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->addWidget( m_stack ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_stack ); } SqlOutputWidget::~SqlOutputWidget() @@ -78,7 +78,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString& { TQSqlDatabase* db = TQSqlDatabase::database( connectionName, true ); if ( !db ) { - showError( i18n("No such connection: %1").arg( connectionName ) ); + showError( i18n("No such connection: %1").tqarg( connectionName ) ); return; } if ( !db->isOpen() ) { @@ -86,7 +86,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString& return; } - TQSqlCursor* cur = new QCustomSqlCursor( query, true, db ); + TQSqlCursor* cur = new TQCustomSqlCursor( query, true, db ); if ( !cur->isActive() ) { showError( cur->lastError() ); } else if ( cur->isSelect() ) { @@ -101,7 +101,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString& void SqlOutputWidget::showSuccess( int rowsAffected ) { m_textEdit->clear(); - m_textEdit->setText( i18n("Query successful, number of rows affected: %1").arg( rowsAffected ) ); + m_textEdit->setText( i18n("Query successful, number of rows affected: %1").tqarg( rowsAffected ) ); m_stack->raiseWidget( m_textEdit ); } diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h index 126963a2..c4a58ddf 100644 --- a/languages/sql/sqloutputwidget.h +++ b/languages/sql/sqloutputwidget.h @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#ifndef _SQLOUTPUTWIDGET_H_ -#define _SQLOUTPUTWIDGET_H_ +#ifndef _STQLOUTPUTWIDGET_H_ +#define _STQLOUTPUTWIDGET_H_ #include <tqwidget.h> @@ -19,12 +19,13 @@ class TQDataTable; class TQTextEdit; class TQSqlError; -class SqlOutputWidget : public QWidget +class SqlOutputWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SqlOutputWidget( TQWidget* parent = 0, const char* name = 0 ); + SqlOutputWidget( TQWidget* tqparent = 0, const char* name = 0 ); virtual ~SqlOutputWidget(); public: diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 78c1c1f2..c31a4499 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -29,14 +29,14 @@ #include "sqloutputwidget.h" #include "domutil.h" -typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory; +typedef KDevGenericFactory<STQLSupportPart> STQLSupportFactory; static const KDevPluginInfo data("kdevsqlsupport"); -K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, STQLSupportFactory( data ) ) -SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) - : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) +STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& ) + : KDevLanguageSupport ( &data, tqparent, name ? name : "STQLSupportPart" ) { - setInstance( SQLSupportFactory::instance() ); + setInstance( STQLSupportFactory::instance() ); setXMLFile( "kdevsqlsupport.rc" ); KAction *action; @@ -46,7 +46,7 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); - kdDebug( 9000 ) << "Creating SQLSupportPart" << endl; + kdDebug( 9000 ) << "Creating STQLSupportPart" << endl; connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); @@ -61,30 +61,30 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri } -SQLSupportPart::~SQLSupportPart() +STQLSupportPart::~STQLSupportPart() { mainWindow()->removeView(m_widget); delete m_widget; } -TQString SQLSupportPart::cryptStr(const TQString& aStr) +TQString STQLSupportPart::cryptStr(const TQString& aStr) { TQString result; for (unsigned int i = 0; i < aStr.length(); i++) - result += (aStr[i].unicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].unicode()); + result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].tqunicode()); return result; } -void SQLSupportPart::activeConnectionChanged() +void STQLSupportPart::activeConnectionChanged() { updateCatalog(); } -void SQLSupportPart::clearConfig() +void STQLSupportPart::clearConfig() { for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) { - if ( TQSqlDatabase::contains( *it ) ) { + if ( TQSqlDatabase::tqcontains( *it ) ) { TQSqlDatabase::database( *it, false )->close(); TQSqlDatabase::removeDatabase( *it ); } else { @@ -96,7 +96,7 @@ void SQLSupportPart::clearConfig() dbAction->refresh(); } -void SQLSupportPart::loadConfig() +void STQLSupportPart::loadConfig() { clearConfig(); @@ -110,10 +110,10 @@ void SQLSupportPart::loadConfig() if ( (int)sdb.size() < 6 ) break; - conName = "KDEVSQLSUPPORT_"; + conName = "KDEVSTQLSUPPORT_"; conName += TQString::number( i ); conNames << conName; - TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).arg( i ) ); + TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSTQLSUPPORT_%1" ).tqarg( i ) ); db->setDatabaseName( sdb[1] ); db->setHostName( sdb[2] ); bool ok; @@ -130,7 +130,7 @@ void SQLSupportPart::loadConfig() dbAction->refresh(); } -void SQLSupportPart::projectConfigWidget( KDialogBase *dlg ) +void STQLSupportPart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) ); SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" ); @@ -140,7 +140,7 @@ void SQLSupportPart::projectConfigWidget( KDialogBase *dlg ) connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) ); } -void SQLSupportPart::projectOpened() +void STQLSupportPart::projectOpened() { connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); @@ -155,12 +155,12 @@ void SQLSupportPart::projectOpened() } -void SQLSupportPart::projectClosed() +void STQLSupportPart::projectClosed() { clearConfig(); } -void SQLSupportPart::slotRun () +void STQLSupportPart::slotRun () { TQString cName = dbAction->currentConnectionName(); if ( cName.isEmpty() ) { @@ -183,20 +183,20 @@ static TQString dbCaption(const TQSqlDatabase* db) if (!db) return res; res = db->driverName(); - res += TQString::fromLatin1("@"); + res += TQString::tqfromLatin1("@"); res += db->hostName(); if (db->port() >= 0) - res += TQString::fromLatin1(":") + TQString::number(db->port()); + res += TQString::tqfromLatin1(":") + TQString::number(db->port()); return res; } #endif -void SQLSupportPart::parse() +void STQLSupportPart::parse() { // @todo } -void SQLSupportPart::updateCatalog() +void STQLSupportPart::updateCatalog() { if (!project() || !dbAction) return; @@ -236,7 +236,7 @@ void SQLSupportPart::updateCatalog() emit updatedSourceInfo(); } -void SQLSupportPart::addedFilesToProject( const TQStringList &fileList ) +void STQLSupportPart::addedFilesToProject( const TQStringList &fileList ) { TQStringList::ConstIterator it; @@ -248,7 +248,7 @@ void SQLSupportPart::addedFilesToProject( const TQStringList &fileList ) } -void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) +void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) { TQStringList::ConstIterator it; @@ -259,20 +259,20 @@ void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) emit updatedSourceInfo(); } -void SQLSupportPart::savedFile( const KURL &fileName ) +void STQLSupportPart::savedFile( const KURL &fileName ) { - if ( project() ->allFiles().contains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) { + if ( project() ->allFiles().tqcontains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) { // parse( fileName ); // emit updatedSourceInfo(); } } -KDevLanguageSupport::Features SQLSupportPart::features() +KDevLanguageSupport::Features STQLSupportPart::features() { return Features( Classes | Functions ); } -KMimeType::List SQLSupportPart::mimeTypes( ) +KMimeType::List STQLSupportPart::mimeTypes( ) { KMimeType::List list; KMimeType::Ptr mime = KMimeType::mimeType( "text/plain" ); diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 187a4bbd..71007d3c 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -1,5 +1,5 @@ -#ifndef __KDEVPART_SQLSUPPORT_H__ -#define __KDEVPART_SQLSUPPORT_H__ +#ifndef __KDEVPART_STQLSUPPORT_H__ +#define __KDEVPART_STQLSUPPORT_H__ #include <tqguardedptr.h> #include <tqstringlist.h> @@ -14,14 +14,15 @@ class SqlListAction; class SqlOutputWidget; class CodeModel; -class SQLSupportPart : public KDevLanguageSupport +class STQLSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - SQLSupportPart(TQObject *parent, const char *name, const TQStringList &); - virtual ~SQLSupportPart(); + STQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &); + virtual ~STQLSupportPart(); static TQString cryptStr(const TQString& aStr); const TQStringList& connections() const { return conNames; } |