summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:50 -0600
commit0117fbed932653a04aeef16b2ed7edee858959ac (patch)
tree769ae82d3aec3a66184bd33b65843380b5265fbb
parent087f8d4521b0bc6614dc4b664b23674a7f5f5020 (diff)
downloadtdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.tar.gz
tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--cervisia/editwithmenu.cpp4
-rw-r--r--cervisia/editwithmenu.h2
-rw-r--r--kapptemplate/kapp/appview.cpp4
-rw-r--r--kbabel/ChangeLog2
-rw-r--r--kbabel/catalogmanager/markpatterndialog.cpp2
-rw-r--r--kbabel/common/catalog.cpp8
-rw-r--r--kbabel/common/exportplugin.cpp4
-rw-r--r--kbabel/common/importplugin.cpp4
-rw-r--r--kbabel/commonui/context.cpp2
-rw-r--r--kbabel/commonui/finddialog.cpp2
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp2
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp10
-rw-r--r--kompare/kompare_shell.cpp4
-rw-r--r--kompare/libdialogpages/diffpage.cpp2
14 files changed, 26 insertions, 26 deletions
diff --git a/cervisia/editwithmenu.cpp b/cervisia/editwithmenu.cpp
index d7d1044a..6be3a85e 100644
--- a/cervisia/editwithmenu.cpp
+++ b/cervisia/editwithmenu.cpp
@@ -39,13 +39,13 @@ EditWithMenu::EditWithMenu(const KURL& url, TQWidget* parent)
return;
}
- m_offers = KTrader::self()->query(type->name(), "Type == 'Application'");
+ m_offers = TDETrader::self()->query(type->name(), "Type == 'Application'");
if( !m_offers.isEmpty() )
{
m_menu = new TQPopupMenu();
- KTrader::OfferList::ConstIterator it = m_offers.begin();
+ TDETrader::OfferList::ConstIterator it = m_offers.begin();
for( int i = 0 ; it != m_offers.end(); ++it, ++i )
{
int id = m_menu->insertItem(SmallIcon((*it)->icon()),
diff --git a/cervisia/editwithmenu.h b/cervisia/editwithmenu.h
index 9961b61f..1f2b1b7b 100644
--- a/cervisia/editwithmenu.h
+++ b/cervisia/editwithmenu.h
@@ -43,7 +43,7 @@ private slots:
void itemActivated(int);
private:
- KTrader::OfferList m_offers;
+ TDETrader::OfferList m_offers;
TQPopupMenu* m_menu;
KURL m_url;
};
diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp
index 3527596b..28b5bac0 100644
--- a/kapptemplate/kapp/appview.cpp
+++ b/kapptemplate/kapp/appview.cpp
@@ -33,12 +33,12 @@ ${APP_NAME}View::${APP_NAME}View(TQWidget *parent)
// string 'KParts/ReadOnlyPart' must be found in the ServiceTypes
// field. with this, only components of the type we want will be
// returned.
- KTrader::OfferList offers = KTrader::self()->query("text/html", "'KParts/ReadOnlyPart' in ServiceTypes");
+ TDETrader::OfferList offers = TDETrader::self()->query("text/html", "'KParts/ReadOnlyPart' in ServiceTypes");
KLibFactory *factory = 0;
// in theory, we only care about the first one.. but let's try all
// offers just in case the first can't be loaded for some reason
- KTrader::OfferList::Iterator it(offers.begin());
+ TDETrader::OfferList::Iterator it(offers.begin());
for( ; it != offers.end(); ++it)
{
KService::Ptr ptr = (*it);
diff --git a/kbabel/ChangeLog b/kbabel/ChangeLog
index 7dfd7907..29ebf19c 100644
--- a/kbabel/ChangeLog
+++ b/kbabel/ChangeLog
@@ -91,7 +91,7 @@ Changes 1.2beta1:
- It is not possible to edit raw header anymore (Stanislav Visnovsky)
- Character selection tool (Stanislav Visnovsky)
- CVS support in Catalog Manager (Marco Wegner)
-- KBabelDict module lookup using standard KDE KTrader
+- KBabelDict module lookup using standard KDE TDETrader
- Autosave feature (Marco Wegner)
- DataTool to check for translations with only whitespace (Dwayne Bailey)
- DataTool for translations that are not translated (Dwayne Bailey)
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index 7b033235..ee86ead5 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -60,7 +60,7 @@ MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name)
comboCompletion = mainWidget->combo->completionObject( );
regexpEditDialog = 0;
- if (!KTrader::self( )->query("KRegExpEditor/KRegExpEditor").isEmpty( )) {
+ if (!TDETrader::self( )->query("KRegExpEditor/KRegExpEditor").isEmpty( )) {
connect(mainWidget->regexpButton, TQT_SIGNAL(clicked( )), this, TQT_SLOT(slotRegexpButtonClicked( )));
} else {
disconnect(mainWidget->useRegExp, 0, mainWidget->regexpButton, 0);
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 601f113f..3f288826 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -900,14 +900,14 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
// gimme plugin for this MIME type
KMimeType::Ptr mime = KMimeType::findByURL( url, 0, true );
kdDebug() << "Found mimetype: " << mime->name() << endl;
- KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])");
+ TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])");
KService::Ptr ptr = offers.first();
// we have no offer for this MIME type
if( !ptr )
{
kdDebug(KBABEL) << "No plugin for this type, will try PO" << endl;
- offers = KTrader::self()->query("KBabelFilter", "('application/x-gettext' in [X-TDE-Import])");
+ offers = TDETrader::self()->query("KBabelFilter", "('application/x-gettext' in [X-TDE-Import])");
ptr = offers.first();
if( !ptr )
{
@@ -1003,7 +1003,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
// gimme plugin for this MIME type
KMimeType::Ptr mime = KMimeType::findByURL( openUrl, 0, true );
- KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])");
+ TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Import])");
KService::Ptr ptr = offers.first();
// we have no offer for this MIME type
@@ -2071,7 +2071,7 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
// gimme plugin for this MIME type
KMimeType::Ptr mime = KMimeType::findByURL( KURL::fromPathOrURL( localFile ) );
- KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Export])");
+ TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "('"+mime->name()+"' in [X-TDE-Export])");
KService::Ptr ptr = offers.first();
// we have no offer for this MIME type
diff --git a/kbabel/common/exportplugin.cpp b/kbabel/common/exportplugin.cpp
index 0fe7ad6b..756199cc 100644
--- a/kbabel/common/exportplugin.cpp
+++ b/kbabel/common/exportplugin.cpp
@@ -60,9 +60,9 @@ TQStringList CatalogExportPlugin::availableExportMimeTypes()
{
TQStringList result;
- KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "exist [X-TDE-Export]");
+ TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "exist [X-TDE-Export]");
- for( KTrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr )
+ for( TDETrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr )
{
result += (*ptr)->property("X-TDE-Export").toStringList();
}
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index 509f98e6..e7b63736 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -171,9 +171,9 @@ TQStringList CatalogImportPlugin::availableImportMimeTypes()
{
TQStringList result;
- KTrader::OfferList offers = KTrader::self()->query("KBabelFilter", "exist [X-TDE-Import]");
+ TDETrader::OfferList offers = TDETrader::self()->query("KBabelFilter", "exist [X-TDE-Import]");
- for( KTrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr )
+ for( TDETrader::OfferListIterator ptr = offers.begin(); ptr!=offers.end() ; ++ptr )
{
result += (*ptr)->property("X-TDE-Import").toStringList();
}
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 70a020a8..1c6ded1e 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -259,7 +259,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir,
bool SourceContext::loadPart()
{
- KTrader::OfferList offers = KTrader::self()->query( "KTextEditor/Document" );
+ TDETrader::OfferList offers = TDETrader::self()->query( "KTextEditor/Document" );
if( offers.count() < 1 )
{
KMessageBox::error(this,i18n("KBabel cannot start a text editor component.\n"
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 4c3f3f55..0fe463fd 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -133,7 +133,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
_isRegExp = new TQCheckBox(i18n("Use regu&lar expression"),regexp);
_regExpButton = 0;
- if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
+ if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
{
_regExpButton = new TQPushButton( i18n("&Edit..."), regexp );
connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked()));
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 63579dc8..530d8a95 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -703,7 +703,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
TQWhatsThis::add(label,msg);
TQWhatsThis::add(contextInfoEdit,msg);
- if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
+ if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
{
_regExpButton = new TQPushButton( i18n("&Edit..."), hbox );
connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked()));
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 4d0f4b2d..b56f38e3 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -409,11 +409,11 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
kdDebug(KBABEL_SEARCH) << "Now using trader for " << TDEGlobal::instance()->instanceName() << endl;
- // try to find installed modules by KTrader
- KTrader::OfferList offers = KTrader::self()->query("KBabelDictModule",
+ // try to find installed modules by TDETrader
+ TDETrader::OfferList offers = TDETrader::self()->query("KBabelDictModule",
"('"+TDEGlobal::instance()->instanceName()+"' in [Applications])");
- for(KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it )
+ for(TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it )
{
KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().local8Bit() );
@@ -438,10 +438,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
kdDebug(KBABEL_SEARCH) << "Now for any application" << endl;
- offers = KTrader::self()->query("KBabelDictModule",
+ offers = TDETrader::self()->query("KBabelDictModule",
"not ( exist Applications)");
- for(KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it )
+ for(TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it )
{
KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().local8Bit() );
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index a903f6d4..dd4fda2a 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -60,7 +60,7 @@ KompareShell::KompareShell()
setupActions();
setupStatusBar();
- KTrader::OfferList offers = KTrader::self()->query( "text/x-diff",
+ TDETrader::OfferList offers = TDETrader::self()->query( "text/x-diff",
"Kompare/ViewPart", TQString(), TQString() );
#ifdef NDEBUG
for( int i = 0; i < offers.count(); i++ )
@@ -108,7 +108,7 @@ KompareShell::KompareShell()
}
offers.clear();
- offers = KTrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString() );
+ offers = TDETrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString() );
if ( offers.count() == 0 )
{
KMessageBox::error(this, i18n( "Could not find our KompareNavigationPart." ) );
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index a70e3f44..2748b573 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -288,7 +288,7 @@ void DiffPage::addOptionsTab()
TQToolTip::add( m_ignoreRegExpEdit, i18n( "Add the regular expression here that you want to use\nto ignore lines that match it." ) );
groupLayout->addWidget( m_ignoreRegExpEdit );
- if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
+ if ( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
{
// Ok editor is available, use it
TQButton* ignoreRegExpEditButton = new TQPushButton( i18n( "&Edit..." ), page, "regexp_editor_button" );