summaryrefslogtreecommitdiffstats
path: root/kcontrol/ebrowsing
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /kcontrol/ebrowsing
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kcontrol/ebrowsing')
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui2
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp26
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h6
3 files changed, 17 insertions, 17 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index f036dd6be..5e9545270 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -168,7 +168,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
</size>
</property>
</spacer>
- <widget class="KListView" row="0" column="0" rowspan="4" colspan="2">
+ <widget class="TDEListView" row="0" column="0" rowspan="4" colspan="2">
<column>
<property name="text">
<string>Name</string>
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 89310a137..e898bd0db 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -69,7 +69,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
if ( cmd.contains( exp ) )
{
if (verbose)
- kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
+ kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
<< " matches FQDN_PATTERN" << endl;
// bug 133687
@@ -88,7 +88,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
if ( cmd.contains( exp ) )
{
if (verbose)
- kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
+ kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
<< " matches IPv4_PATTERN" << endl;
return true;
}
@@ -98,13 +98,13 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
if ( cmd.contains( exp ) )
{
if (verbose)
- kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
+ kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
<< " matches IPv6_PATTERN" << endl;
return true;
}
if (verbose)
- kdDebug() << "KShortURIFilter::isValidShortURL: '" << cmd
+ kdDebug() << "TDEShortURIFilter::isValidShortURL: '" << cmd
<< "' is not a short URL." << endl;
return false;
@@ -134,15 +134,15 @@ static TQString removeArgs( const TQString& _cmd )
return cmd;
}
-KShortURIFilter::KShortURIFilter( TQObject *parent, const char *name,
+TDEShortURIFilter::TDEShortURIFilter( TQObject *parent, const char *name,
const TQStringList & /*args*/ )
:KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0),
- DCOPObject("KShortURIFilterIface")
+ DCOPObject("TDEShortURIFilterIface")
{
configure();
}
-bool KShortURIFilter::filterURI( KURIFilterData& data ) const
+bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
{
/*
* Here is a description of how the shortURI deals with the supplied
@@ -533,23 +533,23 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
return false;
}
-TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
+TDECModule* TDEShortURIFilter::configModule( TQWidget*, const char* ) const
{
- return 0; //new KShortURIOptions( parent, name );
+ return 0; //new TDEShortURIOptions( parent, name );
}
-TQString KShortURIFilter::configName() const
+TQString TDEShortURIFilter::configName() const
{
return i18n("&ShortURLs");
}
-void KShortURIFilter::configure()
+void TDEShortURIFilter::configure()
{
TDEConfig config( name() + QFL1("rc"), false, false );
m_bVerbose = config.readBoolEntry( "Verbose", false );
if ( m_bVerbose )
- kdDebug() << "KShortURIFilter::configure: Config reload request..." << endl;
+ kdDebug() << "TDEShortURIFilter::configure: Config reload request..." << endl;
m_strDefaultProtocol = config.readEntry( "DefaultProtocol", QFL1("http://") );
EntryMap patterns = config.entryMap( QFL1("Pattern") );
@@ -571,6 +571,6 @@ void KShortURIFilter::configure()
}
K_EXPORT_COMPONENT_FACTORY( libkshorturifilter,
- KGenericFactory<KShortURIFilter>( "kcmkurifilt" ) )
+ KGenericFactory<TDEShortURIFilter>( "kcmkurifilt" ) )
#include "kshorturifilter.moc"
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
index 33ba20cad..16eb0cd02 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
@@ -37,7 +37,7 @@ class TDEInstance;
* @author Dawit Alemayehu <adawit@kde.org>
* @author Malte Starostik <starosti@zedat.fu-berlin.de>
*/
-class KShortURIFilter : public KURIFilterPlugin , public DCOPObject
+class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject
{
K_DCOP
Q_OBJECT
@@ -49,13 +49,13 @@ public:
* @param parent the parent of this class.
* @param name the internal name for this object.
*/
- KShortURIFilter( TQObject *parent = 0, const char *name = 0,
+ TDEShortURIFilter( TQObject *parent = 0, const char *name = 0,
const TQStringList &args = TQStringList() );
/**
* Destructor
*/
- virtual ~KShortURIFilter() {};
+ virtual ~TDEShortURIFilter() {};
/**
* Converts short URIs into fully qualified valid URIs