diff options
Diffstat (limited to 'parts/bookmarks')
-rw-r--r-- | parts/bookmarks/bookmarks_config.cpp | 4 | ||||
-rw-r--r-- | parts/bookmarks/bookmarks_part.cpp | 36 | ||||
-rw-r--r-- | parts/bookmarks/bookmarks_part.h | 2 | ||||
-rw-r--r-- | parts/bookmarks/bookmarks_settings.h | 2 | ||||
-rw-r--r-- | parts/bookmarks/bookmarks_widget.cpp | 16 | ||||
-rw-r--r-- | parts/bookmarks/bookmarks_widget.h | 2 |
6 files changed, 31 insertions, 31 deletions
diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index 36cc05a5..f49b76c8 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig() */ void BookmarksConfig::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); config->writeEntry("Context", _context ); @@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig() */ void BookmarksConfig::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); _context = config->readPropertyEntry( "Context", 5 ).toInt(); diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 2d5a0a10..a22756df 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -41,11 +41,11 @@ #define BOOKMARKSETTINGSPAGE 1 typedef KDevGenericFactory<BookmarksPart> BookmarksFactory; -static const KDevPluginInfo data("kdevbookmarks"); -K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) +static const KDevPluginInfo pluginData("kdevbookmarks"); +K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) ) BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); @@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringL _editorMap.setAutoDelete( true ); _settingMarks = false; - connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) ); + connect( partController(), TQ_SIGNAL( partAdded( KParts::Part * ) ), this, TQ_SLOT( partAdded( KParts::Part * ) ) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), - this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); - connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), - this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); + connect( _widget, TQ_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), + this, TQ_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); + connect( _widget, TQ_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), + this, TQ_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); - connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) ); + connect( _marksChangeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( marksChanged() ) ); _config = new BookmarksConfig; _config->readConfig(); @@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part ) // connect to this editor KTextEditor::Document * doc = static_cast<KTextEditor::Document*>( ro_part ); - connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) ); + connect( doc, TQ_SIGNAL( marksChanged() ), this, TQ_SLOT( marksEvent() ) ); // workaround for a katepart oddity where it drops all bookmarks on 'reload' - connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) ); + connect( doc, TQ_SIGNAL( completed() ), this, TQ_SLOT( reload() ) ); } } } @@ -124,7 +124,7 @@ void BookmarksPart::reload() { //kdDebug(0) << "BookmarksPart::reload()" << endl; - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ) ) { if ( partIsSane( ro_part ) ) @@ -140,7 +140,7 @@ void BookmarksPart::marksEvent() if ( ! _settingMarks ) { - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ); if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) ) @@ -203,7 +203,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el ) TQString line = mark.attribute( "line" ); if ( line != TQString() ) { - data->marks.append( tqMakePair( line.toInt(), TQString() ) ); + data->marks.append( qMakePair( line.toInt(), TQString() ) ); } mark = mark.nextSibling().toElement(); } @@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) { int line = it.current()->line; - data->marks.append( tqMakePair( line, TQString() ) ); + data->marks.append( qMakePair( line, TQString() ) ); } ++it; } @@ -490,7 +490,7 @@ void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == BOOKMARKSETTINGSPAGE ) { BookmarkSettings * w = new BookmarkSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index ae74bf63..b0b58b6b 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -40,7 +40,7 @@ class TQDomElement; class BookmarksPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h index a28f424e..278fa637 100644 --- a/parts/bookmarks/bookmarks_settings.h +++ b/parts/bookmarks/bookmarks_settings.h @@ -18,7 +18,7 @@ class BookmarksPart; class BookmarkSettings : public BookmarkSettingsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index ac14328b..33354269 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -150,10 +150,10 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part) setAllColumnsShowFocus( true ); // setSortColumn( -1 ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); } @@ -270,18 +270,18 @@ void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ") + TQString::number( _selectedItem->line() +1 ) ); - popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove This Bookmark"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } else { popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) ); - popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove These Bookmarks"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } popup.insertSeparator(); - popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) ); - popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) ); + popup.insertItem( i18n( "Collapse All" ), this, TQ_SLOT(collapseAll()) ); + popup.insertItem( i18n( "Expand All" ), this, TQ_SLOT(expandAll()) ); popup.exec(p); } diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index 79df9593..3246cec0 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -28,7 +28,7 @@ class BookmarksConfig; class BookmarksWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: |