From e9be34de5fe62ce92c1d4cad63d03be76e9beb8d Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 19:08:25 +0000 Subject: Fix kdevelop Qt3 compilation git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1237312 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/sql/sqlactions.cpp | 2 +- languages/sql/sqlactions.h | 6 +++--- languages/sql/sqlconfigwidget.ui.h | 4 ++-- languages/sql/sqlsupport_part.cpp | 40 +++++++++++++++++++------------------- languages/sql/sqlsupport_part.h | 6 +++--- 5 files changed, 29 insertions(+), 29 deletions(-) (limited to 'languages/sql') diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 8d533a9e..eabb1c5a 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -25,7 +25,7 @@ #include "kdevlanguagesupport.h" #include "sqlsupport_part.h" -SqlListAction::SqlListAction(STQLSupportPart *part, const TQString &text, +SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, const KShortcut& cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name) diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h index ff71ae54..a85f3709 100644 --- a/languages/sql/sqlactions.h +++ b/languages/sql/sqlactions.h @@ -16,7 +16,7 @@ #include #include -class STQLSupportPart; +class SQLSupportPart; class KComboBox; class SqlListAction : public KWidgetAction @@ -24,7 +24,7 @@ class SqlListAction : public KWidgetAction Q_OBJECT TQ_OBJECT public: - SqlListAction( STQLSupportPart *part, const TQString &text, const KShortcut& cut, + SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name ); void setCurrentConnectionName(const TQString &name); @@ -35,7 +35,7 @@ private slots: void activated(int); private: - STQLSupportPart *m_part; + SQLSupportPart *m_part; KComboBox* m_combo; }; diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index 877c1569..808ca504 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -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 ) - << STQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); + << SQLSupportPart::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 = STQLSupportPart::cryptStr( db[5] ); + ((PasswordTableItem*)dbTable->item( row, 5 ))->password = SQLSupportPart::cryptStr( db[5] ); i++; } diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index c31a4499..9ce617e3 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -29,12 +29,12 @@ #include "sqloutputwidget.h" #include "domutil.h" -typedef KDevGenericFactory STQLSupportFactory; +typedef KDevGenericFactory STQLSupportFactory; static const KDevPluginInfo data("kdevsqlsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, STQLSupportFactory( data ) ) -STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& ) - : KDevLanguageSupport ( &data, tqparent, name ? name : "STQLSupportPart" ) +SQLSupportPart::SQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& ) + : KDevLanguageSupport ( &data, tqparent, name ? name : "SQLSupportPart" ) { setInstance( STQLSupportFactory::instance() ); setXMLFile( "kdevsqlsupport.rc" ); @@ -46,7 +46,7 @@ STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQ dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); - kdDebug( 9000 ) << "Creating STQLSupportPart" << endl; + kdDebug( 9000 ) << "Creating SQLSupportPart" << endl; connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); @@ -61,13 +61,13 @@ STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQ } -STQLSupportPart::~STQLSupportPart() +SQLSupportPart::~SQLSupportPart() { mainWindow()->removeView(m_widget); delete m_widget; } -TQString STQLSupportPart::cryptStr(const TQString& aStr) +TQString SQLSupportPart::cryptStr(const TQString& aStr) { TQString result; for (unsigned int i = 0; i < aStr.length(); i++) @@ -76,12 +76,12 @@ TQString STQLSupportPart::cryptStr(const TQString& aStr) return result; } -void STQLSupportPart::activeConnectionChanged() +void SQLSupportPart::activeConnectionChanged() { updateCatalog(); } -void STQLSupportPart::clearConfig() +void SQLSupportPart::clearConfig() { for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) { if ( TQSqlDatabase::tqcontains( *it ) ) { @@ -96,7 +96,7 @@ void STQLSupportPart::clearConfig() dbAction->refresh(); } -void STQLSupportPart::loadConfig() +void SQLSupportPart::loadConfig() { clearConfig(); @@ -130,7 +130,7 @@ void STQLSupportPart::loadConfig() dbAction->refresh(); } -void STQLSupportPart::projectConfigWidget( KDialogBase *dlg ) +void SQLSupportPart::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 STQLSupportPart::projectConfigWidget( KDialogBase *dlg ) connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) ); } -void STQLSupportPart::projectOpened() +void SQLSupportPart::projectOpened() { connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); @@ -155,12 +155,12 @@ void STQLSupportPart::projectOpened() } -void STQLSupportPart::projectClosed() +void SQLSupportPart::projectClosed() { clearConfig(); } -void STQLSupportPart::slotRun () +void SQLSupportPart::slotRun () { TQString cName = dbAction->currentConnectionName(); if ( cName.isEmpty() ) { @@ -191,12 +191,12 @@ static TQString dbCaption(const TQSqlDatabase* db) } #endif -void STQLSupportPart::parse() +void SQLSupportPart::parse() { // @todo } -void STQLSupportPart::updateCatalog() +void SQLSupportPart::updateCatalog() { if (!project() || !dbAction) return; @@ -236,7 +236,7 @@ void STQLSupportPart::updateCatalog() emit updatedSourceInfo(); } -void STQLSupportPart::addedFilesToProject( const TQStringList &fileList ) +void SQLSupportPart::addedFilesToProject( const TQStringList &fileList ) { TQStringList::ConstIterator it; @@ -248,7 +248,7 @@ void STQLSupportPart::addedFilesToProject( const TQStringList &fileList ) } -void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) +void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) { TQStringList::ConstIterator it; @@ -259,7 +259,7 @@ void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) emit updatedSourceInfo(); } -void STQLSupportPart::savedFile( const KURL &fileName ) +void SQLSupportPart::savedFile( const KURL &fileName ) { if ( project() ->allFiles().tqcontains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) { // parse( fileName ); @@ -267,12 +267,12 @@ void STQLSupportPart::savedFile( const KURL &fileName ) } } -KDevLanguageSupport::Features STQLSupportPart::features() +KDevLanguageSupport::Features SQLSupportPart::features() { return Features( Classes | Functions ); } -KMimeType::List STQLSupportPart::mimeTypes( ) +KMimeType::List SQLSupportPart::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 71007d3c..1e72eca1 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -14,15 +14,15 @@ class SqlListAction; class SqlOutputWidget; class CodeModel; -class STQLSupportPart : public KDevLanguageSupport +class SQLSupportPart : public KDevLanguageSupport { Q_OBJECT TQ_OBJECT public: - STQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &); - virtual ~STQLSupportPart(); + SQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &); + virtual ~SQLSupportPart(); static TQString cryptStr(const TQString& aStr); const TQStringList& connections() const { return conNames; } -- cgit v1.2.1