diff options
| -rw-r--r-- | tdenetworkmanager/src/tdenetman-pluginmanager.cpp | 4 | ||||
| -rw-r--r-- | tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui | 48 |
2 files changed, 28 insertions, 24 deletions
diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp index 0dad6ad..7a6cace 100644 --- a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp +++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp @@ -122,7 +122,11 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID) // try to load Plugin int error = 0; KPluginInfo* info = infoForPluginID(pluginID); +<<<<<<< HEAD:tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp + Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ), +======= Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "TDENetworkManager/Plugin" ), +>>>>>>> 75d5225a52e81e369e4bcef45bee258724573688:tdenetworkmanager/src/tdenetman-pluginmanager.cpp TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error ); // plugin loaded? diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui b/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui index a6d0945..a1dbd99 100644 --- a/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui +++ b/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui @@ -509,75 +509,75 @@ <connections> <connection> <sender>editCA</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCA2</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCA</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCA3</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCA2</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCA</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCA2</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCA3</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCA3</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCA2</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCA3</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCA</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCert</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCert2</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editCert2</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editCert</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editKey</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editKey2</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editKey2</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editKey</receiver> - <slot>setURL(const QString&)</slot> + <slot>setURL(const TQString&)</slot> </connection> <connection> <sender>editUsername</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editUsername2</receiver> - <slot>setText(const QString&)</slot> + <slot>setText(const TQString&)</slot> </connection> <connection> <sender>editUsername2</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>editUsername</receiver> - <slot>setText(const QString&)</slot> + <slot>setText(const TQString&)</slot> </connection> <connection> <sender>chkDefaultPort</sender> |